aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-07-31 12:17:55 -0700
committerGitHub <noreply@github.com>2021-07-31 12:17:55 -0700
commit851d995a7db7db6bfc366e3d43ce97f7fab17295 (patch)
treecf0ace988a69220129c75b850a797ed4ee5b8da9
parent1305b6d82e87ff4116832de6e70f08186c278a6c (diff)
downloadqmk_firmware-851d995a7db7db6bfc366e3d43ce97f7fab17295.tar.gz
qmk_firmware-851d995a7db7db6bfc366e3d43ce97f7fab17295.zip
Merro60 Layout Macro Refactor (#13827)
Diffstat
-rw-r--r--keyboards/chlx/merro60/info.json158
-rw-r--r--keyboards/chlx/merro60/keymaps/ansi/keymap.c8
-rw-r--r--keyboards/chlx/merro60/keymaps/default/keymap.c4
-rw-r--r--keyboards/chlx/merro60/keymaps/hhkb/keymap.c4
-rw-r--r--keyboards/chlx/merro60/keymaps/iso/keymap.c4
-rw-r--r--keyboards/chlx/merro60/keymaps/tsangan/keymap.c4
-rw-r--r--keyboards/chlx/merro60/keymaps/via/keymap.c8
-rw-r--r--keyboards/chlx/merro60/merro60.h113
-rw-r--r--keyboards/chlx/merro60/rules.mk2
9 files changed, 238 insertions, 67 deletions
diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json
index 8205d4d24..00ae7cf17 100644
--- a/keyboards/chlx/merro60/info.json
+++ b/keyboards/chlx/merro60/info.json
@@ -4,8 +4,14 @@
4 "maintainer": "gaclee3b", 4 "maintainer": "gaclee3b",
5 "width": 15, 5 "width": 15,
6 "height": 5, 6 "height": 5,
7 "layout_aliases": {
8 "LAYOUT_default": "LAYOUT_all",
9 "LAYOUT_hhkb": "LAYOUT_60_hhkb",
10 "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift",
11 "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
12 },
7 "layouts": { 13 "layouts": {
8 "LAYOUT_default": { 14 "LAYOUT_all": {
9 "layout": [ 15 "layout": [
10 {"x": 0, "y": 0}, 16 {"x": 0, "y": 0},
11 {"x": 1, "y": 0}, 17 {"x": 1, "y": 0},
@@ -78,7 +84,76 @@
78 {"x": 13.75, "y": 4, "w": 1.25} 84 {"x": 13.75, "y": 4, "w": 1.25}
79 ] 85 ]
80 }, 86 },
81 "LAYOUT_ansi": { 87 "LAYOUT_60_ansi": {
88 "layout": [
89 {"x":0, "y":0},
90 {"x":1, "y":0},
91 {"x":2, "y":0},
92 {"x":3, "y":0},
93 {"x":4, "y":0},
94 {"x":5, "y":0},
95 {"x":6, "y":0},
96 {"x":7, "y":0},
97 {"x":8, "y":0},
98 {"x":9, "y":0},
99 {"x":10, "y":0},
100 {"x":11, "y":0},
101 {"x":12, "y":0},
102 {"x":13, "y":0, "w":2},
103
104 {"x":0, "y":1, "w":1.5},
105 {"x":1.5, "y":1},
106 {"x":2.5, "y":1},
107 {"x":3.5, "y":1},
108 {"x":4.5, "y":1},
109 {"x":5.5, "y":1},
110 {"x":6.5, "y":1},
111 {"x":7.5, "y":1},
112 {"x":8.5, "y":1},
113 {"x":9.5, "y":1},
114 {"x":10.5, "y":1},
115 {"x":11.5, "y":1},
116 {"x":12.5, "y":1},
117 {"x":13.5, "y":1, "w":1.5},
118
119 {"x":0, "y":2, "w":1.75},
120 {"x":1.75, "y":2},
121 {"x":2.75, "y":2},
122 {"x":3.75, "y":2},
123 {"x":4.75, "y":2},
124 {"x":5.75, "y":2},
125 {"x":6.75, "y":2},
126 {"x":7.75, "y":2},
127 {"x":8.75, "y":2},
128 {"x":9.75, "y":2},
129 {"x":10.75, "y":2},
130 {"x":11.75, "y":2},
131 {"x":12.75, "y":2, "w":2.25},
132
133 {"x":0, "y":3, "w":2.25},
134 {"x":2.25, "y":3},
135 {"x":3.25, "y":3},
136 {"x":4.25, "y":3},
137 {"x":5.25, "y":3},
138 {"x":6.25, "y":3},
139 {"x":7.25, "y":3},
140 {"x":8.25, "y":3},
141 {"x":9.25, "y":3},
142 {"x":10.25, "y":3},
143 {"x":11.25, "y":3},
144 {"x":12.25, "y":3, "w":2.75},
145
146 {"x":0, "y":4, "w":1.25},
147 {"x":1.25, "y":4, "w":1.25},
148 {"x":2.5, "y":4, "w":1.25},
149 {"x":3.75, "y":4, "w":6.25},
150 {"x":10, "y":4, "w":1.25},
151 {"x":11.25, "y":4, "w":1.25},
152 {"x":12.5, "y":4, "w":1.25},
153 {"x":13.75, "y":4, "w":1.25}
154 ]
155 },
156 "LAYOUT_60_ansi_split_bs_rshift": {
82 "layout": [ 157 "layout": [
83 {"x": 0, "y": 0}, 158 {"x": 0, "y": 0},
84 {"x": 1, "y": 0}, 159 {"x": 1, "y": 0},
@@ -125,8 +200,7 @@
125 {"x": 11.75, "y": 2}, 200 {"x": 11.75, "y": 2},
126 {"x": 12.75, "y": 2, "w": 2.25}, 201 {"x": 12.75, "y": 2, "w": 2.25},
127 202
128 {"x": 0, "y": 3, "w": 1.25}, 203 {"x": 0, "y": 3, "w": 2.25},
129 {"x": 1.25, "y": 3},
130 {"x": 2.25, "y": 3}, 204 {"x": 2.25, "y": 3},
131 {"x": 3.25, "y": 3}, 205 {"x": 3.25, "y": 3},
132 {"x": 4.25, "y": 3}, 206 {"x": 4.25, "y": 3},
@@ -150,7 +224,7 @@
150 {"x": 13.75, "y": 4, "w": 1.25} 224 {"x": 13.75, "y": 4, "w": 1.25}
151 ] 225 ]
152 }, 226 },
153 "LAYOUT_hhkb": { 227 "LAYOUT_60_hhkb": {
154 "layout": [ 228 "layout": [
155 {"x": 0, "y": 0}, 229 {"x": 0, "y": 0},
156 {"x": 1, "y": 0}, 230 {"x": 1, "y": 0},
@@ -218,7 +292,77 @@
218 {"x": 12.5, "y": 4} 292 {"x": 12.5, "y": 4}
219 ] 293 ]
220 }, 294 },
221 "LAYOUT_iso": { 295 "LAYOUT_60_iso": {
296 "layout": [
297 {"x": 0, "y": 0},
298 {"x": 1, "y": 0},
299 {"x": 2, "y": 0},
300 {"x": 3, "y": 0},
301 {"x": 4, "y": 0},
302 {"x": 5, "y": 0},
303 {"x": 6, "y": 0},
304 {"x": 7, "y": 0},
305 {"x": 8, "y": 0},
306 {"x": 9, "y": 0},
307 {"x": 10, "y": 0},
308 {"x": 11, "y": 0},
309 {"x": 12, "y": 0},
310 {"x": 13, "y": 0, "w": 2},
311
312 {"x": 0, "y": 1, "w": 1.5},
313 {"x": 1.5, "y": 1},
314 {"x": 2.5, "y": 1},
315 {"x": 3.5, "y": 1},
316 {"x": 4.5, "y": 1},
317 {"x": 5.5, "y": 1},
318 {"x": 6.5, "y": 1},
319 {"x": 7.5, "y": 1},
320 {"x": 8.5, "y": 1},
321 {"x": 9.5, "y": 1},
322 {"x": 10.5, "y": 1},
323 {"x": 11.5, "y": 1},
324 {"x": 12.5, "y": 1},
325
326 {"x": 0, "y": 2, "w": 1.75},
327 {"x": 1.75, "y": 2},
328 {"x": 2.75, "y": 2},
329 {"x": 3.75, "y": 2},
330 {"x": 4.75, "y": 2},
331 {"x": 5.75, "y": 2},
332 {"x": 6.75, "y": 2},
333 {"x": 7.75, "y": 2},
334 {"x": 8.75, "y": 2},
335 {"x": 9.75, "y": 2},
336 {"x": 10.75, "y": 2},
337 {"x": 11.75, "y": 2},
338 {"x": 12.75, "y": 2},
339 {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
340
341 {"x": 0, "y": 3, "w": 1.25},
342 {"x": 1.25, "y": 3},
343 {"x": 2.25, "y": 3},
344 {"x": 3.25, "y": 3},
345 {"x": 4.25, "y": 3},
346 {"x": 5.25, "y": 3},
347 {"x": 6.25, "y": 3},
348 {"x": 7.25, "y": 3},
349 {"x": 8.25, "y": 3},
350 {"x": 9.25, "y": 3},
351 {"x": 10.25, "y": 3},
352 {"x": 11.25, "y": 3},
353 {"x": 12.25, "y": 3, "w": 2.75},
354
355 {"x": 0, "y": 4, "w": 1.25},
356 {"x": 1.25, "y": 4, "w": 1.25},
357 {"x": 2.5, "y": 4, "w": 1.25},
358 {"x": 3.75, "y": 4, "w": 6.25},
359 {"x": 10, "y": 4, "w": 1.25},
360 {"x": 11.25, "y": 4, "w": 1.25},
361 {"x": 12.5, "y": 4, "w": 1.25},
362 {"x": 13.75, "y": 4, "w": 1.25}
363 ]
364 },
365 "LAYOUT_60_iso_split_bs_rshift": {
222 "layout": [ 366 "layout": [
223 {"x": 0, "y": 0}, 367 {"x": 0, "y": 0},
224 {"x": 1, "y": 0}, 368 {"x": 1, "y": 0},
@@ -290,7 +434,7 @@
290 {"x": 13.75, "y": 4, "w": 1.25} 434 {"x": 13.75, "y": 4, "w": 1.25}
291 ] 435 ]
292 }, 436 },
293 "LAYOUT_tsangan": { 437 "LAYOUT_60_tsangan_hhkb": {
294 "layout": [ 438 "layout": [
295 {"x": 0, "y": 0}, 439 {"x": 0, "y": 0},
296 {"x": 1, "y": 0}, 440 {"x": 1, "y": 0},
diff --git a/keyboards/chlx/merro60/keymaps/ansi/keymap.c b/keyboards/chlx/merro60/keymaps/ansi/keymap.c
index 307f98866..eebc623cc 100644
--- a/keyboards/chlx/merro60/keymaps/ansi/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/ansi/keymap.c
@@ -19,17 +19,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_ansi( 22[0] = LAYOUT_60_ansi_split_bs_rshift(
23 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_BSPC, KC_BSPC, 23 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_BSPC, KC_BSPC,
24 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, 24 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,
25 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, 25 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,
26 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_RSFT, 26 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_RSFT,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
28 28
29[1] = LAYOUT_ansi( 29[1] = LAYOUT_60_ansi_split_bs_rshift(
30 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, _______, 30 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, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, RESET, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, RESET,
32 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, 32 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______), 34 _______, _______, _______, _______, _______, _______, _______, _______),
35}; 35};
diff --git a/keyboards/chlx/merro60/keymaps/default/keymap.c b/keyboards/chlx/merro60/keymaps/default/keymap.c
index 98046d064..ee16d6380 100644
--- a/keyboards/chlx/merro60/keymaps/default/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/default/keymap.c
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_default( 22[0] = LAYOUT_all(
23 KC_ESC, 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_GRV, 23 KC_ESC, 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_GRV,
24 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, 24 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,
25 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_UP, KC_ENT, 25 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_UP, KC_ENT,
26 KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, 26 KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL), 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL),
28 28
29[1] = LAYOUT_default( 29[1] = LAYOUT_all(
30 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, 30 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,
31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, 31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
index 3ea2901bd..b7058cfc1 100644
--- a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_hhkb( 22[0] = LAYOUT_60_hhkb(
23 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_GRV, 23 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_GRV,
24 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, 24 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,
25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), 26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
27 KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), 27 KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI),
28 28
29[1] = LAYOUT_hhkb( 29[1] = LAYOUT_60_hhkb(
30 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_INS, KC_DEL, 30 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_INS, KC_DEL,
31 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, RESET, 31 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, RESET,
32 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, 32 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
diff --git a/keyboards/chlx/merro60/keymaps/iso/keymap.c b/keyboards/chlx/merro60/keymaps/iso/keymap.c
index f96ad9ade..fdfbeafce 100644
--- a/keyboards/chlx/merro60/keymaps/iso/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/iso/keymap.c
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_iso( 22[0] = LAYOUT_60_iso_split_bs_rshift(
23 KC_ESC, 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_BSPC, 23 KC_ESC, 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_BSPC,
24 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, 24 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,
25 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_NUHS, KC_ENT, 25 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_NUHS, KC_ENT,
26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, 26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL),
28 28
29[1] = LAYOUT_iso( 29[1] = LAYOUT_60_iso_split_bs_rshift(
30 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, 30 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,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
index 2083bf9be..560abd994 100644
--- a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_tsangan( 22[0] = LAYOUT_60_tsangan_hhkb(
23 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_BSPC, KC_BSPC, 23 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_BSPC, KC_BSPC,
24 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, 24 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,
25 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, 25 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,
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), 26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
28 28
29[1] = LAYOUT_tsangan( 29[1] = LAYOUT_60_tsangan_hhkb(
30 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, _______, 30 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, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/chlx/merro60/keymaps/via/keymap.c b/keyboards/chlx/merro60/keymaps/via/keymap.c
index 8f756aefb..1e44a9cfd 100644
--- a/keyboards/chlx/merro60/keymaps/via/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/via/keymap.c
@@ -19,28 +19,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[0] = LAYOUT_via( 22[0] = LAYOUT_all(
23 KC_ESC, 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_GRV, 23 KC_ESC, 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_GRV,
24 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, 24 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,
25 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_UP, KC_ENT, 25 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_UP, KC_ENT,
26 KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, 26 KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL), 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL),
28 28
29[1] = LAYOUT_via( 29[1] = LAYOUT_all(
30 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, 30 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,
31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, 31 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______), 34 _______, _______, _______, _______, _______, _______, _______, _______),
35 35
36[2] = LAYOUT_via( 36[2] = LAYOUT_all(
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______), 41 _______, _______, _______, _______, _______, _______, _______, _______),
42 42
43[3] = LAYOUT_via( 43[3] = LAYOUT_all(
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/chlx/merro60/merro60.h b/keyboards/chlx/merro60/merro60.h
index 228112999..dee6a5a96 100644
--- a/keyboards/chlx/merro60/merro60.h
+++ b/keyboards/chlx/merro60/merro60.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23 23
24#define XXX KC_NO 24#define XXX KC_NO
25 25
26/* //////////////////// LAYOUT_default //////////////////// 26/* //////////////////// LAYOUT_all ////////////////////
27 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ 27 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
28 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ 28 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
29 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ 29 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
37 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ 37 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
38*/ 38*/
39 39
40#define LAYOUT_default( \ 40#define LAYOUT_all( \
41 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ 41 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
42 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 42 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
43 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 43 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
@@ -51,34 +51,61 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
51 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \ 51 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
52} 52}
53 53
54/* //////////////////// LAYOUT_ansi //////////////////// 54/* //////////////////// LAYOUT_60_ansi ////////////////////
55 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
56 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
57 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
58 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
59 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
60 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
61 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
62 * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │
63 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
64 * │40 │41 │42 │45 │4a │4b │4c │4d │
65 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
66*/
67#define LAYOUT_60_ansi( \
68 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
69 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
70 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
71 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
72 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
73) { \
74 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
75 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
76 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
77 { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX }, \
78 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
79}
80
81/* //////////////////// LAYOUT_60_ansi_split_bs_rshift ////////////////////
55 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ 82 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
56 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ 83 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
57 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ 84 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
58 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ 85 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
59 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ 86 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
60 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │ 87 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
61 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ 88 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
62 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │ 89 * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │
63 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ 90 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
64 * │40 │41 │42 │45 │4a │4b │4d │4e │ 91 * │40 │41 │42 │45 │4a │4b │4d │4e │
65 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ 92 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
66*/ 93*/
67#define LAYOUT_ansi( \ 94#define LAYOUT_60_ansi_split_bs_rshift( \
68 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ 95 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
69 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 96 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
70 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ 97 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
71 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ 98 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
72 k40, k41, k42, k45, k4a, k4b, k4c, k4d \ 99 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
73) { \ 100) { \
74 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ 101 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
75 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ 102 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
76 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ 103 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
77 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ 104 { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \
78 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \ 105 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
79} 106}
80 107
81/* //////////////////// LAYOUT_hhkb //////////////////// 108/* //////////////////// LAYOUT_60_hhkb ////////////////////
82 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ 109 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
83 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ 110 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
84 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ 111 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -91,7 +118,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
91 * │▓▓▓▓▓│41 │42 │45 (7u) │4b │4c │▓▓▓▓▓│ 118 * │▓▓▓▓▓│41 │42 │45 (7u) │4b │4c │▓▓▓▓▓│
92 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ 119 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
93*/ 120*/
94#define LAYOUT_hhkb( \ 121#define LAYOUT_60_hhkb( \
95 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ 122 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
96 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 123 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
97 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ 124 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
@@ -105,7 +132,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
105 { XXX, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX } \ 132 { XXX, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX } \
106} 133}
107 134
108/* //////////////////// LAYOUT_iso //////////////////// 135/* //////////////////// LAYOUT_60_iso ////////////////////
136 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
137 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
138 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
139 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ │
140 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d │
141 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │ │
142 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
143 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │
144 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
145 * │40 │41 │42 │45 │4a │4b │4c │4d │
146 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
147*/
148#define LAYOUT_60_iso( \
149 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
150 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
151 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
152 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
153 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
154) { \
155 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
156 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
157 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
158 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX }, \
159 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
160}
161
162/* //////////////////// LAYOUT_60_iso_split_bs_rshift ////////////////////
109 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ 163 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
110 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ 164 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
111 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ 165 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -118,7 +172,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
118 * │40 │41 │42 │45 │4a │4b │4c │4d │ 172 * │40 │41 │42 │45 │4a │4b │4c │4d │
119 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ 173 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
120*/ 174*/
121#define LAYOUT_iso( \ 175#define LAYOUT_60_iso_split_bs_rshift( \
122 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ 176 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
123 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ 177 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
124 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 178 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
@@ -132,7 +186,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
132 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \ 186 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
133} 187}
134 188
135/* //////////////////// LAYOUT_tsangan //////////////////// 189/* //////////////////// LAYOUT_60_tsangan_hhkb ////////////////////
136 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ 190 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
137 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ 191 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
138 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ 192 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -145,7 +199,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
145 * │40 │41 │42 │45 (7u) │4b │4c │4d │ 199 * │40 │41 │42 │45 (7u) │4b │4c │4d │
146 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ 200 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
147*/ 201*/
148#define LAYOUT_tsangan( \ 202#define LAYOUT_60_tsangan_hhkb( \
149 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ 203 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
150 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 204 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
151 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ 205 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
@@ -158,32 +212,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
158 { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ 212 { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \
159 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX } \ 213 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX } \
160} 214}
161
162/* //////////////////// LAYOUT_via ////////////////////
163 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
164 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
165 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
166 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
167 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
168 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
169 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
170 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │
171 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
172 * │40 │41 │42 │45 (6.25u) │4a │4b │4c │4d │
173 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
174*/
175
176#define LAYOUT_via( \
177 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
178 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
179 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
180 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
181 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
182) { \
183 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
184 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
185 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
186 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \
187 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
188}
189
diff --git a/keyboards/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk
index 32981133b..40b1e5fc9 100644
--- a/keyboards/chlx/merro60/rules.mk
+++ b/keyboards/chlx/merro60/rules.mk
@@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23
24LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 18:46:02 +0000