Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Trinity keyboard #23577

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add Trinity keyboard #23577

wants to merge 10 commits into from
+912 −0

Conversation

luis-godinez
Copy link
Contributor

@luis-godinez luis-godinez commented Apr 20, 2024 •
edited
Loading

Description

Add replacement PCB for Rama U80. Support for VIA.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Apr 20, 2024
@luis-godinez luis-godinez changed the title Publish new keyboard to QMK repo Add Trinity keyboard Apr 20, 2024
waffle87
waffle87 requested changes Apr 20, 2024
View reviewed changes
keyboards/ungodly/trinity/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/ungodly/trinity/keymaps/via/keymap.c Outdated Show resolved Hide resolved
dunk2k
dunk2k suggested changes Apr 20, 2024
View reviewed changes
keyboards/ungodly/trinity/info.json Outdated Show resolved Hide resolved
keyboards/ungodly/trinity/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/ungodly/trinity/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/ungodly/trinity/info.json Outdated Show resolved Hide resolved
keyboards/ungodly/trinity/info.json Show resolved Hide resolved
luis-godinez and others added 7 commits April 20, 2024 14:51
@luis-godinez @waffle87
Update keyboards/ungodly/trinity/keymaps/default/keymap.c
ad777f5 
Co-authored-by: jack <0x6a73@protonmail.com>
@luis-godinez @waffle87
Update keyboards/ungodly/trinity/keymaps/via/keymap.c
a20b93b 
Co-authored-by: jack <0x6a73@protonmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/info.json
f9875b0 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/info.json
6798dbd 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/info.json
843e03b 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/keymaps/default/keymap.c
c1bf9c2 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/keymaps/via/keymap.c
353557a 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @dunk2k
Update keyboards/ungodly/trinity/keymaps/via/rules.mk
1b5f5b2 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@luis-godinez @waffle87
Apply suggestions from code review
853b885 
Co-authored-by: jack <0x6a73@protonmail.com>
@luis-godinez
Copy link
Contributor Author

Thanks for the help!

drashna
drashna requested changes Apr 30, 2024
View reviewed changes
keyboards/ungodly/trinity/keymaps/default/keymap.c
Comment on lines +7 to +14
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)

keyboards/ungodly/trinity/keymaps/via/keymap.c
Comment on lines +7 to +14
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_NUHS,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)

keyboards/ungodly/trinity/info.json
"processor": "RP2040",
"bootloader": "rp2040",
"usb": {
"vid": "0x3530",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This vendor ID appears to be in use, and should be changed.

dunk2k
dunk2k suggested changes May 10, 2024
View reviewed changes
Copy link
Contributor

@dunk2k dunk2k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add tkl*wkl Community Layout support

keyboards/ungodly/trinity/info.json
"rows": ["GP29", "GP20", "GP19", "GP12", "GP9", "GP1"],
"cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP21", "GP2", "GP13", "GP10", "GP11", "GP8", "GP14", "GP6", "GP5", "GP4", "GP3", "GP0"]
},
"community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"]
"community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_ansi_wkl", "tkl_ansi_wkl_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_iso_wkl", "tkl_iso_wkl_split_bs_rshift"],

