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

add tkl_* Community Layouts to keyboards: e-h #23472

Closed
wants to merge 12 commits into from
Closed

add tkl_* Community Layouts to keyboards: e-h #23472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1f29048
migrated
dunk2k Apr 12, 2024
708af56
Merge branch 'develop' into cl_tkl_efgh
dunk2k Apr 14, 2024
267147a
Merge branch 'develop' into cl_tkl_efgh
dunk2k Apr 15, 2024
1c992e3
Merge branch 'develop' into cl_tkl_efgh
dunk2k Apr 15, 2024
f37710c
Merge remote-tracking branch 'upstream/develop' into cl_tkl_efgh
dunk2k Apr 16, 2024
e79ad09
Merge remote-tracking branch 'upstream/develop' into cl_tkl_efgh
dunk2k Apr 17, 2024
709f317
tkl_wkl CL
dunk2k May 1, 2024
a8a8a68
Merge branch 'develop' into cl_tkl_efgh
dunk2k May 22, 2024
c874571
format CL array lit
dunk2k May 22, 2024
81a116d
expland hand88
dunk2k Jun 9, 2024
59af0f7
Merge branch 'develop' into cl_tkl_efgh
dunk2k Aug 25, 2024
697d497
remove via
dunk2k Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
921 changes: 878 additions & 43 deletions keyboards/eniigmakeyboards/ek87/keyboard.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions keyboards/era/linx3/n8x/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"pid": "0x0007",
"vid": "0x4552"
},
"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"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down Expand Up @@ -1134,7 +1134,7 @@
{"matrix": [5, 15], "x": 16.25, "y": 5.25},
{"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
}
},
"LAYOUT_tkl_iso_wkl_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
Expand Down
1,057 changes: 1,049 additions & 8 deletions keyboards/evyd13/eon87/keyboard.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions keyboards/evyd13/nt750/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["tkl_ansi", "tkl_iso"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
6 changes: 5 additions & 1 deletion keyboards/fjlabs/kf87/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@
"resync": true
}
},
"layout_aliases": {
"LAYOUT_tkl_all": "LAYOUT_tkl_ansi"
},
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_all": {
"LAYOUT_tkl_ansi": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},

