Skip to content

Commit 26ae432

Browse files
noroadsleftnoroadsleft
authored
handwired/split89 Layout Macro Refactor (#15210)
1 parent d2b2069 commit 26ae432

File tree

3 files changed

+130
-33
lines changed

3 files changed

+130
-33
lines changed

‎keyboards/handwired/split89/info.json

Lines changed: 96 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,102 @@
44
"url": "https://github.com/jurassic73/split89",
55
"layouts": {
66
"LAYOUT": {
7-
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"Backspace", "x":15.75, "y":1.5, "w":2}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"Enter", "x":15.5, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":2.75}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Fn", "x":1.25, "y":5.5, "w":1.25}, {"label":"Win", "x":2.5, "y":5.5, "w":1.25}, {"label":"Alt", "x":3.75, "y":5.5, "w":1.25}, {"x":5, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.5, "w":1.25}, {"label":"Win", "x":14, "y":5.5, "w":1.25}, {"label":"Menu", "x":15.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]
7+
"layout": [
8+
{"label":"Esc", "x":0, "y":0},
9+
{"label":"F1", "x":2, "y":0},
10+
{"label":"F2", "x":3, "y":0},
11+
{"label":"F3", "x":4, "y":0},
12+
{"label":"F4", "x":5, "y":0},
13+
{"label":"F5", "x":6, "y":0},
14+
{"label":"F6", "x":8.5, "y":0},
15+
{"label":"F7", "x":9.5, "y":0},
16+
{"label":"F8", "x":10.5, "y":0},
17+
{"label":"F9", "x":12.0, "y":0},
18+
{"label":"F10", "x":13.0, "y":0},
19+
{"label":"F11", "x":14.0, "y":0},
20+
{"label":"F12", "x":15.0, "y":0},
21+
{"label":"PrtSc", "x":16.25, "y":0},
22+
{"label":"Scroll Lock", "x":17.25, "y":0},
23+
{"label":"Pause", "x":18.25, "y":0},
24+
25+
{"label":"`~", "x":0, "y":1.25},
26+
{"label":"1!", "x":1, "y":1.25},
27+
{"label":"2@", "x":2, "y":1.25},
28+
{"label":"3#", "x":3, "y":1.25},
29+
{"label":"4$", "x":4, "y":1.25},
30+
{"label":"5%", "x":5, "y":1.25},
31+
{"label":"6^", "x":6, "y":1.25},
32+
{"label":"7&", "x":8.0, "y":1.25},
33+
{"label":"8*", "x":9.0, "y":1.25},
34+
{"label":"9(", "x":10.0, "y":1.25},
35+
{"label":"0)", "x":11.0, "y":1.25},
36+
{"label":"-_", "x":12.0, "y":1.25},
37+
{"label":"=+", "x":13.0, "y":1.25},
38+
{"label":"Backspace", "x":14.0, "y":1.25, "w":2},
39+
{"label":"Insert", "x":16.25, "y":1.25},
40+
{"label":"Home", "x":17.25, "y":1.25},
41+
{"label":"PgUp", "x":18.25, "y":1.25},
42+
43+
{"label":"Tab", "x":0, "y":2.25, "w":1.5},
44+
{"label":"Q", "x":1.5, "y":2.25},
45+
{"label":"W", "x":2.5, "y":2.25},
46+
{"label":"E", "x":3.5, "y":2.25},
47+
{"label":"R", "x":4.5, "y":2.25},
48+
{"label":"T", "x":5.5, "y":2.25},
49+
{"label":"Y", "x":7.5, "y":2.25},
50+
{"label":"U", "x":8.5, "y":2.25},
51+
{"label":"I", "x":9.5, "y":2.25},
52+
{"label":"O", "x":10.5, "y":2.25},
53+
{"label":"P", "x":11.5, "y":2.25},
54+
{"label":"[{", "x":12.5, "y":2.25},
55+
{"label":"]}", "x":13.5, "y":2.25},
56+
{"label":"\\|", "x":14.5, "y":2.25, "w":1.5},
57+
{"label":"Delete", "x":16.25, "y":2.25},
58+
{"label":"End", "x":17.25, "y":2.25},
59+
{"label":"PgDn", "x":18.25, "y":2.25},
60+
61+
{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
62+
{"label":"A", "x":1.75, "y":3.25},
63+
{"label":"S", "x":2.75, "y":3.25},
64+
{"label":"D", "x":3.75, "y":3.25},
65+
{"label":"F", "x":4.75, "y":3.25},
66+
{"label":"G", "x":5.75, "y":3.25},
67+
{"label":"H", "x":7.75, "y":3.25},
68+
{"label":"J", "x":8.75, "y":3.25},
69+
{"label":"K", "x":9.75, "y":3.25},
70+
{"label":"L", "x":10.75, "y":3.25},
71+
{"label":";:", "x":11.75, "y":3.25},
72+
{"label":"'\"", "x":12.75, "y":3.25},
73+
{"label":"Enter", "x":13.75, "y":3.25, "w":2.25},
74+
75+
{"label":"Shift", "x":0, "y":4.25, "w":2.25},
76+
{"label":"Z", "x":2.25, "y":4.25},
77+
{"label":"X", "x":3.25, "y":4.25},
78+
{"label":"C", "x":4.25, "y":4.25},
79+
{"label":"V", "x":5.25, "y":4.25},
80+
{"label":"B", "x":6.25, "y":4.25},
81+
{"label":"N", "x":8.25, "y":4.25},
82+
{"label":"M", "x":9.25, "y":4.25},
83+
{"label":",<", "x":10.25, "y":4.25},
84+
{"label":".>", "x":11.25, "y":4.25},
85+
{"label":"/?", "x":12.25, "y":4.25},
86+
{"label":"Shift", "x":13.25, "y":4.25, "w":2.75},
87+
{"label":"\u2191", "x":17.25, "y":4.25},
88+
89+
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
90+
{"label":"Fn", "x":1.25, "y":5.25, "w":1.25},
91+
{"label":"Win", "x":2.5, "y":5.25, "w":1.25},
92+
{"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
93+
{"label":"Space", "x":5, "y":5.25, "w":2.25},
94+
{"label":"Space", "x":8.25, "y":5.25, "w":2.75},
95+
{"label":"Alt", "x":11.0, "y":5.25, "w":1.25},
96+
{"label":"Win", "x":12.25, "y":5.25, "w":1.25},
97+
{"label":"Menu", "x":13.5, "y":5.25, "w":1.25},
98+
{"label":"Ctrl", "x":14.75, "y":5.25, "w":1.25},
99+
{"label":"\u2190", "x":16.25, "y":5.25},
100+
{"label":"\u2193", "x":17.25, "y":5.25},
101+
{"label":"\u2192", "x":18.25, "y":5.25}
102+
]
8103
}
9104
}
10105
}