keyboards/ungodly/trinity/info.json
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
},
},
"LAYOUT_tkl_ansi_wkl": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 7], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [0, 9], "x": 8.5, "y": 0},
{"matrix": [0, 10], "x": 9.5, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [0, 14], "x": 14, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [0, 17], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [1, 5], "x": 5, "y": 1.5},
{"matrix": [1, 6], "x": 6, "y": 1.5},
{"matrix": [1, 7], "x": 7, "y": 1.5},
{"matrix": [1, 8], "x": 8, "y": 1.5},
{"matrix": [1, 9], "x": 9, "y": 1.5},
{"matrix": [1, 10], "x": 10, "y": 1.5},
{"matrix": [1, 11], "x": 11, "y": 1.5},
{"matrix": [1, 12], "x": 12, "y": 1.5},
{"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
{"matrix": [1, 15], "x": 15.5, "y": 1.5},
{"matrix": [1, 16], "x": 16.5, "y": 1.5},
{"matrix": [1, 17], "x": 17.5, "y": 1.5},
{"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5},
{"matrix": [2, 2], "x": 1.5, "y": 2.5},
{"matrix": [2, 3], "x": 2.5, "y": 2.5},
{"matrix": [2, 4], "x": 3.5, "y": 2.5},
{"matrix": [2, 5], "x": 4.5, "y": 2.5},
{"matrix": [2, 6], "x": 5.5, "y": 2.5},
{"matrix": [2, 7], "x": 6.5, "y": 2.5},
{"matrix": [2, 8], "x": 7.5, "y": 2.5},
{"matrix": [2, 9], "x": 8.5, "y": 2.5},
{"matrix": [2, 10], "x": 9.5, "y": 2.5},
{"matrix": [2, 11], "x": 10.5, "y": 2.5},
{"matrix": [2, 12], "x": 11.5, "y": 2.5},
{"matrix": [2, 13], "x": 12.5, "y": 2.5},
{"matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.5},
{"matrix": [2, 15], "x": 15.5, "y": 2.5},
{"matrix": [2, 16], "x": 16.5, "y": 2.5},
{"matrix": [2, 17], "x": 17.5, "y": 2.5},
{"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5},
{"matrix": [3, 2], "x": 1.75, "y": 3.5},
{"matrix": [3, 3], "x": 2.75, "y": 3.5},
{"matrix": [3, 4], "x": 3.75, "y": 3.5},
{"matrix": [3, 5], "x": 4.75, "y": 3.5},
{"matrix": [3, 6], "x": 5.75, "y": 3.5},
{"matrix": [3, 7], "x": 6.75, "y": 3.5},
{"matrix": [3, 8], "x": 7.75, "y": 3.5},
{"matrix": [3, 9], "x": 8.75, "y": 3.5},
{"matrix": [3, 10], "x": 9.75, "y": 3.5},
{"matrix": [3, 11], "x": 10.75, "y": 3.5},
{"matrix": [3, 12], "x": 11.75, "y": 3.5},
{"matrix": [3, 14], "w": 2.25, "x": 12.75, "y": 3.5},
{"matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5},
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
{"matrix": [4, 7], "x": 7.25, "y": 4.5},
{"matrix": [4, 8], "x": 8.25, "y": 4.5},
{"matrix": [4, 9], "x": 9.25, "y": 4.5},
{"matrix": [4, 10], "x": 10.25, "y": 4.5},
{"matrix": [4, 11], "x": 11.25, "y": 4.5},
{"matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5},
{"matrix": [4, 16], "x": 16.5, "y": 4.5},
{"matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5},
{"matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5},
{"matrix": [5, 6], "w": 7, "x": 4, "y": 5.5},
{"matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.5},
{"matrix": [5, 14], "w": 1.5, "x": 13.5, "y": 5.5},
{"matrix": [5, 15], "x": 15.5, "y": 5.5},
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
},
"LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 7], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [0, 9], "x": 8.5, "y": 0},
{"matrix": [0, 10], "x": 9.5, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [0, 14], "x": 14, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [0, 17], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [1, 5], "x": 5, "y": 1.5},
{"matrix": [1, 6], "x": 6, "y": 1.5},
{"matrix": [1, 7], "x": 7, "y": 1.5},
{"matrix": [1, 8], "x": 8, "y": 1.5},
{"matrix": [1, 9], "x": 9, "y": 1.5},
{"matrix": [1, 10], "x": 10, "y": 1.5},
{"matrix": [1, 11], "x": 11, "y": 1.5},
{"matrix": [1, 12], "x": 12, "y": 1.5},
{"matrix": [1, 13], "x": 13, "y": 1.5},
{"matrix": [1, 14], "x": 14, "y": 1.5},
{"matrix": [1, 15], "x": 15.5, "y": 1.5},
{"matrix": [1, 16], "x": 16.5, "y": 1.5},
{"matrix": [1, 17], "x": 17.5, "y": 1.5},
{"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5},
{"matrix": [2, 2], "x": 1.5, "y": 2.5},
{"matrix": [2, 3], "x": 2.5, "y": 2.5},
{"matrix": [2, 4], "x": 3.5, "y": 2.5},
{"matrix": [2, 5], "x": 4.5, "y": 2.5},
{"matrix": [2, 6], "x": 5.5, "y": 2.5},
{"matrix": [2, 7], "x": 6.5, "y": 2.5},
{"matrix": [2, 8], "x": 7.5, "y": 2.5},
{"matrix": [2, 9], "x": 8.5, "y": 2.5},
{"matrix": [2, 10], "x": 9.5, "y": 2.5},
{"matrix": [2, 11], "x": 10.5, "y": 2.5},
{"matrix": [2, 12], "x": 11.5, "y": 2.5},
{"matrix": [2, 13], "x": 12.5, "y": 2.5},
{"matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.5},
{"matrix": [2, 15], "x": 15.5, "y": 2.5},
{"matrix": [2, 16], "x": 16.5, "y": 2.5},
{"matrix": [2, 17], "x": 17.5, "y": 2.5},
{"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5},
{"matrix": [3, 2], "x": 1.75, "y": 3.5},
{"matrix": [3, 3], "x": 2.75, "y": 3.5},
{"matrix": [3, 4], "x": 3.75, "y": 3.5},
{"matrix": [3, 5], "x": 4.75, "y": 3.5},
{"matrix": [3, 6], "x": 5.75, "y": 3.5},
{"matrix": [3, 7], "x": 6.75, "y": 3.5},
{"matrix": [3, 8], "x": 7.75, "y": 3.5},
{"matrix": [3, 9], "x": 8.75, "y": 3.5},
{"matrix": [3, 10], "x": 9.75, "y": 3.5},
{"matrix": [3, 11], "x": 10.75, "y": 3.5},
{"matrix": [3, 12], "x": 11.75, "y": 3.5},
{"matrix": [3, 14], "w": 2.25, "x": 12.75, "y": 3.5},
{"matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5},
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
{"matrix": [4, 7], "x": 7.25, "y": 4.5},
{"matrix": [4, 8], "x": 8.25, "y": 4.5},
{"matrix": [4, 9], "x": 9.25, "y": 4.5},
{"matrix": [4, 10], "x": 10.25, "y": 4.5},
{"matrix": [4, 11], "x": 11.25, "y": 4.5},
{"matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.5},
{"matrix": [4, 14], "x": 14, "y": 4.5},
{"matrix": [4, 16], "x": 16.5, "y": 4.5},
{"matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5},
{"matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5},
{"matrix": [5, 6], "w": 7, "x": 4, "y": 5.5},
{"matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.5},
{"matrix": [5, 14], "w": 1.5, "x": 13.5, "y": 5.5},
{"matrix": [5, 15], "x": 15.5, "y": 5.5},
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
},

keyboards/ungodly/trinity/info.json
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}
},
"LAYOUT_tkl_iso_wkl": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 7], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [0, 9], "x": 8.5, "y": 0},
{"matrix": [0, 10], "x": 9.5, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [0, 14], "x": 14, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [0, 17], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [1, 5], "x": 5, "y": 1.5},
{"matrix": [1, 6], "x": 6, "y": 1.5},
{"matrix": [1, 7], "x": 7, "y": 1.5},
{"matrix": [1, 8], "x": 8, "y": 1.5},
{"matrix": [1, 9], "x": 9, "y": 1.5},
{"matrix": [1, 10], "x": 10, "y": 1.5},
{"matrix": [1, 11], "x": 11, "y": 1.5},
{"matrix": [1, 12], "x": 12, "y": 1.5},
{"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
{"matrix": [1, 15], "x": 15.5, "y": 1.5},
{"matrix": [1, 16], "x": 16.5, "y": 1.5},
{"matrix": [1, 17], "x": 17.5, "y": 1.5},
{"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5},
{"matrix": [2, 2], "x": 1.5, "y": 2.5},
{"matrix": [2, 3], "x": 2.5, "y": 2.5},
{"matrix": [2, 4], "x": 3.5, "y": 2.5},
{"matrix": [2, 5], "x": 4.5, "y": 2.5},
{"matrix": [2, 6], "x": 5.5, "y": 2.5},
{"matrix": [2, 7], "x": 6.5, "y": 2.5},
{"matrix": [2, 8], "x": 7.5, "y": 2.5},
{"matrix": [2, 9], "x": 8.5, "y": 2.5},
{"matrix": [2, 10], "x": 9.5, "y": 2.5},
{"matrix": [2, 11], "x": 10.5, "y": 2.5},
{"matrix": [2, 12], "x": 11.5, "y": 2.5},
{"matrix": [2, 13], "x": 12.5, "y": 2.5},
{"matrix": [2, 15], "x": 15.5, "y": 2.5},
{"matrix": [2, 16], "x": 16.5, "y": 2.5},
{"matrix": [2, 17], "x": 17.5, "y": 2.5},
{"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5},
{"matrix": [3, 2], "x": 1.75, "y": 3.5},
{"matrix": [3, 3], "x": 2.75, "y": 3.5},
{"matrix": [3, 4], "x": 3.75, "y": 3.5},
{"matrix": [3, 5], "x": 4.75, "y": 3.5},
{"matrix": [3, 6], "x": 5.75, "y": 3.5},
{"matrix": [3, 7], "x": 6.75, "y": 3.5},
{"matrix": [3, 8], "x": 7.75, "y": 3.5},
{"matrix": [3, 9], "x": 8.75, "y": 3.5},
{"matrix": [3, 10], "x": 9.75, "y": 3.5},
{"matrix": [3, 11], "x": 10.75, "y": 3.5},
{"matrix": [3, 12], "x": 11.75, "y": 3.5},
{"matrix": [3, 13], "x": 12.75, "y": 3.5},
{"matrix": [3, 14], "w": 1.25, "x": 13.75, "h": 2, "y": 3.5},
{"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5},
{"matrix": [4, 1], "x": 1.25, "y": 4.5},
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
{"matrix": [4, 7], "x": 7.25, "y": 4.5},
{"matrix": [4, 8], "x": 8.25, "y": 4.5},
{"matrix": [4, 9], "x": 9.25, "y": 4.5},
{"matrix": [4, 10], "x": 10.25, "y": 4.5},
{"matrix": [4, 11], "x": 11.25, "y": 4.5},
{"matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5},
{"matrix": [4, 16], "x": 16.5, "y": 4.5},
{"matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5},
{"matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5},
{"matrix": [5, 6], "w": 7, "x": 4, "y": 5.5},
{"matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.5},
{"matrix": [5, 14], "w": 1.5, "x": 13.5, "y": 5.5},
{"matrix": [5, 15], "x": 15.5, "y": 5.5},
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
},
"LAYOUT_tkl_iso_wkl_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 7], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [0, 9], "x": 8.5, "y": 0},
{"matrix": [0, 10], "x": 9.5, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [0, 14], "x": 14, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [0, 17], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [1, 5], "x": 5, "y": 1.5},
{"matrix": [1, 6], "x": 6, "y": 1.5},
{"matrix": [1, 7], "x": 7, "y": 1.5},
{"matrix": [1, 8], "x": 8, "y": 1.5},
{"matrix": [1, 9], "x": 9, "y": 1.5},
{"matrix": [1, 10], "x": 10, "y": 1.5},
{"matrix": [1, 11], "x": 11, "y": 1.5},
{"matrix": [1, 12], "x": 12, "y": 1.5},
{"matrix": [1, 13], "x": 13, "y": 1.5},
{"matrix": [1, 14], "x": 14, "y": 1.5},
{"matrix": [1, 15], "x": 15.5, "y": 1.5},
{"matrix": [1, 16], "x": 16.5, "y": 1.5},
{"matrix": [1, 17], "x": 17.5, "y": 1.5},
{"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5},
{"matrix": [2, 2], "x": 1.5, "y": 2.5},
{"matrix": [2, 3], "x": 2.5, "y": 2.5},
{"matrix": [2, 4], "x": 3.5, "y": 2.5},
{"matrix": [2, 5], "x": 4.5, "y": 2.5},
{"matrix": [2, 6], "x": 5.5, "y": 2.5},
{"matrix": [2, 7], "x": 6.5, "y": 2.5},
{"matrix": [2, 8], "x": 7.5, "y": 2.5},
{"matrix": [2, 9], "x": 8.5, "y": 2.5},
{"matrix": [2, 10], "x": 9.5, "y": 2.5},
{"matrix": [2, 11], "x": 10.5, "y": 2.5},
{"matrix": [2, 12], "x": 11.5, "y": 2.5},
{"matrix": [2, 13], "x": 12.5, "y": 2.5},
{"matrix": [2, 15], "x": 15.5, "y": 2.5},
{"matrix": [2, 16], "x": 16.5, "y": 2.5},
{"matrix": [2, 17], "x": 17.5, "y": 2.5},
{"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5},
{"matrix": [3, 2], "x": 1.75, "y": 3.5},
{"matrix": [3, 3], "x": 2.75, "y": 3.5},
{"matrix": [3, 4], "x": 3.75, "y": 3.5},
{"matrix": [3, 5], "x": 4.75, "y": 3.5},
{"matrix": [3, 6], "x": 5.75, "y": 3.5},
{"matrix": [3, 7], "x": 6.75, "y": 3.5},
{"matrix": [3, 8], "x": 7.75, "y": 3.5},
{"matrix": [3, 9], "x": 8.75, "y": 3.5},
{"matrix": [3, 10], "x": 9.75, "y": 3.5},
{"matrix": [3, 11], "x": 10.75, "y": 3.5},
{"matrix": [3, 12], "x": 11.75, "y": 3.5},
{"matrix": [3, 13], "x": 12.75, "y": 3.5},
{"matrix": [3, 14], "w": 1.25, "x": 13.75, "h": 2, "y": 3.5},
{"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5},
{"matrix": [4, 1], "x": 1.25, "y": 4.5},
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
{"matrix": [4, 7], "x": 7.25, "y": 4.5},
{"matrix": [4, 8], "x": 8.25, "y": 4.5},
{"matrix": [4, 9], "x": 9.25, "y": 4.5},
{"matrix": [4, 10], "x": 10.25, "y": 4.5},
{"matrix": [4, 11], "x": 11.25, "y": 4.5},
{"matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.5},
{"matrix": [4, 14], "x": 14, "y": 4.5},
{"matrix": [4, 16], "x": 16.5, "y": 4.5},
{"matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5},
{"matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5},
{"matrix": [5, 6], "w": 7, "x": 4, "y": 5.5},
{"matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.5},
{"matrix": [5, 14], "w": 1.5, "x": 13.5, "y": 5.5},
{"matrix": [5, 15], "x": 15.5, "y": 5.5},
{"matrix": [5, 16], "x": 16.5, "y": 5.5},
{"matrix": [5, 17], "x": 17.5, "y": 5.5}
]
}

@github-actions GitHub Actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Jun 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@waffle87 waffle87 waffle87 approved these changes

@drashna drashna drashna requested changes

@dunk2k dunk2k dunk2k requested changes

Assignees
No one assigned
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution. via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@luis-godinez @drashna @waffle87 @dunk2k