Expand Down
4 changes: 2 additions & 2 deletions keyboards/fjlabs/kf87/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ enum layers {

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_LAYER0] = LAYOUT_tkl_all(
[_LAYER0] = LAYOUT_tkl_ansi(
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_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,
Expand All @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[_LAYER1] = LAYOUT_tkl_all(
[_LAYER1] = LAYOUT_tkl_ansi(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
Expand Down
61 changes: 0 additions & 61 deletions keyboards/fjlabs/kf87/keymaps/via/keymap.c
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/fjlabs/kf87/keymaps/via/rules.mk
View file
Open in desktop

This file was deleted.

204 changes: 204 additions & 0 deletions keyboards/gopolar/gg86/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"build": {
"lto": true
},
"community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_wkl", "tkl_iso_tsangan", "tkl_iso_wkl"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down Expand Up @@ -285,6 +286,107 @@
{"matrix": [5, 16], "x": 17.25, "y": 5.5}
]
},
"LAYOUT_tkl_ansi_wkl": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},

{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [0, 2], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0},

{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [0, 6], "x": 7.5, "y": 0},
{"matrix": [0, 7], "x": 8.5, "y": 0},
{"matrix": [0, 8], "x": 9.5, "y": 0},

{"matrix": [0, 9], "x": 11, "y": 0},
{"matrix": [0, 10], "x": 12, "y": 0},
{"matrix": [0, 11], "x": 13, "y": 0},
{"matrix": [0, 12], "x": 14, "y": 0},

{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "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, "w": 2},

{"matrix": [1, 14], "x": 15.25, "y": 1.5},
{"matrix": [1, 15], "x": 16.25, "y": 1.5},
{"matrix": [1, 16], "x": 17.25, "y": 1.5},

{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 2.5},
{"matrix": [2, 2], "x": 2.5, "y": 2.5},
{"matrix": [2, 3], "x": 3.5, "y": 2.5},
{"matrix": [2, 4], "x": 4.5, "y": 2.5},
{"matrix": [2, 5], "x": 5.5, "y": 2.5},
{"matrix": [2, 6], "x": 6.5, "y": 2.5},
{"matrix": [2, 7], "x": 7.5, "y": 2.5},
{"matrix": [2, 8], "x": 8.5, "y": 2.5},
{"matrix": [2, 9], "x": 9.5, "y": 2.5},
{"matrix": [2, 10], "x": 10.5, "y": 2.5},
{"matrix": [2, 11], "x": 11.5, "y": 2.5},
{"matrix": [2, 12], "x": 12.5, "y": 2.5},
{"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},

{"matrix": [2, 14], "x": 15.25, "y": 2.5},
{"matrix": [2, 15], "x": 16.25, "y": 2.5},
{"matrix": [2, 16], "x": 17.25, "y": 2.5},

{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
{"matrix": [3, 1], "x": 1.75, "y": 3.5},
{"matrix": [3, 2], "x": 2.75, "y": 3.5},
{"matrix": [3, 3], "x": 3.75, "y": 3.5},
{"matrix": [3, 4], "x": 4.75, "y": 3.5},
{"matrix": [3, 5], "x": 5.75, "y": 3.5},
{"matrix": [3, 6], "x": 6.75, "y": 3.5},
{"matrix": [3, 7], "x": 7.75, "y": 3.5},
{"matrix": [3, 8], "x": 8.75, "y": 3.5},
{"matrix": [3, 9], "x": 9.75, "y": 3.5},
{"matrix": [3, 10], "x": 10.75, "y": 3.5},
{"matrix": [3, 11], "x": 11.75, "y": 3.5},
{"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},

{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
{"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, 12], "x": 12.25, "y": 4.5, "w": 2.75},

{"matrix": [4, 15], "x": 16.25, "y": 4.5},

{"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
{"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
{"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},

{"matrix": [5, 14], "x": 15.25, "y": 5.5},
{"matrix": [5, 15], "x": 16.25, "y": 5.5},
{"matrix": [5, 16], "x": 17.25, "y": 5.5}
]
},
"LAYOUT_tkl_iso_tsangan": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
Expand Down Expand Up @@ -384,6 +486,108 @@
{"matrix": [5, 11], "x": 12.5, "y": 5.5},
{"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},

{"matrix": [5, 14], "x": 15.25, "y": 5.5},
{"matrix": [5, 15], "x": 16.25, "y": 5.5},
{"matrix": [5, 16], "x": 17.25, "y": 5.5}
]
},
"LAYOUT_tkl_iso_wkl": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},

{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [0, 2], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0},

{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [0, 6], "x": 7.5, "y": 0},
{"matrix": [0, 7], "x": 8.5, "y": 0},
{"matrix": [0, 8], "x": 9.5, "y": 0},

{"matrix": [0, 9], "x": 11, "y": 0},
{"matrix": [0, 10], "x": 12, "y": 0},
{"matrix": [0, 11], "x": 13, "y": 0},
{"matrix": [0, 12], "x": 14, "y": 0},

{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "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, "w": 2},

{"matrix": [1, 14], "x": 15.25, "y": 1.5},
{"matrix": [1, 15], "x": 16.25, "y": 1.5},
{"matrix": [1, 16], "x": 17.25, "y": 1.5},

{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 2.5},
{"matrix": [2, 2], "x": 2.5, "y": 2.5},
{"matrix": [2, 3], "x": 3.5, "y": 2.5},
{"matrix": [2, 4], "x": 4.5, "y": 2.5},
{"matrix": [2, 5], "x": 5.5, "y": 2.5},
{"matrix": [2, 6], "x": 6.5, "y": 2.5},
{"matrix": [2, 7], "x": 7.5, "y": 2.5},
{"matrix": [2, 8], "x": 8.5, "y": 2.5},
{"matrix": [2, 9], "x": 9.5, "y": 2.5},
{"matrix": [2, 10], "x": 10.5, "y": 2.5},
{"matrix": [2, 11], "x": 11.5, "y": 2.5},
{"matrix": [2, 12], "x": 12.5, "y": 2.5},

{"matrix": [2, 14], "x": 15.25, "y": 2.5},
{"matrix": [2, 15], "x": 16.25, "y": 2.5},
{"matrix": [2, 16], "x": 17.25, "y": 2.5},

{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
{"matrix": [3, 1], "x": 1.75, "y": 3.5},
{"matrix": [3, 2], "x": 2.75, "y": 3.5},
{"matrix": [3, 3], "x": 3.75, "y": 3.5},
{"matrix": [3, 4], "x": 4.75, "y": 3.5},
{"matrix": [3, 5], "x": 5.75, "y": 3.5},
{"matrix": [3, 6], "x": 6.75, "y": 3.5},
{"matrix": [3, 7], "x": 7.75, "y": 3.5},
{"matrix": [3, 8], "x": 8.75, "y": 3.5},
{"matrix": [3, 9], "x": 9.75, "y": 3.5},
{"matrix": [3, 10], "x": 10.75, "y": 3.5},
{"matrix": [3, 11], "x": 11.75, "y": 3.5},
{"matrix": [2, 13], "x": 12.75, "y": 3.5},
{"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},

{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
{"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, 12], "x": 12.25, "y": 4.5, "w": 2.75},

{"matrix": [4, 15], "x": 16.25, "y": 4.5},

{"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
{"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
{"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},

{"matrix": [5, 14], "x": 15.25, "y": 5.5},
{"matrix": [5, 15], "x": 16.25, "y": 5.5},
{"matrix": [5, 16], "x": 17.25, "y": 5.5}
Expand Down
Loading
Loading