‎keyboards/handwired/split89/keymaps/default/keymap.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ enum layer_names {
2323
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2424
/* Base */
2525
[0] = LAYOUT(
26-
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_SLCK, KC_PAUS,
27-
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,
28-
KC_TAB,KC_Q, KC_W, KC_E, KC_R, KC_T, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
29-
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_Y, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT,
30-
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_H, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP,
31-
KC_LCTL,MO(1),KC_LGUI,KC_LALT,KC_SPACE, KC_N, KC_SPACE, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
32-
),
26+
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_SLCK, KC_PAUS,
27+
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,
28+
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,
29+
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,
30+
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,
31+
KC_LCTL, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
32+
),
3333
/* Volume */
3434
[1] = LAYOUT(
35-
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,
36-
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,
37-
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,
38-
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,
39-
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_VOLU,
40-
KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_MEDIA_PLAY_PAUSE, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
41-
),
35+
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,
36+
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,
37+
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,
38+
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,
39+
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_VOLU,
40+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
41+
),
4242
};

‎keyboards/handwired/split89/split89.h

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include "quantum.h"
2020

21+
#define XXX KC_NO
22+
2123
/* This is a shortcut to help you visually see your layout.
2224
*
2325
* The first section contains all of the arguments representing the physical
@@ -27,24 +29,24 @@
2729
* represents the switch matrix which includes blanks in the wired out matrix.
2830
*/
2931
#define LAYOUT( \
30-
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
31-
k32, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, \
32-
k48, k33, k34, k35, k36, k37, k54, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, \
33-
k61, k49, k50, k51, k52, k53, k67, k55, k56, k57, k58, k59, k60, \
34-
k74, k62, k63, k64, k65, k66, k80, k68, k69, k70, k71, k72, k73, \
35-
k75, k76, k77, k78, k79, k81, k82, k83, k84, k85, k86, k87, k88 \
32+
K04, K05, K06, K07, K08, K09, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, \
33+
K24, K14, K15, K16, K17, K18, K19, K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, \
34+
K34, K25, K26, K27, K28, K29, K39, K90, K80, K81, K82, K83, K84, K85, K86, K87, K88, \
35+
K89, K44, K35, K36, K37, K38, K49, KA0, K91, K92, K93, K94, K95, \
36+
K96, K54, K45, K46, K47, K48, K59, KB0, KA1, KA2, KA3, KA4, KA6, \
37+
KA8, K55, K56, K57, K58, KB1, KB3, KB4, KB5, KB6, KB7, KB8, KB9 \
3638
) \
3739
{ \
38-
{ KC_NO, KC_NO, KC_NO, KC_NO, k00, k01, k02, k03, k04, k05 }, \
39-
{ KC_NO, KC_NO, KC_NO, KC_NO, k16, k17, k18, k19, k20, k21 }, \
40-
{ KC_NO, KC_NO, KC_NO, KC_NO, k32, k33, k34, k35, k36, k37 }, \
41-
{ KC_NO, KC_NO, KC_NO, KC_NO, k48, k49, k50, k51, k52, k53 }, \
42-
{ KC_NO, KC_NO, KC_NO, KC_NO, k61, k62, k63, k64, k65, k66, }, \
43-
{ KC_NO, KC_NO, KC_NO, KC_NO, k74, k75, k76, k77, k78, k79, }, \
44-
{ k06, k07, k08, k09, k10, k11, k12, k13, k14, k15 }, \
45-
{ k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
46-
{ k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 }, \
47-
{ k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
48-
{ k67, k68, k69, k70, k71, KC_NO, k72, KC_NO, k73, KC_NO }, \
49-
{ k80, k81, KC_NO, k82, k83, k84, k85, k86, k87, k88 } \
40+
{ XXX, XXX, XXX, XXX, K04, K05, K06, K07, K08, K09 }, \
41+
{ XXX, XXX, XXX, XXX, K14, K15, K16, K17, K18, K19 }, \
42+
{ XXX, XXX, XXX, XXX, K24, K25, K26, K27, K28, K29 }, \
43+
{ XXX, XXX, XXX, XXX, K34, K35, K36, K37, K38, K39 }, \
44+
{ XXX, XXX, XXX, XXX, K44, K45, K46, K47, K48, K49 }, \
45+
{ XXX, XXX, XXX, XXX, K54, K55, K56, K57, K58, K59 }, \
46+
{ K60, K61, K62, K63, K64, K65, K66, K67, K68, K69 }, \
47+
{ K70, K71, K72, K73, K74, K75, K76, K77, K78, K79 }, \
48+
{ K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 }, \
49+
{ K90, K91, K92, K93, K94, K95, K96, XXX, XXX, XXX }, \
50+
{ KA0, KA1, KA2, KA3, KA4, XXX, KA6, XXX, KA8, XXX }, \
51+
{ KB0, KB1, XXX, KB3, KB4, KB5, KB6, KB7, KB8, KB9 } \
5052
}

0 commit comments

Comments
 (0)