aboutsummaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ergodox/drashna/keymap.c219
-rw-r--r--layouts/community/ortho_4x12/drashna/keymap.c143
-rw-r--r--layouts/community/ortho_4x12/drashna/rules.mk14
-rw-r--r--layouts/community/ortho_5x12/drashna/keymap.c44
-rw-r--r--layouts/community/split_3x6_3/drashna/config.h12
-rw-r--r--layouts/community/split_3x6_3/drashna/keymap.c110
6 files changed, 177 insertions, 365 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 600e29020..430328fed 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -56,145 +56,33 @@ bool skip_leds = false;
56 KC_SPC, LT(_LOWER, KC_BSPC), OS_LWR, OS_RSE, LT(_RAISE, KC_DEL), KC_ENT \ 56 KC_SPC, LT(_LOWER, KC_BSPC), OS_LWR, OS_RSE, LT(_RAISE, KC_DEL), KC_ENT \
57 ) 57 )
58 58
59#define LAYOUT_ergodox_pretty_base_wrapper(...) LAYOUT_ergodox_pretty_base(__VA_ARGS__) 59#define LAYOUT_base_wrapper(...) LAYOUT_ergodox_pretty_base(__VA_ARGS__)
60 60
61 61
62 62
63const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 63const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
64/* Keymap 0: QWERTY Layer 64 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
65 * 65 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
66 * 66 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
67 * ,--------------------------------------------------. ,--------------------------------------------------. 67 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
68 * | = + | 1 ! | 2 @ | 3 # | 4 $ | 5 % | TG(4)| | TG(4)| 6 ^ | 7 & | 8 * | 9 ( | 0 ) | - _ | 68 ),
69 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| 69
70 * | TAB | Q | W | E | R | T | TG(3)| |TG(3) | Y | U | I | O | P | \ | | 70 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
71 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 71 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
72 * | Bksp | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " | 72 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
73 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------| 73 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
74 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | ? / | Shift | 74 ),
75 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 75 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
76 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB | 76 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
77 * `----------------------------------' `----------------------------------' 77 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
78 * ,--------------. ,--------------. 78 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
79 * |Alt/Ap| Win | | Alt |Ctl/Esc| 79 ),
80 * ,------|------|-------| |------+-------+------. 80
81 * | | | Home | | PgUp | | | 81 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
82 * | Space| Bksp |-------| |------| DEL |Enter | 82 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
83 * | | | End | | PgDn | | | 83 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
84 * `---------------------' `---------------------' 84 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
85 */ 85 ),
86 [_QWERTY] = LAYOUT_ergodox_pretty_base_wrapper(
87 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
88 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
89 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
90 ),
91/* Keymap 0: COLEMAK layer
92 *
93 * ,--------------------------------------------------. ,--------------------------------------------------.
94 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
95 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
96 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
97 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
98 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
99 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
100 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
101 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
102 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
103 * `----------------------------------' `----------------------------------'
104 * ,-------------. ,-------------.
105 * | App | LGui | | Alt |Ctrl/Esc|
106 * ,------|------|------| |------+--------+------.
107 * | | | Home | | PgUp | | |
108 * | Space|Backsp|------| |------| Tab |Enter |
109 * | |ace | End | | PgDn | | |
110 * `--------------------' `----------------------'
111 */
112// If it accepts an argument (i.e, is a function), it doesn't need KC_.
113// Otherwise, it needs KC_*
114 [_COLEMAK] = LAYOUT_ergodox_pretty_base_wrapper(
115 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
116 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
117 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
118 ),
119/* Keymap 0: DVORAK Layout
120 *
121 * ,--------------------------------------------------. ,--------------------------------------------------.
122 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
123 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
124 * | Del | ' | , | . | P | Y | L1 | | L1 | F | G | C | R | L | / |
125 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
126 * | BkSp | A | O | E | U | I |------| |------| D | H | T | N |S / L2| - |
127 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
128 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
129 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
130 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
131 * `----------------------------------' `----------------------------------'
132 * ,-------------. ,-------------.
133 * | App | LGui | | Alt |Ctrl/Esc|
134 * ,------|------|------| |------+--------+------.
135 * | | | Home | | PgUp | | |
136 * | Space|Backsp|------| |------| Tab |Enter |
137 * | |ace | End | | PgDn | | |
138 * `--------------------' `----------------------'
139 */
140// If it accepts an argument (i.e, is a function), it doesn't need KC_.
141// Otherwise, it needs KC_*
142 [_DVORAK] = LAYOUT_ergodox_pretty_base_wrapper(
143 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
144 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
145 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
146 ),
147/* Keymap 0: WORKMAN layer
148 *
149 * ,--------------------------------------------------. ,--------------------------------------------------.
150 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
151 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
152 * | Del | Q | D | R | W | B | L1 | | L1 | J | F | U | P | ; | \ |
153 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
154 * | BkSp | A | S | H | T | D |------| |------| Y | N | E | O | I | ' |
155 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
156 * | LShift |Z/Ctrl| X | M | C | V | | | | K | L | , | . |//Ctrl| RShift |
157 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
158 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
159 * `----------------------------------' `----------------------------------'
160 * ,-------------. ,-------------.
161 * | App | LGui | | Alt |Ctrl/Esc|
162 * ,------|------|------| |------+--------+------.
163 * | | | Home | | PgUp | | |
164 * | Space|Backsp|------| |------| Tab |Enter |
165 * | |ace | End | | PgDn | | |
166 * `--------------------' `----------------------'
167 */
168
169 [_WORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
170 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
171 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
172 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
173 ),
174
175 [_NORMAN] = LAYOUT_ergodox_pretty_base_wrapper(
176 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
177 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
178 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
179 ),
180
181 [_MALTRON] = LAYOUT_ergodox_pretty_base_wrapper(
182 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
183 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
184 _________________MALTRON_L3________________, _________________MALTRON_R3________________
185 ),
186
187 [_EUCALYN] = LAYOUT_ergodox_pretty_base_wrapper(
188 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
189 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
190 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
191 ),
192
193 [_CARPLAX] = LAYOUT_ergodox_pretty_base_wrapper(
194 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
195 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
196 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
197 ),
198 86
199/* Keymap 4: Customized Overwatch Layout 87/* Keymap 4: Customized Overwatch Layout
200 * 88 *
@@ -311,9 +199,7 @@ void keyboard_post_init_keymap(void) {
311 // trackball_set_precision(1.5); 199 // trackball_set_precision(1.5);
312 trackball_set_rgbw(RGB_MAGENTA, 0x00); 200 trackball_set_rgbw(RGB_MAGENTA, 0x00);
313} 201}
314void shutdown_keymap(void) { 202void shutdown_keymap(void) { trackball_set_rgbw(RGB_RED, 0x00); }
315 trackball_set_rgbw(RGB_RED, 0x00);
316}
317 203
318static bool mouse_button_one, trackball_button_one; 204static bool mouse_button_one, trackball_button_one;
319 205
@@ -328,8 +214,6 @@ void trackball_register_button(bool pressed, enum mouse_buttons button) {
328} 214}
329#endif 215#endif
330 216
331
332
333bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 217bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
334 switch (keycode) { 218 switch (keycode) {
335 case KC_1: 219 case KC_1:
@@ -371,17 +255,17 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
371 } 255 }
372 run_trackball_cleanup(); 256 run_trackball_cleanup();
373 break; 257 break;
374#if !defined(MOUSEKEY_ENABLE) 258# if !defined(MOUSEKEY_ENABLE)
375 case KC_MS_BTN1: 259 case KC_MS_BTN1:
376 mouse_button_one = record->event.pressed; 260 mouse_button_one = record->event.pressed;
377 trackball_register_button(mouse_button_one | trackball_button_one, MOUSE_BTN1); 261 trackball_register_button(mouse_button_one | trackball_button_one, MOUSE_BTN1);
378 break; 262 break;
379 case KC_MS_BTN2: 263 case KC_MS_BTN2:
380 trackball_register_button(record->event.pressed, MOUSE_BTN2); 264 trackball_register_button(record->event.pressed, MOUSE_BTN2);
381 break; 265 break;
382 case KC_MS_BTN3: 266 case KC_MS_BTN3:
383 trackball_register_button(record->event.pressed, MOUSE_BTN3); 267 trackball_register_button(record->event.pressed, MOUSE_BTN3);
384 break; 268 break;
385# endif 269# endif
386#endif 270#endif
387 } 271 }
@@ -434,7 +318,6 @@ void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); }
434void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); } 318void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); }
435 319
436void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { 320void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
437
438 if (layer_state_is(_GAMEPAD)) { 321 if (layer_state_is(_GAMEPAD)) {
439 RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x00, 0xFF, 0x00); // Q 322 RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x00, 0xFF, 0x00); // Q
440 RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0xFF, 0xFF); // W 323 RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0xFF, 0xFF); // W
@@ -447,7 +330,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
447 330
448 RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 26 : 27), 0xFF, 0xFF, 0xFF); // 1 331 RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 26 : 27), 0xFF, 0xFF, 0xFF); // 1
449 RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 27 : 26), 0x00, 0xFF, 0x00); // 2 332 RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 27 : 26), 0x00, 0xFF, 0x00); // 2
450 RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x7A, 0x00, 0xFF); // 3 333 RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x7A, 0x00, 0xFF); // 3
451 } 334 }
452 335
453# if defined(RGBLIGHT_ENABLE) 336# if defined(RGBLIGHT_ENABLE)
@@ -456,7 +339,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
456 if (userspace_config.rgb_layer_change) 339 if (userspace_config.rgb_layer_change)
457# endif 340# endif
458 { 341 {
459 switch (get_highest_layer(layer_state|default_layer_state)) { 342 switch (get_highest_layer(layer_state | default_layer_state)) {
460 case _GAMEPAD: 343 case _GAMEPAD:
461 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 344 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
462 break; 345 break;
@@ -472,29 +355,17 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
472 case _ADJUST: 355 case _ADJUST:
473 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 356 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
474 break; 357 break;
475 case _QWERTY: 358 case _DEFAULT_LAYER_1:
476 rgb_matrix_layer_helper(HSV_CYAN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 359 rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
477 break; 360 break;
478 case _COLEMAK: 361 case _DEFAULT_LAYER_2:
479 rgb_matrix_layer_helper(HSV_MAGENTA, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 362 rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
480 break;
481 case _DVORAK:
482 rgb_matrix_layer_helper(HSV_SPRINGGREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
483 break;
484 case _WORKMAN:
485 rgb_matrix_layer_helper(HSV_GOLDENROD, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
486 break;
487 case _NORMAN:
488 rgb_matrix_layer_helper(HSV_CORAL, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
489 break;
490 case _MALTRON:
491 rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
492 break; 363 break;
493 case _EUCALYN: 364 case _DEFAULT_LAYER_3:
494 rgb_matrix_layer_helper(HSV_PINK, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 365 rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
495 break; 366 break;
496 case _CARPLAX: 367 case _DEFAULT_LAYER_4:
497 rgb_matrix_layer_helper(HSV_BLUE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 368 rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
498 break; 369 break;
499 } 370 }
500 } 371 }
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 1384221b5..9ef2317f4 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -16,7 +16,6 @@
16 16
17#include "drashna.h" 17#include "drashna.h"
18 18
19
20#ifdef BACKLIGHT_ENABLE 19#ifdef BACKLIGHT_ENABLE
21enum planck_keycodes { 20enum planck_keycodes {
22 BACKLIT = NEW_SAFE_RANGE, 21 BACKLIT = NEW_SAFE_RANGE,
@@ -62,58 +61,32 @@ enum planck_keycodes {
62 KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \ 61 KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \
63 BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ 62 BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
64 ) 63 )
65#define LAYOUT_ortho_4x12_base_wrapper(...) LAYOUT_ortho_4x12_base(__VA_ARGS__) 64#define LAYOUT_base_wrapper(...) LAYOUT_ortho_4x12_base(__VA_ARGS__)
66 65
67 66
68const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 67const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69 68 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
70 [_QWERTY] = LAYOUT_ortho_4x12_base_wrapper( 69 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
71 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 70 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
72 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 71 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
73 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 72 ),
74 ), 73
75 74 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
76 [_COLEMAK] = LAYOUT_ortho_4x12_base_wrapper( 75 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
77 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 76 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
78 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 77 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
79 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 78 ),
80 ), 79 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
81 80 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
82 [_DVORAK] = LAYOUT_ortho_4x12_base_wrapper( 81 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
83 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 82 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
84 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 83 ),
85 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 84
86 ), 85 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
87 86 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
88 [_WORKMAN] = LAYOUT_ortho_4x12_base_wrapper( 87 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
89 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, 88 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
90 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, 89 ),
91 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
92 ),
93
94 [_NORMAN] = LAYOUT_ortho_4x12_base_wrapper(
95 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
96 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
97 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
98 ),
99
100 [_MALTRON] = LAYOUT_ortho_4x12_base_wrapper(
101 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
102 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
103 _________________MALTRON_L3________________, _________________MALTRON_R3________________
104 ),
105
106 [_EUCALYN] = LAYOUT_ortho_4x12_base_wrapper(
107 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
108 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
109 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
110 ),
111
112 [_CARPLAX] = LAYOUT_ortho_4x12_base_wrapper(
113 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
114 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
115 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
116 ),
117 90
118 [_LOWER] = LAYOUT_ortho_4x12_wrapper( 91 [_LOWER] = LAYOUT_ortho_4x12_wrapper(
119 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, 92 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
@@ -137,6 +110,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
137 ) 110 )
138 111
139}; 112};
113
114#ifdef ENCODER_MAP_ENABLE
115const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
116 [_DEFAULT_LAYER_1] = { { KC_DOWN, KC_UP } },
117 [_DEFAULT_LAYER_2] = { { _______, _______ } },
118 [_DEFAULT_LAYER_3] = { { _______, _______ } },
119 [_DEFAULT_LAYER_4] = { { _______, _______ } },
120 [_GAMEPAD] = { { _______, _______ } },
121 [_DIABLO] = { { _______, _______ } },
122 [_MOUSE] = { { KC_WH_D, KC_WH_U } },
123 [_MEDIA] = { { _______, _______ } },
124 [_RAISE] = { { KC_VOLD, KC_VOLU } },
125 [_LOWER] = { { RGB_MOD, RGB_RMOD} },
126 [_ADJUST] = { { CK_DOWN, CK_UP } },
127};
128#endif
140// clang-format on 129// clang-format on
141 130
142bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 131bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
@@ -222,7 +211,6 @@ void suspend_wakeup_init_keymap(void) {
222} 211}
223// clang-format on 212// clang-format on
224 213
225
226void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { 214void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
227 uint8_t this_mod = get_mods(); 215 uint8_t this_mod = get_mods();
228 uint8_t this_led = host_keyboard_leds(); 216 uint8_t this_led = host_keyboard_leds();
@@ -254,49 +242,38 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
254 case _ADJUST: 242 case _ADJUST:
255 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 243 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
256 break; 244 break;
257 default: { 245 default:
258 switch (get_highest_layer(default_layer_state)) { 246 {
259 case _QWERTY: 247 switch (get_highest_layer(default_layer_state)) {
260 rgb_matrix_layer_helper(HSV_CYAN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 248 case _DEFAULT_LAYER_1:
261 break; 249 rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
262 case _COLEMAK: 250 break;
263 rgb_matrix_layer_helper(HSV_MAGENTA, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 251 case _DEFAULT_LAYER_2:
264 break; 252 rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
265 case _DVORAK: 253 break;
266 rgb_matrix_layer_helper(HSV_SPRINGGREEN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 254 case _DEFAULT_LAYER_3:
267 break; 255 rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
268 case _WORKMAN: 256 break;
269 rgb_matrix_layer_helper(HSV_GOLDENROD, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 257 case _DEFAULT_LAYER_4:
270 break; 258 rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
271 case _NORMAN: 259 break;
272 rgb_matrix_layer_helper(HSV_CORAL, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 260 }
273 break; 261 break;
274 case _MALTRON:
275 rgb_matrix_layer_helper(HSV_YELLOW, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
276 break;
277 case _EUCALYN:
278 rgb_matrix_layer_helper(HSV_PINK, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
279 break;
280 case _CARPLAX:
281 rgb_matrix_layer_helper(HSV_BLUE, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
282 break;
283 } 262 }
284 break;
285 }
286 } 263 }
287 } 264 }
288 265
289 switch (get_highest_layer(default_layer_state)) { 266 switch (get_highest_layer(default_layer_state)) {
290 case _QWERTY: 267 case _DEFAULT_LAYER_1:
291 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0x00, 0xFF, 0xFF); 268 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0x00, 0xFF, 0xFF);
292 break; 269 break;
293 case _COLEMAK: 270 case _DEFAULT_LAYER_2:
294 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0xFF, 0x00, 0xFF); 271 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0xFF, 0x00, 0xFF);
295 break; 272 break;
296 case _DVORAK: 273 case _DEFAULT_LAYER_3:
297 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0x00, 0xFF, 0x00); 274 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0x00, 0xFF, 0x00);
298 break; 275 break;
299 case _WORKMAN: 276 case _DEFAULT_LAYER_4:
300 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0xD9, 0xA5, 0x21); 277 RGB_MATRIX_INDICATOR_SET_COLOR((is_ez ? 41 : 42), 0xD9, 0xA5, 0x21);
301 break; 278 break;
302 } 279 }
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index 06a250ee7..e78d073ae 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -22,6 +22,7 @@ else
22 RGB_MATRIX_ENABLE = no 22 RGB_MATRIX_ENABLE = no
23 AUDIO_ENABLE = yes 23 AUDIO_ENABLE = yes
24 EEPROM_DRIVER = i2c 24 EEPROM_DRIVER = i2c
25 ENCODER_MAP_ENABLE = yes
25endif 26endif
26ifeq ($(strip $(KEYBOARD)), planck/light) 27ifeq ($(strip $(KEYBOARD)), planck/light)
27 RGB_MATRIX_ENABLE = yes 28 RGB_MATRIX_ENABLE = yes
@@ -31,13 +32,14 @@ ifeq ($(strip $(KEYBOARD)), planck/light)
31 # HAPTIC_ENABLE += SOLENOID 32 # HAPTIC_ENABLE += SOLENOID
32endif 33endif
33ifeq ($(strip $(KEYBOARD)), planck/ez) 34ifeq ($(strip $(KEYBOARD)), planck/ez)
34 RGBLIGHT_ENABLE = no 35 RGBLIGHT_ENABLE = no
35 ENCODER_ENABLE = yes 36 ENCODER_ENABLE = yes
36 RGB_MATRIX_ENABLE = yes 37 ENCODER_MAP_ENABLE = yes
38 RGB_MATRIX_ENABLE = yes
37 INDICATOR_LIGHTS = yes 39 INDICATOR_LIGHTS = yes
38 RGBLIGHT_TWINKLE = yes 40 RGBLIGHT_TWINKLE = yes
39 RGBLIGHT_STARTUP_ANIMATION = yes 41 RGBLIGHT_STARTUP_ANIMATION = yes
40 CONSOLE_ENABLE = yes 42 CONSOLE_ENABLE = yes
41 COMMAND_ENABLE = yes 43 COMMAND_ENABLE = yes
42 AUDIO_ENABLE = yes 44 AUDIO_ENABLE = yes
43endif 45endif
diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c
index f882ead17..01b06d627 100644
--- a/layouts/community/ortho_5x12/drashna/keymap.c
+++ b/layouts/community/ortho_5x12/drashna/keymap.c
@@ -38,34 +38,32 @@
38 KC_NO, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ 38 KC_NO, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
39 ) 39 )
40 40
41#define LAYOUT_ortho_5x12_base_wrapper(...) LAYOUT_ortho_5x12_base(__VA_ARGS__) 41#define LAYOUT_base_wrapper(...) LAYOUT_ortho_5x12_base(__VA_ARGS__)
42 42
43 43
44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
49 ),
45 50
46[_QWERTY] = LAYOUT_ortho_5x12_base_wrapper( 51 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
47 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 52 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
48 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 53 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
49 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 54 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
50), 55 ),
51 56 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
52[_COLEMAK] = LAYOUT_ortho_5x12_base_wrapper( 57 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
53 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 58 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
54 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 59 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
55 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 60 ),
56),
57 61
58[_DVORAK] = LAYOUT_ortho_5x12_base_wrapper( 62 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
59 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 63 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
60 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 64 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
61 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 65 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
62), 66 ),
63
64[_WORKMAN] = LAYOUT_ortho_5x12_base_wrapper(
65 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
66 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
67 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
68),
69 67
70/* Lower 68/* Lower
71 * ,-----------------------------------------------------------------------------------. 69 * ,-----------------------------------------------------------------------------------.
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index 4a094e195..b86448c67 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -50,11 +50,13 @@
50# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended 50# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
51// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) 51// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
52// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) 52// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
53# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 53# ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS
54# define RGB_MATRIX_HUE_STEP 8 54# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
55# define RGB_MATRIX_SAT_STEP 8 55# endif
56# define RGB_MATRIX_VAL_STEP 5 56# define RGB_MATRIX_HUE_STEP 8
57# define RGB_MATRIX_SPD_STEP 10 57# define RGB_MATRIX_SAT_STEP 8
58# define RGB_MATRIX_VAL_STEP 5
59# define RGB_MATRIX_SPD_STEP 10
58#endif 60#endif
59 61
60#ifdef CONVERT_TO_PROTON_C 62#ifdef CONVERT_TO_PROTON_C
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index e46b626ef..0840fc262 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -39,56 +39,32 @@ enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE };
39 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ 39 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
40 RGB_MOD, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \ 40 RGB_MOD, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \
41 ) 41 )
42#define LAYOUT_split_3x6_3_base_wrapper(...) LAYOUT_split_3x6_3_base(__VA_ARGS__) 42#define LAYOUT_base_wrapper(...) LAYOUT_split_3x6_3_base(__VA_ARGS__)
43 43
44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45 [_QWERTY] = LAYOUT_split_3x6_3_base_wrapper( 45 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
49 ), 49 ),
50 50
51 [_COLEMAK] = LAYOUT_split_3x6_3_base_wrapper( 51 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
52 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 52 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
53 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 53 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
54 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 54 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
55 ), 55 ),
56 56
57 [_DVORAK] = LAYOUT_split_3x6_3_base_wrapper( 57 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
58 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 58 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
59 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 59 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
60 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 60 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
61 ), 61 ),
62 62
63 [_WORKMAN] = LAYOUT_split_3x6_3_base_wrapper( 63 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
64 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, 64 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
65 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, 65 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
66 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________ 66 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
67 ), 67 ),
68
69 [_NORMAN] = LAYOUT_split_3x6_3_base_wrapper(
70 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
71 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
72 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
73 ),
74
75 [_MALTRON] = LAYOUT_split_3x6_3_base_wrapper(
76 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
77 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
78 _________________MALTRON_L3________________, _________________MALTRON_R3________________
79 ),
80
81 [_EUCALYN] = LAYOUT_split_3x6_3_base_wrapper(
82 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
83 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
84 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
85 ),
86
87 [_CARPLAX] = LAYOUT_split_3x6_3_base_wrapper(
88 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
89 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
90 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
91 ),
92 68
93 [_LOWER] = LAYOUT_split_3x6_3_wrapper( 69 [_LOWER] = LAYOUT_split_3x6_3_wrapper(
94 KC_F11, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11, 70 KC_F11, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11,
@@ -114,9 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
114// clang-format on 90// clang-format on
115 91
116#ifdef OLED_DRIVER_ENABLE 92#ifdef OLED_DRIVER_ENABLE
117oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { 93oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_270; }
118 return OLED_ROTATION_270;
119}
120#endif 94#endif
121 95
122#ifdef TAPPING_TERM_PER_KEY 96#ifdef TAPPING_TERM_PER_KEY
@@ -130,7 +104,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
130} 104}
131#endif 105#endif
132 106
133
134void matrix_slave_scan_user(void) { 107void matrix_slave_scan_user(void) {
135#ifdef RGB_MATRIX_ENABLE 108#ifdef RGB_MATRIX_ENABLE
136 rgb_matrix_task(); 109 rgb_matrix_task();
@@ -145,28 +118,16 @@ void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); }
145void check_default_layer(uint8_t mode, uint8_t type, uint8_t led_min, uint8_t led_max) { 118void check_default_layer(uint8_t mode, uint8_t type, uint8_t led_min, uint8_t led_max) {
146 switch (get_highest_layer(default_layer_state)) { 119 switch (get_highest_layer(default_layer_state)) {
147 case _QWERTY: 120 case _QWERTY:
148 rgb_matrix_layer_helper(HSV_CYAN, mode, rgb_matrix_config.speed, type, led_min, led_max); 121 rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, mode, rgb_matrix_config.speed, type, led_min, led_max);
122 break;
123 case _COLEMAK_DH:
124 rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, mode, rgb_matrix_config.speed, type, led_min, led_max);
149 break; 125 break;
150 case _COLEMAK: 126 case _COLEMAK:
151 rgb_matrix_layer_helper(HSV_MAGENTA, mode, rgb_matrix_config.speed, type, led_min, led_max); 127 rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, mode, rgb_matrix_config.speed, type, led_min, led_max);
152 break; 128 break;
153 case _DVORAK: 129 case _DVORAK:
154 rgb_matrix_layer_helper(HSV_SPRINGGREEN, mode, rgb_matrix_config.speed, type, led_min, led_max); 130 rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, mode, rgb_matrix_config.speed, type, led_min, led_max);
155 break;
156 case _WORKMAN:
157 rgb_matrix_layer_helper(HSV_GOLDENROD, mode, rgb_matrix_config.speed, type, led_min, led_max);
158 break;
159 case _NORMAN:
160 rgb_matrix_layer_helper(HSV_CORAL, mode, rgb_matrix_config.speed, type, led_min, led_max);
161 break;
162 case _MALTRON:
163 rgb_matrix_layer_helper(HSV_YELLOW, mode, rgb_matrix_config.speed, type, led_min, led_max);
164 break;
165 case _EUCALYN:
166 rgb_matrix_layer_helper(HSV_PINK, mode, rgb_matrix_config.speed, type, led_min, led_max);
167 break;
168 case _CARPLAX:
169 rgb_matrix_layer_helper(HSV_BLUE, mode, rgb_matrix_config.speed, type, led_min, led_max);
170 break; 131 break;
171 } 132 }
172} 133}
@@ -189,10 +150,11 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
189 case _ADJUST: 150 case _ADJUST:
190 rgb_matrix_layer_helper(HSV_RED, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW, led_min, led_max); 151 rgb_matrix_layer_helper(HSV_RED, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW, led_min, led_max);
191 break; 152 break;
192 default: { 153 default:
193 check_default_layer(0, LED_FLAG_UNDERGLOW, led_min, led_max); 154 {
194 break; 155 check_default_layer(0, LED_FLAG_UNDERGLOW, led_min, led_max);
195 } 156 break;
157 }
196 } 158 }
197 check_default_layer(0, LED_FLAG_MODIFIER, led_min, led_max); 159 check_default_layer(0, LED_FLAG_MODIFIER, led_min, led_max);
198 } 160 }
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-29 20:57:03 +0000