e4e015c0c80ca59d329e1343ee7803250b7e60fe
- Author
- Joel Challis <git@zvecr.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Update keymaps to use PDF keycode (#24633)
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
2index 0d68eb454123568e364592f0454429c7643e4fd8..4c4a6a5f3e74bf499de4332ec0dbc8140c23de63 100644
3--- a/keyboards/25keys/zinc/keymaps/default/keymap.c
4+++ b/keyboards/25keys/zinc/keymaps/default/keymap.c
5@@ -23,10 +23,7 @@ enum layer_number {
6 };
7
8 enum custom_keycodes {
9- QWERTY = SAFE_RANGE,
10- COLEMAK,
11- DVORAK,
12- LOWER,
13+ LOWER = SAFE_RANGE,
14 RAISE,
15 ADJUST,
16 BACKLIT,
17@@ -35,12 +32,9 @@ enum custom_keycodes {
18 RGBRST
19 };
20
21-enum macro_keycodes {
22- KC_SAMPLEMACRO,
23-};
24-
25-//Macros
26-#define M_SAMPLE M(KC_SAMPLEMACRO)
27+#define QWERTY PDF(_QWERTY)
28+#define COLEMAK PDF(_COLEMAK)
29+#define DVORAK PDF(_DVORAK)
30
31 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 /* Qwerty
33@@ -169,25 +163,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
34
35 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
36 switch (keycode) {
37- case QWERTY:
38- if (record->event.pressed) {
39- set_single_persistent_default_layer(_QWERTY);
40- }
41- return false;
42- break;
43- case COLEMAK:
44- if (record->event.pressed) {
45- set_single_persistent_default_layer(_COLEMAK);
46- }
47- return false;
48- break;
49- case DVORAK:
50- if (record->event.pressed) {
51- set_single_persistent_default_layer(_DVORAK);
52- }
53- return false;
54- break;
55-
56 case LOWER:
57 if (record->event.pressed) {
58 //not sure how to have keyboard check mode and set it to a variable, so my work around
59diff --git a/keyboards/40percentclub/nori/keymaps/default/keymap.c b/keyboards/40percentclub/nori/keymaps/default/keymap.c
60index 03f8c15787826609d656ae6c01868c57217da96d..1c7405f2aca68f7b871259f7269bf544de158824 100644
61--- a/keyboards/40percentclub/nori/keymaps/default/keymap.c
62+++ b/keyboards/40percentclub/nori/keymaps/default/keymap.c
63@@ -13,16 +13,14 @@ enum layer_names {
64 _ADJUST
65 };
66
67-enum custom_keycodes {
68- QWERTY = SAFE_RANGE,
69- COLEMAK,
70- DVORAK,
71-};
72-
73 #define LOWER MO(_LOWER)
74 #define RAISE MO(_RAISE)
75 #define ADJUST MO(_ADJUST)
76
77+#define QWERTY PDF(_QWERTY)
78+#define COLEMAK PDF(_COLEMAK)
79+#define DVORAK PDF(_DVORAK)
80+
81 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 /* Qwerty
83 * ,-----------------------------------------------------------------------------------.
84@@ -138,24 +136,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
85 layer_state_t layer_state_set_user(layer_state_t state) {
86 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
87 }
88-
89-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
90- switch (keycode) {
91- case QWERTY:
92- if (record->event.pressed) {
93- set_single_persistent_default_layer(_QWERTY);
94- }
95- return false;
96- case COLEMAK:
97- if (record->event.pressed) {
98- set_single_persistent_default_layer(_COLEMAK);
99- }
100- return false;
101- case DVORAK:
102- if (record->event.pressed) {
103- set_single_persistent_default_layer(_DVORAK);
104- }
105- return false;
106- }
107- return true;
108-}
109diff --git a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
110index 65d431eb9aa2eca572fa4ddb81c8cc53fadd43cf..7c5414e93ace4e7d3729443f3599508cd2f1add7 100644
111--- a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
112+++ b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
113@@ -23,9 +23,7 @@ enum sofle_layers {
114 };
115
116 enum custom_keycodes {
117- KC_QWERTY = SAFE_RANGE,
118- KC_COLEMAK,
119- KC_LOWER,
120+ KC_LOWER = SAFE_RANGE,
121 KC_RAISE,
122 KC_ADJUST,
123 KC_PRVWD,
124@@ -35,6 +33,9 @@ enum custom_keycodes {
125 KC_DLINE
126 };
127
128+#define KC_QWERTY PDF(_QWERTY)
129+#define KC_COLEMAK PDF(_COLEMAK)
130+
131 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
132
133 [_QWERTY] = LAYOUT(
134@@ -148,16 +149,6 @@ bool oled_task_user(void) {
135
136 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
137 switch (keycode) {
138- case KC_QWERTY:
139- if (record->event.pressed) {
140- set_single_persistent_default_layer(_QWERTY);
141- }
142- return false;
143- case KC_COLEMAK:
144- if (record->event.pressed) {
145- set_single_persistent_default_layer(_COLEMAK);
146- }
147- return false;
148 case KC_LOWER:
149 if (record->event.pressed) {
150 layer_on(_LOWER);
151diff --git a/keyboards/bear_face/v1/keymaps/default/keymap.c b/keyboards/bear_face/v1/keymaps/default/keymap.c
152index e615a3915d8335b39e8796688da9f2f8456eb984..22235f4af681617664bfdb3353748be853e0290c 100644
153--- a/keyboards/bear_face/v1/keymaps/default/keymap.c
154+++ b/keyboards/bear_face/v1/keymaps/default/keymap.c
155@@ -12,12 +12,9 @@ enum layers {
156
157 #define FN1_CAPS LT(_FN1, KC_CAPS)
158
159-//custom keycode enums
160-enum custom_keycodes {
161- BASE_QWER = QK_USER,
162- BASE_COLE,
163- BASE_DVOR
164-};
165+#define BASE_QWER PDF(_QWER)
166+#define BASE_COLE PDF(_COLE)
167+#define BASE_DVOR PDF(_DVOR)
168
169 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
170 [_QWER] = LAYOUT(
171@@ -67,37 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
172 ),
173 */
174 };
175-
176-
177-// macros to allow the user to set whatever default layer they want, even after reboot
178-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
179- switch (keycode) {
180- case BASE_QWER:
181- if (record->event.pressed) {
182- // when keycode BASE_QWER is pressed
183- set_single_persistent_default_layer(_QWER);
184- } else {
185- // when keycode BASE_QWER is released
186- }
187- break;
188-
189- case BASE_COLE:
190- if (record->event.pressed) {
191- // when keycode BASE_COLE is pressed
192- set_single_persistent_default_layer(_COLE);
193- } else {
194- // when keycode BASE_COLE is released
195- }
196- break;
197-
198- case BASE_DVOR:
199- if (record->event.pressed) {
200- // when keycode BASE_DVOR is pressed
201- set_single_persistent_default_layer(_DVOR);
202- } else {
203- // when keycode BASE_DVOR is released
204- }
205- break;
206- }
207- return true;
208-};
209diff --git a/keyboards/bear_face/v2/keymaps/default/keymap.c b/keyboards/bear_face/v2/keymaps/default/keymap.c
210index 08f193052adaca9cb68fbed97cd437ffeb1dcd3c..0f8aefb4b37c612ce1521ec5b452446eb29e05ce 100644
211--- a/keyboards/bear_face/v2/keymaps/default/keymap.c
212+++ b/keyboards/bear_face/v2/keymaps/default/keymap.c
213@@ -12,12 +12,9 @@ enum layers {
214
215 #define FN1_CAPS LT(_FN1, KC_CAPS)
216
217-//custom keycode enums
218-enum custom_keycodes {
219- BASE_QWER = QK_USER,
220- BASE_COLE,
221- BASE_DVOR
222-};
223+#define BASE_QWER PDF(_QWER)
224+#define BASE_COLE PDF(_COLE)
225+#define BASE_DVOR PDF(_DVOR)
226
227 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
228 [_QWER] = LAYOUT_83_ansi(
229@@ -67,37 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
230 ),
231 */
232 };
233-
234-
235-// macros to allow the user to set whatever default layer they want, even after reboot
236-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
237- switch (keycode) {
238- case BASE_QWER:
239- if (record->event.pressed) {
240- // when keycode BASE_QWER is pressed
241- set_single_persistent_default_layer(_QWER);
242- } else {
243- // when keycode BASE_QWER is released
244- }
245- break;
246-
247- case BASE_COLE:
248- if (record->event.pressed) {
249- // when keycode BASE_COLE is pressed
250- set_single_persistent_default_layer(_COLE);
251- } else {
252- // when keycode BASE_COLE is released
253- }
254- break;
255-
256- case BASE_DVOR:
257- if (record->event.pressed) {
258- // when keycode BASE_DVOR is pressed
259- set_single_persistent_default_layer(_DVOR);
260- } else {
261- // when keycode BASE_DVOR is released
262- }
263- break;
264- }
265- return true;
266-};
267diff --git a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
268index a5e96207f6959d6e7ab928669a3c5b72e266a2f0..69d672051075957d84ee3360cc2b4ae24dfdd18e 100644
269--- a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
270+++ b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
271@@ -12,12 +12,9 @@ enum layers {
272
273 #define FN1_CAPS LT(_FN1, KC_CAPS)
274
275-//custom keycode enums
276-enum custom_keycodes {
277- BASE_QWER = QK_USER,
278- BASE_COLE,
279- BASE_DVOR
280-};
281+#define BASE_QWER PDF(_QWER)
282+#define BASE_COLE PDF(_COLE)
283+#define BASE_DVOR PDF(_DVOR)
284
285 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
286 [_QWER] = LAYOUT_84_iso(
287@@ -67,37 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
288 ),
289 */
290 };
291-
292-
293-//macros to allow the user to set whatever default layer they want, even after reboot
294-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
295- switch (keycode) {
296- case BASE_QWER:
297- if (record->event.pressed) {
298- // when keycode BASE_QWER is pressed
299- set_single_persistent_default_layer(_QWER);
300- } else {
301- // when keycode BASE_QWER is released
302- }
303- break;
304-
305- case BASE_COLE:
306- if (record->event.pressed) {
307- // when keycode BASE_COLE is pressed
308- set_single_persistent_default_layer(_COLE);
309- } else {
310- // when keycode BASE_COLE is released
311- }
312- break;
313-
314- case BASE_DVOR:
315- if (record->event.pressed) {
316- // when keycode BASE_DVOR is pressed
317- set_single_persistent_default_layer(_DVOR);
318- } else {
319- // when keycode BASE_DVOR is released
320- }
321- break;
322- }
323- return true;
324-};
325diff --git a/keyboards/bear_face/v3/keymaps/default/keymap.c b/keyboards/bear_face/v3/keymaps/default/keymap.c
326index f6e71f1b34ebc596759e558b1cc1ff2cb394ba0b..0f8aefb4b37c612ce1521ec5b452446eb29e05ce 100644
327--- a/keyboards/bear_face/v3/keymaps/default/keymap.c
328+++ b/keyboards/bear_face/v3/keymaps/default/keymap.c
329@@ -12,12 +12,9 @@ enum layers {
330
331 #define FN1_CAPS LT(_FN1, KC_CAPS)
332
333-//custom keycode enums
334-enum custom_keycodes {
335- BASE_QWER = QK_USER,
336- BASE_COLE,
337- BASE_DVOR
338-};
339+#define BASE_QWER PDF(_QWER)
340+#define BASE_COLE PDF(_COLE)
341+#define BASE_DVOR PDF(_DVOR)
342
343 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
344 [_QWER] = LAYOUT_83_ansi(
345@@ -67,26 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
346 ),
347 */
348 };
349-
350-
351-// Macros to allow the user to set whatever default layer they want, even after reboot
352-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
353- switch (keycode) {
354- case BASE_QWER:
355- if (record->event.pressed) {
356- set_single_persistent_default_layer(_QWER);
357- }
358- break;
359- case BASE_COLE:
360- if (record->event.pressed) {
361- set_single_persistent_default_layer(_COLE);
362- }
363- break;
364- case BASE_DVOR:
365- if (record->event.pressed) {
366- set_single_persistent_default_layer(_DVOR);
367- }
368- break;
369- }
370- return true;
371-};
372diff --git a/keyboards/bear_face/v3/keymaps/default_iso/keymap.c b/keyboards/bear_face/v3/keymaps/default_iso/keymap.c
373index cc97d54a9be92494c34870dbbcf12ee5dc186194..69d672051075957d84ee3360cc2b4ae24dfdd18e 100644
374--- a/keyboards/bear_face/v3/keymaps/default_iso/keymap.c
375+++ b/keyboards/bear_face/v3/keymaps/default_iso/keymap.c
376@@ -12,12 +12,9 @@ enum layers {
377
378 #define FN1_CAPS LT(_FN1, KC_CAPS)
379
380-//custom keycode enums
381-enum custom_keycodes {
382- BASE_QWER = QK_USER,
383- BASE_COLE,
384- BASE_DVOR
385-};
386+#define BASE_QWER PDF(_QWER)
387+#define BASE_COLE PDF(_COLE)
388+#define BASE_DVOR PDF(_DVOR)
389
390 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
391 [_QWER] = LAYOUT_84_iso(
392@@ -67,26 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
393 ),
394 */
395 };
396-
397-
398-// Macros to allow the user to set whatever default layer they want, even after reboot
399-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
400- switch (keycode) {
401- case BASE_QWER:
402- if (record->event.pressed) {
403- set_single_persistent_default_layer(_QWER);
404- }
405- break;
406- case BASE_COLE:
407- if (record->event.pressed) {
408- set_single_persistent_default_layer(_COLE);
409- }
410- break;
411- case BASE_DVOR:
412- if (record->event.pressed) {
413- set_single_persistent_default_layer(_DVOR);
414- }
415- break;
416- }
417- return true;
418-};
419diff --git a/keyboards/beatervan/keymaps/default/keymap.c b/keyboards/beatervan/keymaps/default/keymap.c
420index a99b9c9e513b5338a0620480d0de971089f74f30..ef88ae920745a385f2548d606c97df9f7ac3566c 100644
421--- a/keyboards/beatervan/keymaps/default/keymap.c
422+++ b/keyboards/beatervan/keymaps/default/keymap.c
423@@ -24,11 +24,9 @@ enum layers {
424 _L3,
425 };
426
427-enum custom_keycodes {
428- DVORAK = SAFE_RANGE,
429- QWERTY,
430- COLEMAK
431-};
432+#define QWERTY PDF(_QW)
433+#define DVORAK PDF(_DV)
434+#define COLEMAK PDF(_CM)
435
436 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
437 [_QW] = LAYOUT( /* Qwerty */
438@@ -68,26 +66,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
439 _______, KC_LSFT, KC_B, KC_SPC, KC_C, _______, _______, _______
440 )
441 };
442-
443-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
444- switch(keycode) {
445- case DVORAK:
446- if (record->event.pressed) {
447- set_single_persistent_default_layer(_DV);
448- }
449- return false;
450- case QWERTY:
451- if (record->event.pressed) {
452- set_single_persistent_default_layer(_QW);
453- }
454- return false;
455- case COLEMAK:
456- if (record->event.pressed) {
457- set_single_persistent_default_layer(_CM);
458- }
459- return false;
460- default:
461- return true;
462- }
463- return true;
464-};
465diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c
466index 29f98033d61280c985301b56d7061caf3b55e203..415e22e81a13635a0bbda32ffcc2627ce92616da 100644
467--- a/keyboards/contra/keymaps/default/keymap.c
468+++ b/keyboards/contra/keymaps/default/keymap.c
469@@ -28,16 +28,17 @@ enum planck_layers {
470 };
471
472 enum planck_keycodes {
473- QWERTY = SAFE_RANGE,
474- COLEMAK,
475- DVORAK,
476- PLOVER,
477+ PLOVER = SAFE_RANGE,
478 LOWER,
479 RAISE,
480 BACKLIT,
481 EXT_PLV
482 };
483
484+#define QWERTY PDF(_QWERTY)
485+#define COLEMAK PDF(_COLEMAK)
486+#define DVORAK PDF(_DVORAK)
487+
488 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
489
490 /* Qwerty
491@@ -177,25 +178,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
492
493 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
494 switch (keycode) {
495- case QWERTY:
496- if (record->event.pressed) {
497- print("mode just switched to qwerty and this is a huge string\n");
498- set_single_persistent_default_layer(_QWERTY);
499- }
500- return false;
501- break;
502- case COLEMAK:
503- if (record->event.pressed) {
504- set_single_persistent_default_layer(_COLEMAK);
505- }
506- return false;
507- break;
508- case DVORAK:
509- if (record->event.pressed) {
510- set_single_persistent_default_layer(_DVORAK);
511- }
512- return false;
513- break;
514 case LOWER:
515 if (record->event.pressed) {
516 layer_on(_LOWER);
517diff --git a/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
518index 8ed0118578aa6930d74f3aea9d248516e39fe94b..8dfcce364b2c2044ec1656da3d73697b89c7beef 100644
519--- a/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
520+++ b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
521@@ -18,16 +18,13 @@
522 // Defines names for use in layer keycodes and the keymap
523 enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
524
525-enum layer_keycodes {
526- QWERTY = SAFE_RANGE,
527- COLEMAK,
528- DVORAK,
529-};
530-
531-// Defines the keycodes used by our macros in process_record_user
532 #define LOWER MO(_LOWER)
533 #define RAISE MO(_RAISE)
534
535+#define QWERTY PDF(_QWERTY)
536+#define COLEMAK PDF(_COLEMAK)
537+#define DVORAK PDF(_DVORAK)
538+
539 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
540 /* BASE
541 * ,-----------------------------------------------------------------------------------.
542@@ -163,25 +160,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
543 state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
544 return state;
545 }
546-
547-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
548- switch (keycode) {
549- case QWERTY:
550- if (record->event.pressed) {
551- print("mode just switched to qwerty and this is a huge string\n");
552- set_single_persistent_default_layer(_QWERTY);
553- }
554- return false;
555- case COLEMAK:
556- if (record->event.pressed) {
557- set_single_persistent_default_layer(_COLEMAK);
558- }
559- return false;
560- case DVORAK:
561- if (record->event.pressed) {
562- set_single_persistent_default_layer(_DVORAK);
563- }
564- return false;
565- }
566- return true;
567-}
568diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
569index 2b366f49309bc2c41bb2b8fed0266bd02978d07b..0d8d24c5755628b7dbe4f81c2487247cbeaa9dcc 100644
570--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
571+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
572@@ -28,10 +28,7 @@ enum plaid_layers {
573 };
574
575 enum plaid_keycodes {
576- QWERTY = SAFE_RANGE,
577- COLEMAK,
578- DVORAK,
579- PLOVER,
580+ PLOVER = SAFE_RANGE,
581 EXT_PLV,
582 LED_1,
583 LED_2,
584@@ -48,6 +45,10 @@ enum plaid_keycodes {
585 #define LOWER MO(_LOWER)
586 #define RAISE MO(_RAISE)
587
588+#define QWERTY PDF(_QWERTY)
589+#define COLEMAK PDF(_COLEMAK)
590+#define DVORAK PDF(_DVORAK)
591+
592 // array of keys considered modifiers for led purposes
593 const uint16_t modifiers[] = {
594 KC_LCTL,
595@@ -301,25 +302,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
596 led_keypress_update(LED_GREEN, led_config.green_mode, keycode, record);
597 }
598 switch (keycode) {
599- case QWERTY:
600- if (record->event.pressed) {
601- print("mode just switched to qwerty and this is a huge string\n");
602- set_single_persistent_default_layer(_QWERTY);
603- }
604- return false;
605- break;
606- case COLEMAK:
607- if (record->event.pressed) {
608- set_single_persistent_default_layer(_COLEMAK);
609- }
610- return false;
611- break;
612- case DVORAK:
613- if (record->event.pressed) {
614- set_single_persistent_default_layer(_DVORAK);
615- }
616- return false;
617- break;
618 case PLOVER:
619 if (record->event.pressed) {
620 layer_off(_RAISE);
621diff --git a/keyboards/ergotravel/keymaps/default/keymap.c b/keyboards/ergotravel/keymaps/default/keymap.c
622index 166a6eed7e70462244d2d293ef71107a8a8702cf..fcc1ac76b476af0c191b7e1bf489d8d228570d73 100644
623--- a/keyboards/ergotravel/keymaps/default/keymap.c
624+++ b/keyboards/ergotravel/keymaps/default/keymap.c
625@@ -9,8 +9,7 @@ enum layer_names {
626 };
627
628 enum custom_keycodes {
629- QWERTY = SAFE_RANGE,
630- LOWER,
631+ LOWER = SAFE_RANGE,
632 RAISE,
633 ADJUST,
634 };
635@@ -58,23 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
636
637 };
638
639-
640-
641-
642-
643-
644-
645 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
646 switch (keycode) {
647- case QWERTY:
648- if (record->event.pressed) {
649- #ifdef AUDIO_ENABLE
650- PLAY_SONG(tone_qwerty);
651- #endif
652- set_single_persistent_default_layer(_QWERTY);
653- }
654- return false;
655- break;
656 case LOWER:
657 if (record->event.pressed) {
658 layer_on(_LOWER);
659diff --git a/keyboards/fortitude60/keymaps/default/keymap.c b/keyboards/fortitude60/keymaps/default/keymap.c
660index d03c2b7a4b192aa3a10ef0e61d75f8583cee9e4c..729b940d7661000f0fd4a4665b047bb41f0cfa1a 100644
661--- a/keyboards/fortitude60/keymaps/default/keymap.c
662+++ b/keyboards/fortitude60/keymaps/default/keymap.c
663@@ -14,18 +14,13 @@ enum my_layers {
664 _ADJUST
665 };
666
667-enum custom_keycodes {
668- QWERTY = SAFE_RANGE,
669- COLEMAK,
670- DVORAK,
671- LOWER,
672- RAISE,
673- ADJUST,
674-};
675-
676 #define LOWER MO(_LOWER)
677 #define RAISE MO(_RAISE)
678
679+#define QWERTY PDF(_QWERTY)
680+#define COLEMAK PDF(_COLEMAK)
681+#define DVORAK PDF(_DVORAK)
682+
683 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
684
685 /* Qwerty
686@@ -160,24 +155,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
687 layer_state_t layer_state_set_user(layer_state_t state) {
688 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
689 }
690-
691-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
692- switch (keycode) {
693- case QWERTY:
694- if (record->event.pressed) {
695- set_single_persistent_default_layer(_QWERTY);
696- }
697- return false;
698- case COLEMAK:
699- if (record->event.pressed) {
700- set_single_persistent_default_layer(_COLEMAK);
701- }
702- return false;
703- case DVORAK:
704- if (record->event.pressed) {
705- set_single_persistent_default_layer(_DVORAK);
706- }
707- return false;
708- }
709- return true;
710-}
711diff --git a/keyboards/fractal/keymaps/default/keymap.c b/keyboards/fractal/keymaps/default/keymap.c
712index ec54dfb78d2b6e5f3d524b92eec32a808555ebfa..fea90ba2f38f8776b350d160b98b7b68acddadba 100644
713--- a/keyboards/fractal/keymaps/default/keymap.c
714+++ b/keyboards/fractal/keymaps/default/keymap.c
715@@ -28,14 +28,15 @@ enum preonic_layers {
716 };
717
718 enum preonic_keycodes {
719- QWERTY = SAFE_RANGE,
720- COLEMAK,
721- DVORAK,
722- LOWER,
723+ LOWER = SAFE_RANGE,
724 RAISE,
725 BACKLIT
726 };
727
728+#define QWERTY PDF(_QWERTY)
729+#define COLEMAK PDF(_COLEMAK)
730+#define DVORAK PDF(_DVORAK)
731+
732 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
733
734 /* Qwerty
735@@ -169,24 +170,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
736
737 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
738 switch (keycode) {
739- case QWERTY:
740- if (record->event.pressed) {
741- set_single_persistent_default_layer(_QWERTY);
742- }
743- return false;
744- break;
745- case COLEMAK:
746- if (record->event.pressed) {
747- set_single_persistent_default_layer(_COLEMAK);
748- }
749- return false;
750- break;
751- case DVORAK:
752- if (record->event.pressed) {
753- set_single_persistent_default_layer(_DVORAK);
754- }
755- return false;
756- break;
757 case LOWER:
758 if (record->event.pressed) {
759 layer_on(_LOWER);
760diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
761index 65d6ef91f917c0d611182732396fd893728b9a60..951cacb423a3f968ff4cf6010c29f4e251a2d3f5 100644
762--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
763+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
764@@ -16,10 +16,7 @@ extern rgblight_config_t rgblight_config;
765 #define _ADJUST 6
766
767 enum preonic_keycodes {
768- QWERTY = SAFE_RANGE,
769- COLEMAK,
770- DVORAK,
771- LOWER,
772+ LOWER = SAFE_RANGE,
773 RAISE,
774 BACKLIT,
775 RGBLED_TOGGLE,
776@@ -42,6 +39,9 @@ enum preonic_keycodes {
777 #define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor
778 #define LT_RAI(kc) LT(_RAISE, kc) // L-ayer T-ap to Raise
779
780+#define QWERTY PDF(_QWERTY)
781+#define COLEMAK PDF(_COLEMAK)
782+#define DVORAK PDF(_DVORAK)
783
784 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
785
786@@ -213,18 +213,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
787
788 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
789 switch (keycode) {
790- case QWERTY:
791- if (record->event.pressed) {
792- set_single_persistent_default_layer(_QWERTY);
793- }
794- return false;
795- break;
796- case COLEMAK:
797- if (record->event.pressed) {
798- set_single_persistent_default_layer(_COLEMAK);
799- }
800- return false;
801- break;
802 case LOWER:
803 if (record->event.pressed) {
804 //not sure how to have keyboard check mode and set it to a variable, so my work around
805diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
806index a4a96b20b6f43232ff375594f26c1b3c25230846..1e8523d94c5340563424fc2223bafec8dfa7d9e0 100644
807--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
808+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
809@@ -16,10 +16,7 @@ extern rgblight_config_t rgblight_config;
810 #define _ADJUST 6
811
812 enum preonic_keycodes {
813- QWERTY = SAFE_RANGE,
814- COLEMAK,
815- DVORAK,
816- LOWER,
817+ LOWER = SAFE_RANGE,
818 RAISE,
819 BACKLIT,
820 RGBLED_TOGGLE,
821@@ -181,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
822 * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
823 * | |RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | Del | | | |
824 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
825- * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty| | | | | | | |
826+ * | | | |Aud on|Audoff|AGnorm|AGswap| | | | | | | | |
827 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
828 * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | BL + |BL ST |BLSTEP| BL TG| | | |
829 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
830@@ -191,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
831 [_ADJUST] = LAYOUT(
832 QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
833 _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, KC_DEL, _______, _______, _______,
834- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______, _______, _______,
835+ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______,
836 _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DOWN, BL_UP, BL_STEP, BL_TOGG, _______, _______, _______,
837 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
838 )
839@@ -218,12 +215,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
840
841 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
842 switch (keycode) {
843- case QWERTY:
844- if (record->event.pressed) {
845- set_single_persistent_default_layer(_QWERTY);
846- }
847- return false;
848- break;
849 case LOWER:
850 if (record->event.pressed) {
851 //not sure how to have keyboard check mode and set it to a variable, so my work around
852diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
853index d130745dc64421d9320945f603544c73ae3431f8..1e3f3191c2ab4772dac1b06b65d7cc7b8aae2d5e 100644
854--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
855+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
856@@ -13,10 +13,7 @@
857 #define _ADJUST 6
858
859 enum preonic_keycodes {
860- QWERTY = SAFE_RANGE,
861- COLEMAK,
862- DVORAK,
863- LOWER,
864+ LOWER = SAFE_RANGE,
865 RAISE,
866 BACKLIT,
867 RGBLED_TOGGLE,
868@@ -39,6 +36,10 @@ enum preonic_keycodes {
869 #define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor
870 #define LT_RAI(kc) LT(_RAISE, kc) // L-ayer T-ap to Raise
871
872+#define QWERTY PDF(_QWERTY)
873+#define COLEMAK PDF(_COLEMAK)
874+#define DVORAK PDF(_DVORAK)
875+
876 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
877
878 /* Qwerty
879@@ -200,18 +201,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
880
881 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
882 switch (keycode) {
883- case QWERTY:
884- if (record->event.pressed) {
885- set_single_persistent_default_layer(_QWERTY);
886- }
887- return false;
888- break;
889- case COLEMAK:
890- if (record->event.pressed) {
891- set_single_persistent_default_layer(_COLEMAK);
892- }
893- return false;
894- break;
895 case LOWER:
896 if (record->event.pressed) {
897 //not sure how to have keyboard check mode and set it to a variable, so my work around
898diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
899index 568427e52c647f6fc4ce17018c003afc845db7fb..752eda0fde7299c7c59652cca222dd13e07eb9c7 100644
900--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
901+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
902@@ -48,15 +48,14 @@ enum custom_layer {
903 };
904
905 enum custom_keycodes {
906- QWERTY = SAFE_RANGE,
907- ALT,
908- CTRL,
909- LOWER,
910+ LOWER = SAFE_RANGE,
911 RAISE,
912- MOUSE,
913 ADJUST
914 };
915
916+#define QWERTY PDF(_QWERTY)
917+#define MOUSE PDF(_MOUSE)
918+
919 // TAP DANCE ***********************************************************
920 //Tap Dance Declarations
921 enum {
922@@ -569,12 +568,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
923 return false;
924 }
925 return true;
926- case QWERTY:
927- if (record->event.pressed) {
928- set_single_persistent_default_layer(_QWERTY);
929- }
930- return false;
931- break;
932 case LOWER:
933 if (record->event.pressed) {
934 layer_on(_LOWER);
935@@ -584,7 +577,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
936 update_tri_layer(_LOWER, _RAISE, _ADJUST);
937 }
938 return false;
939- break;
940 case RAISE:
941 if (record->event.pressed) {
942 layer_on(_RAISE);
943@@ -594,13 +586,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
944 update_tri_layer(_LOWER, _RAISE, _ADJUST);
945 }
946 return false;
947- break;
948- case MOUSE:
949- if (record->event.pressed) {
950- set_single_persistent_default_layer(_MOUSE);
951- }
952- return false;
953- break;
954 }
955 return true;
956 };
957diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
958index 3c0720e1b09ef1865b374aa58cf6600247aaa17c..a2f7befd9fcd2a0b03277142aae35f6f9493adee 100644
959--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
960+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
961@@ -30,10 +30,7 @@ enum custom_layer {
962 };
963
964 enum custom_keycodes {
965- QWERTY = SAFE_RANGE,
966- COLEMAK,
967- DVORAK,
968- LOWER,
969+ LOWER = SAFE_RANGE,
970 RAISE,
971 BACKLIT
972 };
973@@ -189,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
974 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
975 * | | | | Reset| | | | | | | | | | Del |
976 * |------+------+------+------+------+------+------+-------------+------+------+------+------+------|
977- * | | | | | |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
978+ * | | | | | |Audoff|Aud on|AGnorm|AGswap| | | | | |
979 * |------+------+------+------+------+------+------+------|------+------+------+------+------+------|
980 * | | | |Voice-|Voice+|Musoff|Mus on| | | | | | | |
981 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
982@@ -199,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
983 [_ADJUST] = LAYOUT(
984 _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
985 XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,
986- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, XXXXXXX, XXXXXXX, XXXXXXX, _______,
987+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON, AU_OFF, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
988 XXXXXXX, XXXXXXX, XXXXXXX, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
989 XXXXXXX, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______, _______
990 )
991@@ -209,15 +206,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
992
993 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
994 switch (keycode) {
995- case QWERTY:
996- if (record->event.pressed) {
997- #ifdef AUDIO_ENABLE
998- PLAY_SONG(tone_qwerty);
999- #endif
1000- set_single_persistent_default_layer(_QWERTY);
1001- }
1002- return false;
1003- break;
1004 case LOWER:
1005 if (record->event.pressed) {
1006 layer_on(_LOWER);
1007diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
1008index 733e3f3d4b9684df004ec4d60626fca31bcd2606..a5222eecfaadf2eb528a985409959924360980e7 100644
1009--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
1010+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
1011@@ -47,15 +47,14 @@ enum custom_layer {
1012 };
1013
1014 enum custom_keycodes {
1015- QWERTY = SAFE_RANGE,
1016- ALT,
1017- CTRL,
1018- LOWER,
1019+ LOWER = SAFE_RANGE,
1020 RAISE,
1021- MOUSE,
1022 ADJUST
1023 };
1024
1025+#define QWERTY PDF(_QWERTY)
1026+#define MOUSE PDF(_MOUSE)
1027+
1028 // TAP DANCE ***********************************************************
1029 //Tap Dance Declarations
1030 enum {
1031@@ -499,12 +498,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1032 return false;
1033 }
1034 return true;
1035- case QWERTY:
1036- if (record->event.pressed) {
1037- set_single_persistent_default_layer(_QWERTY);
1038- }
1039- return false;
1040- break;
1041 case LOWER:
1042 if (record->event.pressed) {
1043 layer_on(_LOWER);
1044@@ -514,7 +507,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1045 update_tri_layer(_LOWER, _RAISE, _ADJUST);
1046 }
1047 return false;
1048- break;
1049 case RAISE:
1050 if (record->event.pressed) {
1051 layer_on(_RAISE);
1052@@ -524,13 +516,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1053 update_tri_layer(_LOWER, _RAISE, _ADJUST);
1054 }
1055 return false;
1056- break;
1057- case MOUSE:
1058- if (record->event.pressed) {
1059- set_single_persistent_default_layer(_MOUSE);
1060- }
1061- return false;
1062- break;
1063 }
1064 return true;
1065 };
1066diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
1067index d5ab0ba3985510dc23fbb98c00b36f51f151e94f..fc431672111da001f302e0354a0375b4e9e2fc76 100644
1068--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
1069+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
1070@@ -27,16 +27,17 @@ enum ortho_brass_layers {
1071 };
1072
1073 enum ortho_brass_keycodes {
1074- QWERTY = SAFE_RANGE,
1075- COLEMAK,
1076- DVORAK,
1077- PLOVER,
1078+ PLOVER = SAFE_RANGE,
1079 EXT_PLV
1080 };
1081
1082 #define LOWER MO(_LOWER)
1083 #define RAISE MO(_RAISE)
1084
1085+#define QWERTY PDF(_QWERTY)
1086+#define COLEMAK PDF(_COLEMAK)
1087+#define DVORAK PDF(_DVORAK)
1088+
1089 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1090
1091 /* Qwerty
1092@@ -172,24 +173,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_laye
1093
1094 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1095 switch (keycode) {
1096- case QWERTY:
1097- if (record->event.pressed) {
1098- set_single_persistent_default_layer(_QWERTY);
1099- }
1100- return false;
1101- break;
1102- case COLEMAK:
1103- if (record->event.pressed) {
1104- set_single_persistent_default_layer(_COLEMAK);
1105- }
1106- return false;
1107- break;
1108- case DVORAK:
1109- if (record->event.pressed) {
1110- set_single_persistent_default_layer(_DVORAK);
1111- }
1112- return false;
1113- break;
1114 case PLOVER:
1115 if (record->event.pressed) {
1116 layer_off(_RAISE);
1117diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
1118index f39f439c50e00a11e59746db26ccf010d9079c99..7c8bd5b8b447ed1158b44b482f00c41548a8543f 100644
1119--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
1120+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
1121@@ -27,15 +27,16 @@ enum preonic_layers {
1122 };
1123
1124 enum preonic_keycodes {
1125- QWERTY = SAFE_RANGE,
1126- COLEMAK,
1127- DVORAK,
1128- BACKLIT
1129+ BACKLIT = SAFE_RANGE,
1130 };
1131
1132 #define LOWER MO(_LOWER)
1133 #define RAISE MO(_RAISE)
1134
1135+#define QWERTY PDF(_QWERTY)
1136+#define COLEMAK PDF(_COLEMAK)
1137+#define DVORAK PDF(_DVORAK)
1138+
1139 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1140
1141 /* Qwerty
1142@@ -172,24 +173,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
1143
1144 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1145 switch (keycode) {
1146- case QWERTY:
1147- if (record->event.pressed) {
1148- set_single_persistent_default_layer(_QWERTY);
1149- }
1150- return false;
1151- break;
1152- case COLEMAK:
1153- if (record->event.pressed) {
1154- set_single_persistent_default_layer(_COLEMAK);
1155- }
1156- return false;
1157- break;
1158- case DVORAK:
1159- if (record->event.pressed) {
1160- set_single_persistent_default_layer(_DVORAK);
1161- }
1162- return false;
1163- break;
1164 case BACKLIT:
1165 if (record->event.pressed) {
1166 register_code(keycode_config(KC_LGUI));
1167@@ -200,7 +183,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1168 unregister_code(keycode_config(KC_LGUI));
1169 }
1170 return false;
1171- break;
1172 }
1173 return true;
1174 };
1175diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
1176index 74308a1c19fdd8e6c27916faf0dbba4997a435e4..15c706089d68ac27b177af63aa7f1b70f8146350 100644
1177--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
1178+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
1179@@ -27,15 +27,16 @@ enum layer_names {
1180 };
1181
1182 enum custom_keycodes {
1183- QWERTY = SAFE_RANGE,
1184- COLEMAK,
1185- DVORAK,
1186- BACKLIT
1187+ BACKLIT = SAFE_RANGE,
1188 };
1189
1190 #define LOWER MO(_LOWER)
1191 #define RAISE MO(_RAISE)
1192
1193+#define QWERTY PDF(_QWERTY)
1194+#define COLEMAK PDF(_COLEMAK)
1195+#define DVORAK PDF(_DVORAK)
1196+
1197 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1198
1199 /* Qwerty
1200@@ -172,24 +173,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
1201
1202 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1203 switch (keycode) {
1204- case QWERTY:
1205- if (record->event.pressed) {
1206- set_single_persistent_default_layer(_QWERTY);
1207- }
1208- return false;
1209- break;
1210- case COLEMAK:
1211- if (record->event.pressed) {
1212- set_single_persistent_default_layer(_COLEMAK);
1213- }
1214- return false;
1215- break;
1216- case DVORAK:
1217- if (record->event.pressed) {
1218- set_single_persistent_default_layer(_DVORAK);
1219- }
1220- return false;
1221- break;
1222 case BACKLIT:
1223 if (record->event.pressed) {
1224 register_code(keycode_config(KC_LGUI));
1225@@ -200,7 +183,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1226 unregister_code(keycode_config(KC_LGUI));
1227 }
1228 return false;
1229- break;
1230 }
1231 return true;
1232 };
1233diff --git a/keyboards/handwired/rs60/keymaps/default/keymap.c b/keyboards/handwired/rs60/keymaps/default/keymap.c
1234index 5dae734be6c6767bba08c046b7fb6519017fd1a0..7dfe43fc4c3961d21eedcc803d13b76871ec8e1f 100644
1235--- a/keyboards/handwired/rs60/keymaps/default/keymap.c
1236+++ b/keyboards/handwired/rs60/keymaps/default/keymap.c
1237@@ -26,13 +26,14 @@ enum layers {
1238 };
1239
1240 enum keycodes {
1241- QWERTY = SAFE_RANGE,
1242- COLEMAK,
1243- DVORAK,
1244- LOWER,
1245+ LOWER = SAFE_RANGE,
1246 RAISE,
1247 };
1248
1249+#define QWERTY PDF(_QWERTY)
1250+#define COLEMAK PDF(_COLEMAK)
1251+#define DVORAK PDF(_DVORAK)
1252+
1253 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1254
1255 /* Qwerty
1256@@ -164,24 +165,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1257
1258 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1259 switch (keycode) {
1260- case QWERTY:
1261- if (record->event.pressed) {
1262- set_single_persistent_default_layer(_QWERTY);
1263- }
1264- return false;
1265- break;
1266- case COLEMAK:
1267- if (record->event.pressed) {
1268- set_single_persistent_default_layer(_COLEMAK);
1269- }
1270- return false;
1271- break;
1272- case DVORAK:
1273- if (record->event.pressed) {
1274- set_single_persistent_default_layer(_DVORAK);
1275- }
1276- return false;
1277- break;
1278 case LOWER:
1279 if (record->event.pressed) {
1280 layer_on(_LOWER);
1281diff --git a/keyboards/handwired/split_cloud/keymaps/default/keymap.c b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
1282index ad7e64e6ad518a89e434343c97ee83f103c544c0..01ffe92dda459542f33348756198ba5108d5175c 100644
1283--- a/keyboards/handwired/split_cloud/keymaps/default/keymap.c
1284+++ b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
1285@@ -29,13 +29,14 @@ enum layer_names {
1286 };
1287
1288 enum custom_keycodes {
1289- QWERTY = SAFE_RANGE,
1290- COLEMAK,
1291- DVORAK,
1292- PLOVER,
1293+ PLOVER = SAFE_RANGE,
1294 EXT_PLV
1295 };
1296
1297+#define QWERTY PDF(_QWERTY)
1298+#define COLEMAK PDF(_COLEMAK)
1299+#define DVORAK PDF(_DVORAK)
1300+
1301 #define ST_BOLT QK_STENO_BOLT
1302 #define ST_GEM QK_STENO_GEMINI
1303
1304@@ -195,21 +196,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1305
1306 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1307 switch (keycode) {
1308- case QWERTY:
1309- if (record->event.pressed) {
1310- set_single_persistent_default_layer(_QWERTY);
1311- }
1312- return false;
1313- case COLEMAK:
1314- if (record->event.pressed) {
1315- set_single_persistent_default_layer(_COLEMAK);
1316- }
1317- return false;
1318- case DVORAK:
1319- if (record->event.pressed) {
1320- set_single_persistent_default_layer(_DVORAK);
1321- }
1322- return false;
1323 case PLOVER:
1324 if (!record->event.pressed) {
1325 layer_on(_PLOVER);
1326diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
1327index e6d8bb6f052613ed866fcb0e4e72142accb31b43..8659b495445545dd78365df57ae0372d36fbe131 100644
1328--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
1329+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
1330@@ -33,10 +33,7 @@ enum terminus_mini_layers {
1331 };
1332
1333 enum terminus_mini_keycodes {
1334- COLEMAK = SAFE_RANGE,
1335- QWERTY,
1336- DVORAK,
1337- LOWER,
1338+ LOWER = SAFE_RANGE,
1339 RAISE,
1340 FUNCTION,
1341 MOUSE,
1342@@ -48,6 +45,10 @@ enum terminus_mini_keycodes {
1343 #define SPC_LW LT(_LOWER, KC_SPC)
1344 #define ENT_RS LT(_RAISE, KC_ENT)
1345
1346+#define QWERTY PDF(_QWERTY)
1347+#define COLEMAK PDF(_COLEMAK)
1348+#define DVORAK PDF(_DVORAK)
1349+
1350 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1351 /* Colemak -
1352 * ,----------------------------------------------------------------------------------.
1353@@ -204,24 +205,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1354 // Cases to switch default layer to QWERTY, COLEMAK or DVORAK and to access ADJUST layer
1355 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1356 switch (keycode) {
1357- case QWERTY:
1358- if (record->event.pressed) {
1359- set_single_persistent_default_layer(_QWERTY);
1360- }
1361- return false;
1362- break;
1363- case COLEMAK:
1364- if (record->event.pressed) {
1365- set_single_persistent_default_layer(_COLEMAK);
1366- }
1367- return false;
1368- break;
1369- case DVORAK:
1370- if (record->event.pressed) {
1371- set_single_persistent_default_layer(_DVORAK);
1372- }
1373- return false;
1374- break;
1375 case LOWER:
1376 if (record->event.pressed) {
1377 layer_on(_LOWER);
1378diff --git a/keyboards/handwired/unk/keymaps/default/keymap.c b/keyboards/handwired/unk/keymaps/default/keymap.c
1379index 73d005983e9a9c9fe84035c4108f2184a33e0c69..c0432dcddd659eeedfe377c1b6c81508dcc4695c 100644
1380--- a/keyboards/handwired/unk/keymaps/default/keymap.c
1381+++ b/keyboards/handwired/unk/keymaps/default/keymap.c
1382@@ -8,14 +8,12 @@ enum layer_names {
1383 _ADJUST,
1384 };
1385
1386-enum custom_keycodes {
1387- QWERTY = SAFE_RANGE,
1388- COLEMAK,
1389-};
1390-
1391 #define LOWER MO(_LOWER)
1392 #define RAISE MO(_RAISE)
1393
1394+#define QWERTY PDF(_QWERTY)
1395+#define COLEMAK PDF(_COLEMAK)
1396+
1397 // Each layer gets a name for readability, which is then used in the keymap matrix below.
1398 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
1399 // Layer names don't all need to be of the same length, obviously, and you can also skip them
1400@@ -65,19 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1401 layer_state_t layer_state_set_user(layer_state_t state) {
1402 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
1403 }
1404-
1405-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1406- switch (keycode) {
1407- case QWERTY:
1408- if (record->event.pressed) {
1409- set_single_persistent_default_layer(_QWERTY);
1410- }
1411- return false;
1412- case COLEMAK:
1413- if (record->event.pressed) {
1414- set_single_persistent_default_layer(_COLEMAK);
1415- }
1416- return false;
1417- }
1418- return true;
1419-}
1420diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
1421index a9a7cb3f54b9d1e2e301c60dfe1318c128c3763a..f3583e5249061b6ae15bf026649e86f424b8977c 100644
1422--- a/keyboards/jian/keymaps/default/keymap.c
1423+++ b/keyboards/jian/keymaps/default/keymap.c
1424@@ -11,16 +11,14 @@ enum jian_layers {
1425 _BCKLT_ADJ
1426 };
1427
1428-enum jian_keycodes {
1429- QWERTY = SAFE_RANGE,
1430- DVORAK,
1431- COLEMAK,
1432- WORKMAN
1433-};
1434-
1435 #define RAISE_T(kc) LT(_RAISE, kc)
1436 #define LOWER_T(kc) LT(_LOWER, kc)
1437
1438+#define QWERTY PDF(_QWERTY)
1439+#define COLEMAK PDF(_COLEMAK)
1440+#define DVORAK PDF(_DVORAK)
1441+#define WORKMAN PDF(_WORKMAN)
1442+
1443 #ifdef SWAP_HANDS_ENABLE
1444 #define SW_TG SH_TOGG
1445 #else
1446@@ -92,29 +90,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1447 layer_state_t layer_state_set_user(layer_state_t state) {
1448 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
1449 }
1450-
1451-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1452- switch (keycode) {
1453- case QWERTY:
1454- if (record->event.pressed) {
1455- set_single_persistent_default_layer(_QWERTY);
1456- }
1457- return false;
1458- case DVORAK:
1459- if (record->event.pressed) {
1460- set_single_persistent_default_layer(_DVORAK);
1461- }
1462- return false;
1463- case COLEMAK:
1464- if (record->event.pressed) {
1465- set_single_persistent_default_layer(_COLEMAK);
1466- }
1467- return false;
1468- case WORKMAN:
1469- if (record->event.pressed) {
1470- set_single_persistent_default_layer(_WORKMAN);
1471- }
1472- return false;
1473- }
1474- return true;
1475-}
1476diff --git a/keyboards/jones/v03/keymaps/default_jp/keymap.c b/keyboards/jones/v03/keymaps/default_jp/keymap.c
1477index 9b09b57bbdf29d2aec50638e8c97b66a49eac845..b38b01c74880320662b204915b1a2c0d335cfcee 100644
1478--- a/keyboards/jones/v03/keymaps/default_jp/keymap.c
1479+++ b/keyboards/jones/v03/keymaps/default_jp/keymap.c
1480@@ -63,12 +63,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
1481 }
1482 }
1483
1484-// Defines the keycodes used by our macros in process_record_user
1485-enum custom_keycodes {
1486- MAC = SAFE_RANGE,
1487- WIN,
1488-};
1489-
1490 // Key Macro
1491 #define ESC_NUM TD(TD_ESC_NUM)
1492 #define S_CAP TD(TD_LSFT_CAPS)
1493@@ -82,7 +76,8 @@ enum custom_keycodes {
1494 #define ALT_GRV LALT(KC_GRV)
1495 #define LOWER MO(_LOWER)
1496 #define NUM TG(_NUM)
1497-
1498+#define MAC PDF(_MAC)
1499+#define WIN PDF(_WIN)
1500
1501 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1502 [_MAC] = LAYOUT_jp(
1503@@ -146,26 +141,6 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_jp(
1504 );
1505 #endif
1506
1507-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1508-switch (keycode) {
1509- case MAC: // Change default ayer --> Write to EEPROM
1510- if (record->event.pressed) {
1511- set_single_persistent_default_layer(_MAC);
1512- }
1513- return false;
1514- break;
1515- case WIN: // Change default ayer --> Write to EEPROM
1516- if (record->event.pressed) {
1517- set_single_persistent_default_layer(_WIN);
1518- }
1519- return false;
1520- break;
1521- default:
1522- break;
1523- }
1524- return true;
1525-}
1526-
1527 //------------------------------------------------------------------------------
1528 // RGB Light settings
1529 #ifdef RGBLIGHT_LAYERS
1530diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
1531index b4611439b3f5455c5110ed0371f47fdae3b21527..b60e26d961a193a043c7eca0e858e00d2a669026 100644
1532--- a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
1533+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
1534@@ -62,12 +62,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
1535 }
1536 }
1537
1538-// Defines the keycodes used by our macros in process_record_user
1539-enum custom_keycodes {
1540- MAC = SAFE_RANGE,
1541- WIN,
1542-};
1543-
1544 // Key Macro
1545 #define ESC_NUM TD(TD_ESC_NUM)
1546 #define S_CAP TD(TD_LSFT_CAPS)
1547@@ -80,7 +74,8 @@ enum custom_keycodes {
1548 #define ALT_GRV LALT(KC_GRV)
1549 #define LOWER MO(_LOWER)
1550 #define NUM TG(_NUM)
1551-
1552+#define MAC PDF(_MAC)
1553+#define WIN PDF(_WIN)
1554
1555 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1556 [_MAC] = LAYOUT_ansi(
1557@@ -134,26 +129,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1558 )
1559 };
1560
1561-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1562- switch (keycode) {
1563- case MAC: // Change default ayer --> Write to EEPROM
1564- if (record->event.pressed) {
1565- set_single_persistent_default_layer(_MAC);
1566- }
1567- return false;
1568- break;
1569- case WIN: // Change default ayer --> Write to EEPROM
1570- if (record->event.pressed) {
1571- set_single_persistent_default_layer(_WIN);
1572- }
1573- return false;
1574- break;
1575- default:
1576- break;
1577- }
1578- return true;
1579-}
1580-
1581 //------------------------------------------------------------------------------
1582 // RGB Light settings
1583 #ifdef RGBLIGHT_LAYERS
1584diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
1585index f44b5a13300e7858430e796d246510115a64d5a8..78fb06aad181276ddf713f0f93dec2a3aab6257f 100644
1586--- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
1587+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
1588@@ -63,12 +63,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
1589 }
1590 }
1591
1592-// Defines the keycodes used by our macros in process_record_user
1593-enum custom_keycodes {
1594- MAC = SAFE_RANGE,
1595- WIN,
1596-};
1597-
1598 // Key Macro
1599 #define ESC_NUM TD(TD_ESC_NUM)
1600 #define S_CAP TD(TD_LSFT_CAPS)
1601@@ -82,7 +76,8 @@ enum custom_keycodes {
1602 #define ALT_GRV LALT(KC_GRV)
1603 #define LOWER MO(_LOWER)
1604 #define NUM TG(_NUM)
1605-
1606+#define MAC PDF(_MAC)
1607+#define WIN PDF(_WIN)
1608
1609 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1610 [_MAC] = LAYOUT_jp(
1611@@ -136,26 +131,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1612 )
1613 };
1614
1615-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1616-switch (keycode) {
1617- case MAC: // Change default ayer --> Write to EEPROM
1618- if (record->event.pressed) {
1619- set_single_persistent_default_layer(_MAC);
1620- }
1621- return false;
1622- break;
1623- case WIN: // Change default ayer --> Write to EEPROM
1624- if (record->event.pressed) {
1625- set_single_persistent_default_layer(_WIN);
1626- }
1627- return false;
1628- break;
1629- default:
1630- break;
1631- }
1632- return true;
1633-}
1634-
1635 //------------------------------------------------------------------------------
1636 // RGB Light settings
1637 #ifdef RGBLIGHT_LAYERS
1638diff --git a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
1639index bd52119d96867b4a15e86d294f27417c31face45..f02959d9f53c482f8ce0e0b022f107e6caa9581d 100644
1640--- a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
1641+++ b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
1642@@ -19,13 +19,14 @@
1643
1644 enum layer_number { _QWERTY = 0, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
1645
1646-// Defines the keycodes used by our macros in process_record_user
1647-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK };
1648-
1649 #define LOWER MO(_LOWER)
1650 #define RAISE MO(_RAISE)
1651 #define ADJUST MO(_ADJUST)
1652
1653+#define QWERTY PDF(_QWERTY)
1654+#define COLEMAK PDF(_COLEMAK)
1655+#define DVORAK PDF(_DVORAK)
1656+
1657 // clang-format off
1658 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1659 /* Qwerty
1660@@ -141,27 +142,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
1661 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
1662 }
1663
1664-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1665- switch (keycode) {
1666- case QWERTY:
1667- if (record->event.pressed) {
1668- set_single_persistent_default_layer(_QWERTY);
1669- }
1670- return false;
1671- case COLEMAK:
1672- if (record->event.pressed) {
1673- set_single_persistent_default_layer(_COLEMAK);
1674- }
1675- return false;
1676- case DVORAK:
1677- if (record->event.pressed) {
1678- set_single_persistent_default_layer(_DVORAK);
1679- }
1680- return false;
1681- }
1682- return true;
1683-}
1684-
1685 bool led_update_user(led_t led_state) {
1686 board_set_led_by_index(0, LED_YELLOW, led_state.caps_lock);
1687 board_set_led_by_index(1, LED_YELLOW, led_state.scroll_lock);
1688diff --git a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
1689index a1f0f6d08294048f23bb78295385d91cf6c5a95c..5e777f9074fbea934cdcaac3353c7ca0bed964ee 100644
1690--- a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
1691+++ b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
1692@@ -19,13 +19,14 @@
1693
1694 enum layer_number { _QWERTY = 0, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
1695
1696-// Defines the keycodes used by our macros in process_record_user
1697-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK };
1698-
1699 #define LOWER MO(_LOWER)
1700 #define RAISE MO(_RAISE)
1701 #define ADJUST MO(_ADJUST)
1702
1703+#define QWERTY PDF(_QWERTY)
1704+#define COLEMAK PDF(_COLEMAK)
1705+#define DVORAK PDF(_DVORAK)
1706+
1707 // clang-format off
1708 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1709 /* Qwerty
1710@@ -141,27 +142,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
1711 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
1712 }
1713
1714-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1715- switch (keycode) {
1716- case QWERTY:
1717- if (record->event.pressed) {
1718- set_single_persistent_default_layer(_QWERTY);
1719- }
1720- return false;
1721- case COLEMAK:
1722- if (record->event.pressed) {
1723- set_single_persistent_default_layer(_COLEMAK);
1724- }
1725- return false;
1726- case DVORAK:
1727- if (record->event.pressed) {
1728- set_single_persistent_default_layer(_DVORAK);
1729- }
1730- return false;
1731- }
1732- return true;
1733-}
1734-
1735 bool led_update_user(led_t led_state) {
1736 board_set_led_by_index(0, LED_YELLOW, led_state.caps_lock);
1737 board_set_led_by_index(1, LED_YELLOW, led_state.scroll_lock);
1738diff --git a/keyboards/keebio/viterbi/keymaps/default/keymap.c b/keyboards/keebio/viterbi/keymaps/default/keymap.c
1739index bc7cd5d3f01e8d7e8569b248635976f099f54a11..e37fc8f79022d4bb849c920b0bd24b18229786e4 100644
1740--- a/keyboards/keebio/viterbi/keymaps/default/keymap.c
1741+++ b/keyboards/keebio/viterbi/keymaps/default/keymap.c
1742@@ -13,8 +13,7 @@ enum layer_names {
1743 };
1744
1745 enum custom_keycodes {
1746- QWERTY = SAFE_RANGE,
1747- LOWER,
1748+ LOWER = SAFE_RANGE,
1749 RAISE,
1750 ADJUST,
1751 };
1752@@ -88,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1753 [_ADJUST] = LAYOUT_ortho_5x14(
1754 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
1755 _______, _______, QK_BOOT, UG_TOGG, UG_NEXT, UG_HUED, UG_HUEU, UG_SATD, UG_SATU, UG_VALD, UG_VALU, _______, KC_DEL, _______,
1756- _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______,
1757+ _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______,
1758 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1759 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
1760 )
1761@@ -98,12 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1762
1763 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1764 switch (keycode) {
1765- case QWERTY:
1766- if (record->event.pressed) {
1767- set_single_persistent_default_layer(_QWERTY);
1768- }
1769- return false;
1770- break;
1771 case LOWER:
1772 if (record->event.pressed) {
1773 layer_on(_LOWER);
1774diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
1775index ab5b9de62ff6062b6509bfae8695f27399dfceab..1e12efc1c16284c1465446ab63392ce8c0ded6fd 100644
1776--- a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
1777+++ b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
1778@@ -5,11 +5,6 @@ enum layer_names {
1779 _LOWER
1780 };
1781
1782-enum custom_keycodes {
1783- QWERTY = SAFE_RANGE,
1784- LOWER
1785-};
1786-
1787 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1788 /* Qwerty
1789 * ,-----------------------------------------------------------------------------------.
1790@@ -29,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1791 QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
1792 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
1793 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
1794- KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
1795+ KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
1796 ),
1797
1798 /* Lower
1799@@ -53,21 +48,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1800 UG_TOGG, QK_BOOT, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
1801 )
1802 };
1803-
1804-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1805- switch (keycode) {
1806- case QWERTY:
1807- if (record->event.pressed) {
1808- set_single_persistent_default_layer(_QWERTY);
1809- }
1810- return false;
1811- case LOWER:
1812- if (record->event.pressed) {
1813- layer_on(_LOWER);
1814- } else {
1815- layer_off(_LOWER);
1816- }
1817- return false;
1818- }
1819- return true;
1820-};
1821diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
1822index 2833201d97ccd762658ed4253fdd6472ba52005c..e775008bd4d68a54703b149c1f70ac889833a635 100644
1823--- a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
1824+++ b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
1825@@ -8,8 +8,7 @@ enum layer_names {
1826 };
1827
1828 enum custom_keycodes {
1829- QWERTY = SAFE_RANGE,
1830- LOWER,
1831+ LOWER = SAFE_RANGE,
1832 RAISE
1833 };
1834
1835@@ -83,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1836 * |------+------+------+------+------+------+------+------+------+------+------+------|
1837 * | | Reset| | | | | | | | | | Del |
1838 * |------+------+------+------+------+-------------+------+------+------+------+------|
1839- * | | | |Aud on|AudOff|AGnorm|AGswap|Qwerty| | | | |
1840+ * | | | |Aud on|AudOff|AGnorm|AGswap| | | | | |
1841 * |------+------+------+------+------+------|------+------+------+------+------+------|
1842 * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | |
1843 * |------+------+------+------+------+------+------+------+------+------+------+------|
1844@@ -93,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1845 [_ADJUST] = LAYOUT_ortho_5x12(
1846 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
1847 _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
1848- _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
1849+ _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
1850 _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
1851 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
1852 )
1853@@ -101,11 +100,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1854
1855 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1856 switch (keycode) {
1857- case QWERTY:
1858- if (record->event.pressed) {
1859- set_single_persistent_default_layer(_QWERTY);
1860- }
1861- return false;
1862 case LOWER:
1863 if (record->event.pressed) {
1864 layer_on(_LOWER);
1865diff --git a/keyboards/keyprez/bison/keymaps/default/keymap.c b/keyboards/keyprez/bison/keymaps/default/keymap.c
1866index fc1f346647acd30ca62fde5b95cfacef2fca5a71..d66b1a487bbf4433834ef2b9e3a4083c4bda6c81 100644
1867--- a/keyboards/keyprez/bison/keymaps/default/keymap.c
1868+++ b/keyboards/keyprez/bison/keymaps/default/keymap.c
1869@@ -26,10 +26,7 @@ enum layer_names {
1870 };
1871
1872 enum custom_keycodes {
1873- KC_QWRTY = SAFE_RANGE,
1874- KC_COLMK,
1875- KC_HRM,
1876- KC_PRVWD,
1877+ KC_PRVWD = SAFE_RANGE,
1878 KC_NXTWD
1879 };
1880
1881@@ -46,6 +43,10 @@ enum custom_keycodes {
1882 #define HRM_RC MT(MOD_RCTL, KC_K)
1883 #define HRM_RS MT(MOD_RSFT, KC_J)
1884
1885+#define KC_QWRTY PDF(_QWERTY)
1886+#define KC_COLMK PDF(_COLEMAK)
1887+#define KC_HRM PDF(_HRM)
1888+
1889 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1890 /*
1891 * QWERTY
1892@@ -188,21 +189,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1893
1894 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1895 switch (keycode) {
1896- case KC_QWRTY:
1897- if (record->event.pressed) {
1898- set_single_persistent_default_layer(_QWERTY);
1899- }
1900- return false;
1901- case KC_COLMK:
1902- if (record->event.pressed) {
1903- set_single_persistent_default_layer(_COLEMAK);
1904- }
1905- return false;
1906- case KC_HRM:
1907- if (record->event.pressed) {
1908- set_single_persistent_default_layer(_HRM);
1909- }
1910- return false;
1911 case KC_PRVWD:
1912 if (record->event.pressed) {
1913 register_mods(mod_config(MOD_LCTL));
1914diff --git a/keyboards/keyprez/bison/keymaps/default_6_6/keymap.c b/keyboards/keyprez/bison/keymaps/default_6_6/keymap.c
1915index 816cd2fda6effc78b5c43acece451273def1886e..a51fd87c01d82f661364f952cd06beeb532cfcd1 100644
1916--- a/keyboards/keyprez/bison/keymaps/default_6_6/keymap.c
1917+++ b/keyboards/keyprez/bison/keymaps/default_6_6/keymap.c
1918@@ -26,10 +26,7 @@ enum layer_names {
1919 };
1920
1921 enum custom_keycodes {
1922- KC_QWRTY = SAFE_RANGE,
1923- KC_COLMK,
1924- KC_HRM,
1925- KC_PRVWD,
1926+ KC_PRVWD = SAFE_RANGE,
1927 KC_NXTWD
1928 };
1929
1930@@ -46,6 +43,10 @@ enum custom_keycodes {
1931 #define HRM_RC MT(MOD_RCTL, KC_K)
1932 #define HRM_RS MT(MOD_RSFT, KC_J)
1933
1934+#define KC_QWRTY PDF(_QWERTY)
1935+#define KC_COLMK PDF(_COLEMAK)
1936+#define KC_HRM PDF(_HRM)
1937+
1938 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1939 /*
1940 * QWERTY
1941@@ -188,21 +189,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1942
1943 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1944 switch (keycode) {
1945- case KC_QWRTY:
1946- if (record->event.pressed) {
1947- set_single_persistent_default_layer(_QWERTY);
1948- }
1949- return false;
1950- case KC_COLMK:
1951- if (record->event.pressed) {
1952- set_single_persistent_default_layer(_COLEMAK);
1953- }
1954- return false;
1955- case KC_HRM:
1956- if (record->event.pressed) {
1957- set_single_persistent_default_layer(_HRM);
1958- }
1959- return false;
1960 case KC_PRVWD:
1961 if (record->event.pressed) {
1962 register_mods(mod_config(MOD_LCTL));
1963diff --git a/keyboards/keyprez/bison/keymaps/default_6_8/keymap.c b/keyboards/keyprez/bison/keymaps/default_6_8/keymap.c
1964index c42ee631dbc55007c0731e4b4ac88b046001e8f8..c6d46763848753721ab4154846bdf4273dd592ed 100644
1965--- a/keyboards/keyprez/bison/keymaps/default_6_8/keymap.c
1966+++ b/keyboards/keyprez/bison/keymaps/default_6_8/keymap.c
1967@@ -26,10 +26,7 @@ enum layer_names {
1968 };
1969
1970 enum custom_keycodes {
1971- KC_QWRTY = SAFE_RANGE,
1972- KC_COLMK,
1973- KC_HRM,
1974- KC_PRVWD,
1975+ KC_PRVWD = SAFE_RANGE,
1976 KC_NXTWD
1977 };
1978
1979@@ -46,6 +43,10 @@ enum custom_keycodes {
1980 #define HRM_RC MT(MOD_RCTL, KC_K)
1981 #define HRM_RS MT(MOD_RSFT, KC_J)
1982
1983+#define KC_QWRTY PDF(_QWERTY)
1984+#define KC_COLMK PDF(_COLEMAK)
1985+#define KC_HRM PDF(_HRM)
1986+
1987 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1988 /*
1989 * QWERTY
1990@@ -188,21 +189,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1991
1992 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
1993 switch (keycode) {
1994- case KC_QWRTY:
1995- if (record->event.pressed) {
1996- set_single_persistent_default_layer(_QWERTY);
1997- }
1998- return false;
1999- case KC_COLMK:
2000- if (record->event.pressed) {
2001- set_single_persistent_default_layer(_COLEMAK);
2002- }
2003- return false;
2004- case KC_HRM:
2005- if (record->event.pressed) {
2006- set_single_persistent_default_layer(_HRM);
2007- }
2008- return false;
2009 case KC_PRVWD:
2010 if (record->event.pressed) {
2011 register_mods(mod_config(MOD_LCTL));
2012diff --git a/keyboards/keyprez/bison/keymaps/default_8_6/keymap.c b/keyboards/keyprez/bison/keymaps/default_8_6/keymap.c
2013index 173b9bc387149cc7fb15cda66d39165d35dba841..5566539c08e44b9a7516121c15b23bc77a0889fc 100644
2014--- a/keyboards/keyprez/bison/keymaps/default_8_6/keymap.c
2015+++ b/keyboards/keyprez/bison/keymaps/default_8_6/keymap.c
2016@@ -26,10 +26,7 @@ enum layer_names {
2017 };
2018
2019 enum custom_keycodes {
2020- KC_QWRTY = SAFE_RANGE,
2021- KC_COLMK,
2022- KC_HRM,
2023- KC_PRVWD,
2024+ KC_PRVWD = SAFE_RANGE,
2025 KC_NXTWD
2026 };
2027
2028@@ -46,6 +43,10 @@ enum custom_keycodes {
2029 #define HRM_RC MT(MOD_RCTL, KC_K)
2030 #define HRM_RS MT(MOD_RSFT, KC_J)
2031
2032+#define KC_QWRTY PDF(_QWERTY)
2033+#define KC_COLMK PDF(_COLEMAK)
2034+#define KC_HRM PDF(_HRM)
2035+
2036 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2037 /*
2038 * QWERTY
2039@@ -188,21 +189,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2040
2041 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2042 switch (keycode) {
2043- case KC_QWRTY:
2044- if (record->event.pressed) {
2045- set_single_persistent_default_layer(_QWERTY);
2046- }
2047- return false;
2048- case KC_COLMK:
2049- if (record->event.pressed) {
2050- set_single_persistent_default_layer(_COLEMAK);
2051- }
2052- return false;
2053- case KC_HRM:
2054- if (record->event.pressed) {
2055- set_single_persistent_default_layer(_HRM);
2056- }
2057- return false;
2058 case KC_PRVWD:
2059 if (record->event.pressed) {
2060 register_mods(mod_config(MOD_LCTL));
2061diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c
2062index 757b3fd1db01156688e54714c657f7942f4a4d35..3e55671bc9f00171ce2dd850501144e9eba53584 100644
2063--- a/keyboards/keyprez/corgi/keymaps/default/keymap.c
2064+++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c
2065@@ -26,15 +26,13 @@ enum layer_names {
2066 _CMD,
2067 };
2068
2069-enum corgi_keycodes {
2070- QWERTY = SAFE_RANGE,
2071- COLEMAK
2072-};
2073-
2074 #define LOWER MO(_LOWER)
2075 #define RAISE MO(_RAISE)
2076 #define CMD MO(_CMD)
2077
2078+#define QWERTY PDF(_QWERTY)
2079+#define COLEMAK PDF(_COLEMAK)
2080+
2081 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2082 /* Qwerty
2083 * ,-----------------------------------------------------------------------------------.
2084@@ -136,21 +134,3 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
2085 tap_code(clockwise ? KC_VOLU : KC_VOLD);
2086 return true;
2087 }
2088-
2089-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2090- switch (keycode) {
2091- case QWERTY:
2092- if (record->event.pressed) {
2093- set_single_persistent_default_layer(_QWERTY);
2094- }
2095- return false;
2096- break;
2097- case COLEMAK:
2098- if (record->event.pressed) {
2099- set_single_persistent_default_layer(_COLEMAK);
2100- }
2101- return false;
2102- break;
2103- }
2104- return true;
2105-}
2106diff --git a/keyboards/kprepublic/jj50/keymaps/default/keymap.c b/keyboards/kprepublic/jj50/keymaps/default/keymap.c
2107index f6df7b92f6fdf353a57abbbaf35740c49f4615cd..7bc5663600c065591d02c1d0448aa0269ae62325 100644
2108--- a/keyboards/kprepublic/jj50/keymaps/default/keymap.c
2109+++ b/keyboards/kprepublic/jj50/keymaps/default/keymap.c
2110@@ -28,17 +28,15 @@ enum layers {
2111 _FN
2112 };
2113
2114-enum keycodes {
2115- QWERTY = SAFE_RANGE,
2116- WORKMAN,
2117- COLEMAK,
2118- DVORAK
2119-};
2120-
2121 #define FN MO(_FN)
2122 #define LOWER MO(_LOWER)
2123 #define RAISE MO(_RAISE)
2124
2125+#define QWERTY PDF(_QWERTY)
2126+#define WORKMAN PDF(_WORKMAN)
2127+#define COLEMAK PDF(_COLEMAK)
2128+#define DVORAK PDF(_DVORAK)
2129+
2130 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2131
2132 /* Qwerty
2133@@ -213,29 +211,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2134 layer_state_t layer_state_set_user(layer_state_t state) {
2135 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2136 }
2137-
2138-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2139- switch (keycode) {
2140- case QWERTY:
2141- if (record->event.pressed) {
2142- set_single_persistent_default_layer(_QWERTY);
2143- }
2144- return false;
2145- case WORKMAN:
2146- if (record->event.pressed) {
2147- set_single_persistent_default_layer(_WORKMAN);
2148- }
2149- return false;
2150- case COLEMAK:
2151- if (record->event.pressed) {
2152- set_single_persistent_default_layer(_COLEMAK);
2153- }
2154- return false;
2155- case DVORAK:
2156- if (record->event.pressed) {
2157- set_single_persistent_default_layer(_DVORAK);
2158- }
2159- return false;
2160- }
2161- return true;
2162-};
2163diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
2164index 4eec2e02acd904b3679bc6359b3f7c6cde8904b4..1c7405f2aca68f7b871259f7269bf544de158824 100644
2165--- a/keyboards/lets_split/keymaps/default/keymap.c
2166+++ b/keyboards/lets_split/keymaps/default/keymap.c
2167@@ -13,16 +13,14 @@ enum layer_names {
2168 _ADJUST
2169 };
2170
2171-enum custom_keycodes {
2172- QWERTY = SAFE_RANGE,
2173- COLEMAK,
2174- DVORAK
2175-};
2176-
2177 #define LOWER MO(_LOWER)
2178 #define RAISE MO(_RAISE)
2179 #define ADJUST MO(_ADJUST)
2180
2181+#define QWERTY PDF(_QWERTY)
2182+#define COLEMAK PDF(_COLEMAK)
2183+#define DVORAK PDF(_DVORAK)
2184+
2185 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2186 /* Qwerty
2187 * ,-----------------------------------------------------------------------------------.
2188@@ -138,24 +136,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2189 layer_state_t layer_state_set_user(layer_state_t state) {
2190 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2191 }
2192-
2193-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2194- switch (keycode) {
2195- case QWERTY:
2196- if (record->event.pressed) {
2197- set_single_persistent_default_layer(_QWERTY);
2198- }
2199- return false;
2200- case COLEMAK:
2201- if (record->event.pressed) {
2202- set_single_persistent_default_layer(_COLEMAK);
2203- }
2204- return false;
2205- case DVORAK:
2206- if (record->event.pressed) {
2207- set_single_persistent_default_layer(_DVORAK);
2208- }
2209- return false;
2210- }
2211- return true;
2212-}
2213diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c
2214index e3e5d5a323b03a3bf733413b8bb61bbcb15a8b3f..8f4e6eb8a482a527613becbf28b03284a229d0d8 100644
2215--- a/keyboards/lime/keymaps/default/keymap.c
2216+++ b/keyboards/lime/keymaps/default/keymap.c
2217@@ -30,9 +30,7 @@ enum lime_layers {
2218 };
2219
2220 enum custom_keycodes {
2221- KC_QWERTY = SAFE_RANGE,
2222- KC_COLEMAK,
2223- KC_LOWER,
2224+ KC_LOWER = SAFE_RANGE,
2225 KC_RAISE,
2226 KC_ADJUST,
2227 KC_PRVWD,
2228@@ -47,6 +45,9 @@ enum custom_keycodes {
2229 KC_JOYSTICK_DEBUG,
2230 };
2231
2232+#define KC_QWERTY PDF(_QWERTY)
2233+#define KC_COLEMAK PDF(_COLEMAK)
2234+
2235 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2236 /*
2237 * QWERTY
2238@@ -480,16 +481,6 @@ bool showedJump = true;
2239
2240 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2241 switch (keycode) {
2242- case KC_QWERTY:
2243- if (record->event.pressed) {
2244- set_single_persistent_default_layer(_QWERTY);
2245- }
2246- return false;
2247- case KC_COLEMAK:
2248- if (record->event.pressed) {
2249- set_single_persistent_default_layer(_COLEMAK);
2250- }
2251- return false;
2252 case KC_LOWER:
2253 if (record->event.pressed) {
2254 layer_on(_LOWER);
2255diff --git a/keyboards/makrosu/keymaps/default/keymap.c b/keyboards/makrosu/keymaps/default/keymap.c
2256index 3de4f71df3a01fa9d0548c7e78e3bc0e890f3ccd..1e60e357ba72a3621aca63be2af9f38545c3f86f 100644
2257--- a/keyboards/makrosu/keymaps/default/keymap.c
2258+++ b/keyboards/makrosu/keymaps/default/keymap.c
2259@@ -24,15 +24,11 @@ enum planck_layers {
2260
2261 };
2262
2263-
2264-enum planck_keycodes {
2265- L1 = SAFE_RANGE,
2266- L2,
2267- L3
2268-
2269-};
2270-
2271+#define L1 PDF(_1)
2272+#define L2 PDF(_2)
2273+#define L3 PDF(_3)
2274 #define LOWER MO(_4)
2275+
2276 #define IND_1 D4
2277 #define IND_2 C6
2278 #define IND_3 D7
2279@@ -66,27 +62,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
2280 return state;
2281 }
2282
2283-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2284- switch (keycode) {
2285- case L1:
2286- if (record->event.pressed) {
2287- set_single_persistent_default_layer(_1);
2288- }
2289- return false;
2290- case L2:
2291- if (record->event.pressed) {
2292- set_single_persistent_default_layer(_2);
2293- }
2294- return false;
2295- case L3:
2296- if (record->event.pressed) {
2297- set_single_persistent_default_layer(_3);
2298- }
2299- return false;
2300- }
2301- return true;
2302-}
2303-
2304 void matrix_init_user(void) {
2305 //init the Pro Micro on-board LEDs
2306 gpio_set_pin_output(IND_1);
2307diff --git a/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c
2308index 9b2369ce314cf3178e827e498460f4d807778870..3eff1ad0417aac7843f72c799cb7d57d73d6ad02 100644
2309--- a/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c
2310+++ b/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c
2311@@ -15,16 +15,14 @@ enum layer_names
2312 _ADJUST
2313 };
2314
2315-enum custom_keycodes {
2316- QWERTY = SAFE_RANGE,
2317- COLEMAK,
2318- DVORAK
2319-};
2320-
2321 #define LOWER MO(_LOWER)
2322 #define RAISE MO(_RAISE)
2323 #define ADJUST MO(_ADJUST)
2324
2325+#define QWERTY PDF(_QWERTY)
2326+#define COLEMAK PDF(_COLEMAK)
2327+#define DVORAK PDF(_DVORAK)
2328+
2329 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2330 /* Qwerty
2331 * ,-----------------------------------------------------------------------------------.
2332@@ -140,24 +138,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2333 layer_state_t layer_state_set_user(layer_state_t state) {
2334 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2335 }
2336-
2337-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2338- switch (keycode) {
2339- case QWERTY:
2340- if (record->event.pressed) {
2341- set_single_persistent_default_layer(_QWERTY);
2342- }
2343- return false;
2344- case COLEMAK:
2345- if (record->event.pressed) {
2346- set_single_persistent_default_layer(_COLEMAK);
2347- }
2348- return false;
2349- case DVORAK:
2350- if (record->event.pressed) {
2351- set_single_persistent_default_layer(_DVORAK);
2352- }
2353- return false;
2354- }
2355- return true;
2356-}
2357diff --git a/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c
2358index d430a7877f381ecfe28ce484be2b4314bfd44c80..25d9476912c311a32f0c52ee57777deb7fa3a21c 100644
2359--- a/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c
2360+++ b/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c
2361@@ -14,16 +14,14 @@ enum layer_names {
2362 _ADJUST
2363 };
2364
2365-enum custom_keycodes {
2366- QWERTY = SAFE_RANGE,
2367- COLEMAK,
2368- DVORAK
2369-};
2370-
2371 #define LOWER MO(_LOWER)
2372 #define RAISE MO(_RAISE)
2373 #define ADJUST MO(_ADJUST)
2374
2375+#define QWERTY PDF(_QWERTY)
2376+#define COLEMAK PDF(_COLEMAK)
2377+#define DVORAK PDF(_DVORAK)
2378+
2379 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2380 /* Qwerty
2381 * ,-----------------------------------------------------------------------------------.
2382@@ -139,23 +137,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2383 layer_state_t layer_state_set_user(layer_state_t state) {
2384 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2385 }
2386-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2387- switch (keycode) {
2388- case QWERTY:
2389- if (record->event.pressed) {
2390- set_single_persistent_default_layer(_QWERTY);
2391- }
2392- break;
2393- case COLEMAK:
2394- if (record->event.pressed) {
2395- set_single_persistent_default_layer(_COLEMAK);
2396- }
2397- break;
2398- case DVORAK:
2399- if (record->event.pressed) {
2400- set_single_persistent_default_layer(_DVORAK);
2401- }
2402- break;
2403- }
2404- return true;
2405-}
2406diff --git a/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c
2407index aadbde3672fb8d7b5eedc916e84563e9b875c3fa..dd2fedd98705ea837c05b1b33003be6dcb0a0ece 100644
2408--- a/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c
2409+++ b/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c
2410@@ -14,16 +14,14 @@ enum layer_names {
2411 _ADJUST
2412 };
2413
2414-enum custom_keycodes {
2415- QWERTY = SAFE_RANGE,
2416- COLEMAK,
2417- DVORAK
2418-};
2419-
2420 #define LOWER MO(_LOWER)
2421 #define RAISE MO(_RAISE)
2422 #define ADJUST MO(_ADJUST)
2423
2424+#define QWERTY PDF(_QWERTY)
2425+#define COLEMAK PDF(_COLEMAK)
2426+#define DVORAK PDF(_DVORAK)
2427+
2428 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2429
2430 [_QWERTY] = LAYOUT_all(
2431@@ -72,26 +70,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2432 layer_state_t layer_state_set_user(layer_state_t state) {
2433 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2434 }
2435-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2436- switch (keycode) {
2437- case QWERTY:
2438- if (record->event.pressed) {
2439- set_single_persistent_default_layer(_QWERTY);
2440- }
2441- break;
2442- case COLEMAK:
2443- if (record->event.pressed) {
2444- set_single_persistent_default_layer(_COLEMAK);
2445- }
2446- break;
2447- case DVORAK:
2448- if (record->event.pressed) {
2449- set_single_persistent_default_layer(_DVORAK);
2450- }
2451- break;
2452- }
2453- return true;
2454-}
2455
2456 bool encoder_update_user(uint8_t index, bool clockwise) {
2457 if (clockwise) {
2458diff --git a/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c
2459index aadbde3672fb8d7b5eedc916e84563e9b875c3fa..dd2fedd98705ea837c05b1b33003be6dcb0a0ece 100644
2460--- a/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c
2461+++ b/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c
2462@@ -14,16 +14,14 @@ enum layer_names {
2463 _ADJUST
2464 };
2465
2466-enum custom_keycodes {
2467- QWERTY = SAFE_RANGE,
2468- COLEMAK,
2469- DVORAK
2470-};
2471-
2472 #define LOWER MO(_LOWER)
2473 #define RAISE MO(_RAISE)
2474 #define ADJUST MO(_ADJUST)
2475
2476+#define QWERTY PDF(_QWERTY)
2477+#define COLEMAK PDF(_COLEMAK)
2478+#define DVORAK PDF(_DVORAK)
2479+
2480 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2481
2482 [_QWERTY] = LAYOUT_all(
2483@@ -72,26 +70,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2484 layer_state_t layer_state_set_user(layer_state_t state) {
2485 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
2486 }
2487-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
2488- switch (keycode) {
2489- case QWERTY:
2490- if (record->event.pressed) {
2491- set_single_persistent_default_layer(_QWERTY);
2492- }
2493- break;
2494- case COLEMAK:
2495- if (record->event.pressed) {
2496- set_single_persistent_default_layer(_COLEMAK);
2497- }
2498- break;
2499- case DVORAK:
2500- if (record->event.pressed) {
2501- set_single_persistent_default_layer(_DVORAK);
2502- }
2503- break;
2504- }
2505- return true;
2506-}
2507
2508 bool encoder_update_user(uint8_t index, bool clockwise) {
2509 if (clockwise) {