aboutsummaryrefslogtreecommitdiff
path: root/keyboards/checkerboards
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-07-12 23:32:54 -0700
committerGitHub <noreply@github.com>2021-07-12 23:32:54 -0700
commit7d2f70f39852fbc8e7954792156cc90921c39f14 (patch)
tree3117fb13be73b0e3431c0af39b48b7de2a84c9fe /keyboards/checkerboards
parent8f0bf52b250406d0063726d4c62c78e84c1d1f2b (diff)
downloadqmk_firmware-7d2f70f39852fbc8e7954792156cc90921c39f14.tar.gz
qmk_firmware-7d2f70f39852fbc8e7954792156cc90921c39f14.zip
Checker Boards NOP60 touch-up (#13526)
* apply human-friendly formatting to info.json * fix JSON tree errors in info.json * rename layout macros - rename LAYOUT_2x3u to LAYOUT_60_tsangan_hhkb_split_space - rename LAYOUT_7u to LAYOUT_60_tsangan_hhkb * rename 2x3u keymap to default
Diffstat (limited to 'keyboards/checkerboards')
-rw-r--r--keyboards/checkerboards/nop60/info.json148
-rw-r--r--keyboards/checkerboards/nop60/keymaps/7u/keymap.c6
-rw-r--r--keyboards/checkerboards/nop60/keymaps/default/config.h (renamed from keyboards/checkerboards/nop60/keymaps/2x3u/config.h)0
-rw-r--r--keyboards/checkerboards/nop60/keymaps/default/keymap.c (renamed from keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c)6
-rw-r--r--keyboards/checkerboards/nop60/keymaps/via/keymap.c8
-rw-r--r--keyboards/checkerboards/nop60/nop60.h4
6 files changed, 156 insertions, 16 deletions
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 82ff7229f..ab68c0cda 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -4,12 +4,152 @@
4 "maintainer": "nasp", 4 "maintainer": "nasp",
5 "width": 15, 5 "width": 15,
6 "height": 5, 6 "height": 5,
7 "layout_aliases": {
8 "LAYOUT_2x3u": "LAYOUT_60_tsangan_hhkb_split_space",
9 "LAYOUT_7u": "LAYOUT_60_tsangan_hhkb"
10 },
7 "layouts": { 11 "layouts": {
8 "LAYOUT": { 12 "LAYOUT_60_tsangan_hhkb_split_space": {
9 "2x3u": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] 13 "layout": [
14 {"label":"Esc", "x":0, "y":0},
15 {"label":"!", "x":1, "y":0},
16 {"label":"@", "x":2, "y":0},
17 {"label":"#", "x":3, "y":0},
18 {"label":"$", "x":4, "y":0},
19 {"label":"%", "x":5, "y":0},
20 {"label":"^", "x":6, "y":0},
21 {"label":"&", "x":7, "y":0},
22 {"label":"*", "x":8, "y":0},
23 {"label":"(", "x":9, "y":0},
24 {"label":")", "x":10, "y":0},
25 {"label":"_", "x":11, "y":0},
26 {"label":"+", "x":12, "y":0},
27 {"label":"~", "x":13, "y":0},
28 {"label":"Bksp", "x":14, "y":0},
29
30 {"label":"Tab", "x":0, "y":1, "w":1.5},
31 {"label":"Q", "x":1.5, "y":1},
32 {"label":"W", "x":2.5, "y":1},
33 {"label":"E", "x":3.5, "y":1},
34 {"label":"R", "x":4.5, "y":1},
35 {"label":"T", "x":5.5, "y":1},
36 {"label":"Y", "x":6.5, "y":1},
37 {"label":"U", "x":7.5, "y":1},
38 {"label":"I", "x":8.5, "y":1},
39 {"label":"O", "x":9.5, "y":1},
40 {"label":"P", "x":10.5, "y":1},
41 {"label":"{", "x":11.5, "y":1},
42 {"label":"}", "x":12.5, "y":1},
43 {"label":"|", "x":13.5, "y":1, "w":1.5},
44
45 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
46 {"label":"A", "x":1.75, "y":2},
47 {"label":"S", "x":2.75, "y":2},
48 {"label":"D", "x":3.75, "y":2},
49 {"label":"F", "x":4.75, "y":2},
50 {"label":"G", "x":5.75, "y":2},
51 {"label":"H", "x":6.75, "y":2},
52 {"label":"J", "x":7.75, "y":2},
53 {"label":"K", "x":8.75, "y":2},
54 {"label":"L", "x":9.75, "y":2},
55 {"label":":", "x":10.75, "y":2},
56 {"label":"\"", "x":11.75, "y":2},
57 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
58
59 {"label":"Shift", "x":0, "y":3, "w":2.25},
60 {"label":"Z", "x":2.25, "y":3},
61 {"label":"X", "x":3.25, "y":3},
62 {"label":"C", "x":4.25, "y":3},
63 {"label":"V", "x":5.25, "y":3},
64 {"label":"B", "x":6.25, "y":3},
65 {"label":"N", "x":7.25, "y":3},
66 {"label":"M", "x":8.25, "y":3},
67 {"label":"<", "x":9.25, "y":3},
68 {"label":">", "x":10.25, "y":3},
69 {"label":"?", "x":11.25, "y":3},
70 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
71 {"label":"Fn", "x":14, "y":3},
72
73 {"label":"Ctrl", "x":0, "y":4, "w":1.5},
74 {"label":"Win", "x":1.5, "y":4},
75 {"label":"Alt", "x":2.5, "y":4, "w":1.5},
76 {"x":4, "y":4, "w":3},
77 {"x":7, "y":4},
78 {"x":8, "y":4, "w":3},
79 {"label":"Alt", "x":11, "y":4, "w":1.5},
80 {"label":"Win", "x":12.5, "y":4},
81 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
82 ]
10 }, 83 },
11 "LAYOUT": { 84 "LAYOUT_60_tsangan_hhkb": {
12 "7u": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] 85 "layout": [
86 {"label":"Esc", "x":0, "y":0},
87 {"label":"!", "x":1, "y":0},
88 {"label":"@", "x":2, "y":0},
89 {"label":"#", "x":3, "y":0},
90 {"label":"$", "x":4, "y":0},
91 {"label":"%", "x":5, "y":0},
92 {"label":"^", "x":6, "y":0},
93 {"label":"&", "x":7, "y":0},
94 {"label":"*", "x":8, "y":0},
95 {"label":"(", "x":9, "y":0},
96 {"label":")", "x":10, "y":0},
97 {"label":"_", "x":11, "y":0},
98 {"label":"+", "x":12, "y":0},
99 {"label":"~", "x":13, "y":0},
100 {"label":"Bksp", "x":14, "y":0},
101
102 {"label":"Tab", "x":0, "y":1, "w":1.5},
103 {"label":"Q", "x":1.5, "y":1},
104 {"label":"W", "x":2.5, "y":1},
105 {"label":"E", "x":3.5, "y":1},
106 {"label":"R", "x":4.5, "y":1},
107 {"label":"T", "x":5.5, "y":1},
108 {"label":"Y", "x":6.5, "y":1},
109 {"label":"U", "x":7.5, "y":1},
110 {"label":"I", "x":8.5, "y":1},
111 {"label":"O", "x":9.5, "y":1},
112 {"label":"P", "x":10.5, "y":1},
113 {"label":"{", "x":11.5, "y":1},
114 {"label":"}", "x":12.5, "y":1},
115 {"label":"|", "x":13.5, "y":1, "w":1.5},
116
117 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
118 {"label":"A", "x":1.75, "y":2},
119 {"label":"S", "x":2.75, "y":2},
120 {"label":"D", "x":3.75, "y":2},
121 {"label":"F", "x":4.75, "y":2},
122 {"label":"G", "x":5.75, "y":2},
123 {"label":"H", "x":6.75, "y":2},
124 {"label":"J", "x":7.75, "y":2},
125 {"label":"K", "x":8.75, "y":2},
126 {"label":"L", "x":9.75, "y":2},
127 {"label":":", "x":10.75, "y":2},
128 {"label":"\"", "x":11.75, "y":2},
129 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
130
131 {"label":"Shift", "x":0, "y":3, "w":2.25},
132 {"label":"Z", "x":2.25, "y":3},
133 {"label":"X", "x":3.25, "y":3},
134 {"label":"C", "x":4.25, "y":3},
135 {"label":"V", "x":5.25, "y":3},
136 {"label":"B", "x":6.25, "y":3},
137 {"label":"N", "x":7.25, "y":3},
138 {"label":"M", "x":8.25, "y":3},
139 {"label":"<", "x":9.25, "y":3},
140 {"label":">", "x":10.25, "y":3},
141 {"label":"?", "x":11.25, "y":3},
142 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
143 {"label":"Fn", "x":14, "y":3},
144
145 {"label":"Ctrl", "x":0, "y":4, "w":1.5},
146 {"label":"Win", "x":1.5, "y":4},
147 {"label":"Alt", "x":2.5, "y":4, "w":1.5},
148 {"x":4, "y":4, "w":7},
149 {"label":"Alt", "x":11, "y":4, "w":1.5},
150 {"label":"Win", "x":12.5, "y":4},
151 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
152 ]
13 } 153 }
14 } 154 }
15} 155}
diff --git a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
index 1d230c363..61bca2616 100644
--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 * |Ctrl |GUI |Alt | Space |Alt |GUI |Ctrl | 34 * |Ctrl |GUI |Alt | Space |Alt |GUI |Ctrl |
35 * `-------------------------------------------------------------' 35 * `-------------------------------------------------------------'
36 */ 36 */
37 [0] = LAYOUT_7u( 37 [0] = LAYOUT_60_tsangan_hhkb(
38 KC_GESC, 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_DEL, 38 KC_GESC, 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_DEL,
39 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_BSPC, 39 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_BSPC,
40 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, 40 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,
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54 * | | | | | | |RESET | 54 * | | | | | | |RESET |
55 * `------------------------------------------------------------------------------' 55 * `------------------------------------------------------------------------------'
56 */ 56 */
57 [1] = LAYOUT_7u( 57 [1] = LAYOUT_60_tsangan_hhkb(
58 KC_GRV, 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_DEL, _______, 58 KC_GRV, 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_DEL, _______,
59 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 59 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
60 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 60 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
75 * | | | | | | |RESET | 75 * | | | | | | |RESET |
76 * `------------------------------------------------------------------------------' 76 * `------------------------------------------------------------------------------'
77 */ 77 */
78 [2] = LAYOUT_7u( 78 [2] = LAYOUT_60_tsangan_hhkb(
79 KC_GRV, 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_DEL, _______, 79 KC_GRV, 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_DEL, _______,
80 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 80 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
81 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 81 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/checkerboards/nop60/keymaps/2x3u/config.h b/keyboards/checkerboards/nop60/keymaps/default/config.h
index 598074ad2..598074ad2 100644
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/config.h
+++ b/keyboards/checkerboards/nop60/keymaps/default/config.h
diff --git a/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
index eb05ab136..ef3ff4b8b 100644
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 * |Ctrl |GUI |Alt |Space |BLTOG |Space |Alt |GUI |Ctrl | 32 * |Ctrl |GUI |Alt |Space |BLTOG |Space |Alt |GUI |Ctrl |
33 * `-------------------------------------------------------------' 33 * `-------------------------------------------------------------'
34 */ 34 */
35 [0] = LAYOUT_2x3u( 35 [0] = LAYOUT_60_tsangan_hhkb_split_space(
36 KC_GESC, 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_DEL, 36 KC_GESC, 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_DEL,
37 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_BSPC, 37 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_BSPC,
38 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, 38 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,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 * | | | | | | | | |RESET | 52 * | | | | | | | | |RESET |
53 * `------------------------------------------------------------------------------' 53 * `------------------------------------------------------------------------------'
54 */ 54 */
55 [1] = LAYOUT_2x3u( 55 [1] = LAYOUT_60_tsangan_hhkb_split_space(
56 KC_GRV, 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_DEL, _______, 56 KC_GRV, 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_DEL, _______,
57 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 57 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
58 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 58 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
73 * | | | | | | | | |RESET | 73 * | | | | | | | | |RESET |
74 * `------------------------------------------------------------------------------' 74 * `------------------------------------------------------------------------------'
75 */ 75 */
76 [2] = LAYOUT_2x3u( 76 [2] = LAYOUT_60_tsangan_hhkb_split_space(
77 KC_GRV, 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_DEL, _______, 77 KC_GRV, 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_DEL, _______,
78 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 78 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
79 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 79 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/checkerboards/nop60/keymaps/via/keymap.c b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
index 06714115f..1fbed16ca 100644
--- a/keyboards/checkerboards/nop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 * └────┴───┴────┴──────────┴────────┴────┴────┘ │ ← │ ↓ │ → │ 43 * └────┴───┴────┴──────────┴────────┴────┴────┘ │ ← │ ↓ │ → │
44 * └───┴───┴───┘ 44 * └───┴───┴───┘
45 */ 45 */
46 [_BASE] = LAYOUT_2x3u( 46 [_BASE] = LAYOUT_60_tsangan_hhkb_split_space(
47 KC_GESC, 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_DEL, 47 KC_GESC, 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_DEL,
48 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_BSPC, 48 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_BSPC,
49 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, 49 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,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
62 * └────┴───┴────┴──────────┴────────┴────┴────┘ │ │ │ │ 62 * └────┴───┴────┴──────────┴────────┴────┴────┘ │ │ │ │
63 * └───┴───┴───┘ 63 * └───┴───┴───┘
64 */ 64 */
65 [_FN1] = LAYOUT_2x3u( 65 [_FN1] = LAYOUT_60_tsangan_hhkb_split_space(
66 KC_GRV, 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_DEL, _______, 66 KC_GRV, 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_DEL, _______,
67 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 67 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 68 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 * └────┴────┴────┴──────────┴────────┴────┴────┘ │ │ │ │ 82 * └────┴────┴────┴──────────┴────────┴────┴────┘ │ │ │ │
83 * └───┴───┴───┘ 83 * └───┴───┴───┘
84 */ 84 */
85 [_FN2] = LAYOUT_2x3u( 85 [_FN2] = LAYOUT_60_tsangan_hhkb_split_space(
86 KC_GRV, 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_DEL, _______, 86 KC_GRV, 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_DEL, _______,
87 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 87 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
88 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 88 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
90 _______, _______, _______, _______, _______, _______, _______, _______, RESET 90 _______, _______, _______, _______, _______, _______, _______, _______, RESET
91 ), 91 ),
92 92
93 [_VIA] = LAYOUT_2x3u( 93 [_VIA] = LAYOUT_60_tsangan_hhkb_split_space(
94 KC_GRV, 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_DEL, _______, 94 KC_GRV, 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_DEL, _______,
95 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 95 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
96 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 96 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/checkerboards/nop60/nop60.h b/keyboards/checkerboards/nop60/nop60.h
index 57da9d51e..6e98e854b 100644
--- a/keyboards/checkerboards/nop60/nop60.h
+++ b/keyboards/checkerboards/nop60/nop60.h
@@ -21,7 +21,7 @@
21 21
22#define xxx KC_NO 22#define xxx KC_NO
23 23
24#define LAYOUT_2x3u( \ 24#define LAYOUT_60_tsangan_hhkb_split_space( \
25 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \ 25 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ 26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ 27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
@@ -34,7 +34,7 @@
34 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, xxx, k3D }, \ 34 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, xxx, k3D }, \
35 { k40, k41, k42, xxx, k44, xxx, k46, xxx, k48, xxx, k4A, k4B, k4C, k4D } \ 35 { k40, k41, k42, xxx, k44, xxx, k46, xxx, k48, xxx, k4A, k4B, k4C, k4D } \
36} 36}
37#define LAYOUT_7u( \ 37#define LAYOUT_60_tsangan_hhkb( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \ 38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
39 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ 39 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
40 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ 40 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \