aboutsummaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ergodox/drashna/keymap.c129
-rw-r--r--layouts/community/ergodox/drashna/rules.mk2
-rw-r--r--layouts/community/ergodox/drashna_glow/config.h22
-rw-r--r--layouts/community/ergodox/drashna_glow/rules.mk2
-rw-r--r--layouts/community/numpad_5x6/drashna/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/drashna/config.h63
-rw-r--r--layouts/community/ortho_4x12/drashna/keymap.c180
-rw-r--r--layouts/community/ortho_4x12/drashna/rules.mk2
-rw-r--r--layouts/community/ortho_5x12/drashna/config.h31
-rw-r--r--layouts/community/ortho_5x12/drashna/keymap.c20
-rw-r--r--layouts/community/ortho_5x12/drashna/rules.mk2
11 files changed, 225 insertions, 230 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 74382f175..763b218f7 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -18,21 +18,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#include "drashna.h" 18#include "drashna.h"
19 19
20#ifdef UNICODEMAP_ENABLE 20#ifdef UNICODEMAP_ENABLE
21#include "drashna_unicode.h" 21# include "drashna_unicode.h"
22#endif // UNICODEMAP_ENABLE 22#endif // UNICODEMAP_ENABLE
23#ifndef UNICODE_ENABLE 23#ifndef UNICODE_ENABLE
24# define UC(x) KC_NO 24# define UC(x) KC_NO
25#endif 25#endif
26 26
27extern userspace_config_t userspace_config; 27extern userspace_config_t userspace_config;
28 28
29enum more_custom_keycodes { 29enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE };
30 KC_SWAP_NUM = NEW_SAFE_RANGE
31};
32 30
33//define layer change stuff for underglow indicator 31// define layer change stuff for underglow indicator
34bool skip_leds = false; 32bool skip_leds = false;
35 33
34// clang-format off
36#define LAYOUT_ergodox_pretty_base( \ 35#define LAYOUT_ergodox_pretty_base( \
37 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ 36 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
38 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ 37 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@@ -301,9 +300,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
301 ), 300 ),
302 301
303}; 302};
303// clang-format on
304 304
305bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 305bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
306
307 switch (keycode) { 306 switch (keycode) {
308 case KC_1: 307 case KC_1:
309 if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) { 308 if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
@@ -332,7 +331,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
332 } 331 }
333 break; 332 break;
334 } 333 }
335 //switch (keycode) { 334 // switch (keycode) {
336 // case KC_P00: 335 // case KC_P00:
337 // if (!record->event.pressed) { 336 // if (!record->event.pressed) {
338 // register_code(KC_KP_0); 337 // register_code(KC_KP_0);
@@ -347,9 +346,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
347} 346}
348 347
349void matrix_scan_keymap(void) { // runs frequently to update info 348void matrix_scan_keymap(void) { // runs frequently to update info
350 uint8_t modifiers = get_mods(); 349 uint8_t modifiers = get_mods();
351 uint8_t led_usb_state = host_keyboard_leds(); 350 uint8_t led_usb_state = host_keyboard_leds();
352 uint8_t one_shot = get_oneshot_mods(); 351 uint8_t one_shot = get_oneshot_mods();
353 352
354 if (!skip_leds) { 353 if (!skip_leds) {
355 ergodox_board_led_off(); 354 ergodox_board_led_off();
@@ -360,24 +359,21 @@ void matrix_scan_keymap(void) { // runs frequently to update info
360 // Since we're not using the LEDs here for layer indication anymore, 359 // Since we're not using the LEDs here for layer indication anymore,
361 // then lets use them for modifier indicators. Shame we don't have 4... 360 // then lets use them for modifier indicators. Shame we don't have 4...
362 // Also, no "else", since we want to know each, independently. 361 // Also, no "else", since we want to know each, independently.
363 if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) ) { 362 if ((modifiers | one_shot) & MOD_MASK_SHIFT || led_usb_state & (1 << USB_LED_CAPS_LOCK)) {
364 ergodox_right_led_2_on(); 363 ergodox_right_led_2_on();
365 ergodox_right_led_2_set( 50 ); 364 ergodox_right_led_2_set(50);
366 } 365 }
367 if ( ( modifiers | one_shot ) & MOD_MASK_CTRL) { 366 if ((modifiers | one_shot) & MOD_MASK_CTRL) {
368 ergodox_right_led_1_on(); 367 ergodox_right_led_1_on();
369 ergodox_right_led_1_set( 10 ); 368 ergodox_right_led_1_set(10);
370 } 369 }
371 if ( ( modifiers | one_shot ) & MOD_MASK_ALT) { 370 if ((modifiers | one_shot) & MOD_MASK_ALT) {
372 ergodox_right_led_3_on(); 371 ergodox_right_led_3_on();
373 ergodox_right_led_3_set( 10 ); 372 ergodox_right_led_3_set(10);
374 } 373 }
375
376 } 374 }
377
378} 375}
379 376
380
381bool indicator_is_this_led_used_keyboard(uint8_t index) { 377bool indicator_is_this_led_used_keyboard(uint8_t index) {
382 switch (index) { 378 switch (index) {
383 case 13 ... 14: 379 case 13 ... 14:
@@ -388,76 +384,83 @@ bool indicator_is_this_led_used_keyboard(uint8_t index) {
388 } 384 }
389} 385}
390 386
391
392#ifdef RGB_MATRIX_ENABLE 387#ifdef RGB_MATRIX_ENABLE
393 388
394void suspend_power_down_keymap(void) { 389void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); }
395 rgb_matrix_set_suspend_state(true);
396}
397 390
398void suspend_wakeup_init_keymap(void) { 391void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); }
399 rgb_matrix_set_suspend_state(false);
400}
401 392
402void rgb_matrix_indicators_user(void) { 393void rgb_matrix_indicators_user(void) {
403 if ( userspace_config.rgb_layer_change && 394 if (userspace_config.rgb_layer_change &&
404#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED 395# ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
405 !g_suspend_state && 396 !g_suspend_state &&
406#endif 397# endif
407#if defined(RGBLIGHT_ENABLE) 398# if defined(RGBLIGHT_ENABLE)
408 (!rgblight_config.enable && rgb_matrix_config.enable) 399 (!rgblight_config.enable && rgb_matrix_config.enable)
409#else 400# else
410 rgb_matrix_config.enable 401 rgb_matrix_config.enable
411#endif 402# endif
412 ) { 403 ) {
413 switch (biton32(layer_state)) { 404 switch (biton32(layer_state)) {
414 case _MODS:
415 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_MODIFIER); break;
416 case _GAMEPAD: 405 case _GAMEPAD:
417 rgb_matrix_layer_helper(0xFF, 0x80, 0x00, LED_FLAG_MODIFIER); 406 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
418 rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q 407 rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
419 rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W 408 rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
420 rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E 409 rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
421 rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R 410 rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
422 rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A 411 rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
423 rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S 412 rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
424 rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D 413 rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
425 rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F 414 rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
426 415
427 rgb_matrix_set_color(userspace_config.swapped_numbers ? 27 : 26, 0xFF, 0xFF, 0xFF); // 1 416 rgb_matrix_set_color(userspace_config.swapped_numbers ? 27 : 26, 0xFF, 0xFF, 0xFF); // 1
428 rgb_matrix_set_color(userspace_config.swapped_numbers ? 26 : 27, 0x00, 0xFF, 0x00); // 2 417 rgb_matrix_set_color(userspace_config.swapped_numbers ? 26 : 27, 0x00, 0xFF, 0x00); // 2
429 rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3 418 rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
430
431 break; 419 break;
432 case _DIABLO: 420 case _DIABLO:
433 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, LED_FLAG_MODIFIER); break; 421 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER);
422 break;
434 case _RAISE: 423 case _RAISE:
435 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 424 rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
425 break;
436 case _LOWER: 426 case _LOWER:
437 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 427 rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
428 break;
438 case _ADJUST: 429 case _ADJUST:
439 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, LED_FLAG_MODIFIER); break; 430 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
440 default: 431 break;
432 default: {
433 bool mods_enabled = IS_LAYER_ON(_MODS);
441 switch (biton32(default_layer_state)) { 434 switch (biton32(default_layer_state)) {
442 case _QWERTY: 435 case _QWERTY:
443 rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, LED_FLAG_MODIFIER); break; 436 rgb_matrix_layer_helper(HSV_CYAN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
437 break;
444 case _COLEMAK: 438 case _COLEMAK:
445 rgb_matrix_layer_helper(0xFF, 0x00, 0xFF, LED_FLAG_MODIFIER); break; 439 rgb_matrix_layer_helper(HSV_MAGENTA, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
440 break;
446 case _DVORAK: 441 case _DVORAK:
447 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 442 rgb_matrix_layer_helper(HSV_SPRINGGREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
443 break;
448 case _WORKMAN: 444 case _WORKMAN:
449 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, LED_FLAG_MODIFIER); break; 445 rgb_matrix_layer_helper(HSV_GOLDENROD, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
446 break;
450 case _NORMAN: 447 case _NORMAN:
451 rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D, LED_FLAG_MODIFIER); break; 448 rgb_matrix_layer_helper(HSV_CORAL, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
449 break;
452 case _MALTRON: 450 case _MALTRON:
453 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 451 rgb_matrix_layer_helper(HSV_YELLOW, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
452 break;
454 case _EUCALYN: 453 case _EUCALYN:
455 rgb_matrix_layer_helper(0xFF, 0x80, 0xBF, LED_FLAG_MODIFIER); break; 454 rgb_matrix_layer_helper(HSV_PINK, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
455 break;
456 case _CARPLAX: 456 case _CARPLAX:
457 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, LED_FLAG_MODIFIER); break; 457 rgb_matrix_layer_helper(HSV_BLUE, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
458 break;
458 } 459 }
460 break;
461 }
459 } 462 }
460 } 463 }
461} 464}
462 465
463#endif //RGB_MATRIX_INIT 466#endif // RGB_MATRIX_INIT
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index f0628d9da..f3cd55ea8 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -17,4 +17,4 @@ RGBLIGHT_TWINKLE = no
17INDICATOR_LIGHTS = no 17INDICATOR_LIGHTS = no
18RGBLIGHT_STARTUP_ANIMATION = yes 18RGBLIGHT_STARTUP_ANIMATION = yes
19 19
20DEBOUNCE_TYPE = eager_pk 20DEBOUNCE_TYPE = eager_pr
diff --git a/layouts/community/ergodox/drashna_glow/config.h b/layouts/community/ergodox/drashna_glow/config.h
index e6c8223e9..28bed20e0 100644
--- a/layouts/community/ergodox/drashna_glow/config.h
+++ b/layouts/community/ergodox/drashna_glow/config.h
@@ -4,25 +4,3 @@
4 4
5#undef PRODUCT 5#undef PRODUCT
6#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Glow 6#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Glow
7
8#ifdef RGB_MATRIX_ENABLE
9# define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
10// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
11// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
12# define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
13// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
14// #define EECONFIG_RGB_MATRIX (uint32_t *)16
15
16# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
17# define DISABLE_RGB_MATRIX_CYCLE_ALL
18# define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
19# define DISABLE_RGB_MATRIX_DUAL_BEACON
20# define DISABLE_RGB_MATRIX_RAINBOW_BEACON
21# define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
22# define DISABLE_RGB_MATRIX_DIGITAL_RAIN
23# define DISABLE_RGB_MATRIX_SOLID_REACTIVE
24# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
25# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
26# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
27
28#endif
diff --git a/layouts/community/ergodox/drashna_glow/rules.mk b/layouts/community/ergodox/drashna_glow/rules.mk
index ae9a2fb16..e1da86443 100644
--- a/layouts/community/ergodox/drashna_glow/rules.mk
+++ b/layouts/community/ergodox/drashna_glow/rules.mk
@@ -9,5 +9,5 @@ SRC += $(CORRECTED_LAYOUT)/keymap.c
9ifneq (,$(findstring ergodox_ez,$(KEYBOARD))) 9ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
10 RGBLIGHT_ENABLE = no 10 RGBLIGHT_ENABLE = no
11 RGB_MATRIX_ENABLE = yes 11 RGB_MATRIX_ENABLE = yes
12 TAP_DANCE_ENABLE = no 12# TAP_DANCE_ENABLE = no
13endif 13endif
diff --git a/layouts/community/numpad_5x6/drashna/keymap.c b/layouts/community/numpad_5x6/drashna/keymap.c
index 646f4db33..81710221d 100644
--- a/layouts/community/numpad_5x6/drashna/keymap.c
+++ b/layouts/community/numpad_5x6/drashna/keymap.c
@@ -3,6 +3,7 @@
3 3
4#define F2_MCRO LT(_GAMEPAD, KC_F2) 4#define F2_MCRO LT(_GAMEPAD, KC_F2)
5 5
6// clang-format off
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 [_NUMLOCK] = LAYOUT_numpad_5x6( 8 [_NUMLOCK] = LAYOUT_numpad_5x6(
8 KC_F1, F2_MCRO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 9 KC_F1, F2_MCRO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
@@ -20,3 +21,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 RGB_VAI, RGB_VAD, _______, _______, _______ 21 RGB_VAI, RGB_VAD, _______, _______, _______
21 ), 22 ),
22}; 23};
24// clang-format on
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 475afd213..30db12965 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -1,53 +1,48 @@
1#pragma once 1#pragma once
2 2
3
4#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) 3#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
5# define RGB_DI_PIN B3 4# define RGB_DI_PIN B3
6# define RGBLED_NUM 13 // Number of LEDs 5# define RGBLED_NUM 13 // Number of LEDs
7# define RGBLIGHT_ANIMATIONS 6# define RGBLIGHT_ANIMATIONS
8# define RGBLIGHT_HUE_STEP 12 7# define RGBLIGHT_HUE_STEP 12
9# define RGBLIGHT_SAT_STEP 12 8# define RGBLIGHT_SAT_STEP 12
10# define RGBLIGHT_VAL_STEP 12 9# define RGBLIGHT_VAL_STEP 12
11# define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 10# define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
12# define RGBLIGHT_EFFECT_SNAKE_LENGTH 2 11# define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
13# ifdef RGB_MATRIX_ENABLE 12# ifdef RGB_MATRIX_ENABLE
14# define RGBLIGHT_DISABLE_KEYCODES 13# define RGBLIGHT_DISABLE_KEYCODES
15# endif 14# endif
16#endif // RGBLIGHT_ENABLE 15#endif // RGBLIGHT_ENABLE
17 16
18#ifdef RGB_MATRIX_ENABLE 17#ifdef RGB_MATRIX_ENABLE
19# define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot) 18# define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
20// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened) 19// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
21// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 20// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
22// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 21// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
23# define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended 22# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
24# ifndef KEYBOARD_planck_ez
25# define EECONFIG_RGB_MATRIX (uint32_t *)15
26# endif
27#endif 23#endif
28 24
29#if defined(KEYBOARD_lets_split_rev2) 25#if defined(KEYBOARD_lets_split_rev2)
30# define USE_SERIAL 26# define USE_SERIAL
31# undef USE_I2C 27# undef USE_I2C
32# define EE_HANDS 28# define EE_HANDS
33#endif 29#endif
34 30
35#if !defined(KEYBOARD_planck_light) 31#if !defined(KEYBOARD_planck_light)
36# ifdef RGBLIGHT_ENABLE 32# ifdef RGBLIGHT_ENABLE
37# define NO_MUSIC_MODE 33# define NO_MUSIC_MODE
38# endif // RGBLIGHT_ENABLE 34# endif // RGBLIGHT_ENABLE
39#endif // KEYBOARD_planck_light 35#endif // KEYBOARD_planck_light
40
41 36
42#if defined(KEYBOARD_planck) 37#if defined(KEYBOARD_planck)
43# undef PRODUCT 38# undef PRODUCT
44# if defined(KEYBOARD_planck_light) 39# if defined(KEYBOARD_planck_light)
45# define PRODUCT Drashna Hacked RGB Beacon (Planck Light) 40# define PRODUCT Drashna Hacked RGB Beacon(Planck Light)
46# elif defined(KEYBOARD_planck_rev6) 41# elif defined(KEYBOARD_planck_rev6)
47# define PRODUCT Drashna Hacked Planck Rev6 42# define PRODUCT Drashna Hacked Planck Rev6
48# elif defined(KEYBOARD_planck_EZ) 43# elif defined(KEYBOARD_planck_ez)
49# define PRODUCT Drashna Hacked Planck EZ 44# define PRODUCT Drashna Hacked Planck EZ
50# endif 45# endif
51#endif 46#endif
52 47
53/* 48/*
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index c1c016ce9..3e26b93fc 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -21,27 +21,27 @@
21extern rgblight_config_t rgblight_config; 21extern rgblight_config_t rgblight_config;
22#endif 22#endif
23 23
24
25#ifdef BACKLIGHT_ENABLE 24#ifdef BACKLIGHT_ENABLE
26enum planck_keycodes { 25enum planck_keycodes {
27 BACKLIT = NEW_SAFE_RANGE, 26 BACKLIT = NEW_SAFE_RANGE,
28}; 27};
29#else 28#else
30 #define BACKLIT OSM(MOD_LSFT) 29# define BACKLIT OSM(MOD_LSFT)
31#endif 30#endif
32 31
33#ifdef KEYBOARD_planck_ez 32#ifdef KEYBOARD_planck_ez
34# define PLNK_1 BK_LWER 33# define PLNK_1 BK_LWER
35# define PLNK_2 SP_LWER 34# define PLNK_2 SP_LWER
36# define PLNK_3 KC_NO 35# define PLNK_3 KC_NO
37# define PLNK_4 ET_RAIS 36# define PLNK_4 ET_RAIS
38#else 37#else
39# define PLNK_1 SP_LWER 38# define PLNK_1 SP_LWER
40# define PLNK_2 BK_LWER 39# define PLNK_2 BK_LWER
41# define PLNK_3 DL_RAIS 40# define PLNK_3 DL_RAIS
42# define PLNK_4 ET_RAIS 41# define PLNK_4 ET_RAIS
43#endif 42#endif
44 43
44// clang-format off
45#define LAYOUT_ortho_4x12_base( \ 45#define LAYOUT_ortho_4x12_base( \
46 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ 46 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
47 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ 47 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@@ -135,17 +135,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
135 ) 135 )
136 136
137}; 137};
138 138// clang-format on
139 139
140bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 140bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
141 switch (keycode) { 141 switch (keycode) {
142 #ifdef BACKLIGHT_ENABLE 142#ifdef BACKLIGHT_ENABLE
143 case BACKLIT: 143 case BACKLIT:
144 if (record->event.pressed) { 144 if (record->event.pressed) {
145 register_code(KC_RSFT); 145 register_code(KC_RSFT);
146 #ifdef BACKLIGHT_ENABLE 146# ifdef BACKLIGHT_ENABLE
147 backlight_step(); 147 backlight_step();
148 #endif 148# endif
149 } else { 149 } else {
150 unregister_code(KC_RSFT); 150 unregister_code(KC_RSFT);
151 } 151 }
@@ -172,6 +172,7 @@ bool music_mask_user(uint16_t keycode) {
172 172
173#ifdef RGB_MATRIX_ENABLE 173#ifdef RGB_MATRIX_ENABLE
174 174
175// clang-format off
175void suspend_power_down_keymap(void) { 176void suspend_power_down_keymap(void) {
176 rgb_matrix_set_suspend_state(true); 177 rgb_matrix_set_suspend_state(true);
177} 178}
@@ -179,98 +180,122 @@ void suspend_power_down_keymap(void) {
179void suspend_wakeup_init_keymap(void) { 180void suspend_wakeup_init_keymap(void) {
180 rgb_matrix_set_suspend_state(false); 181 rgb_matrix_set_suspend_state(false);
181} 182}
183// clang-format on
182 184
183void rgb_matrix_indicators_user(void) { 185void rgb_matrix_indicators_user(void) {
184 uint8_t this_mod = get_mods(); 186 uint8_t this_mod = get_mods();
185 uint8_t this_led = host_keyboard_leds(); 187 uint8_t this_led = host_keyboard_leds();
186 uint8_t this_osm = get_oneshot_mods(); 188 uint8_t this_osm = get_oneshot_mods();
187 bool is_ez; 189 bool is_ez;
188 #ifdef KEYBOARD_planck_ez 190# ifdef KEYBOARD_planck_ez
189 is_ez = true; 191 is_ez = true;
190 #endif 192# endif
191 193
192 if ( userspace_config.rgb_layer_change && 194 if (userspace_config.rgb_layer_change &&
193#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED 195# ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
194 !g_suspend_state && 196 !g_suspend_state &&
195#endif 197# endif
196#if defined(RGBLIGHT_ENABLE) 198# if defined(RGBLIGHT_ENABLE)
197 (!rgblight_config.enable && rgb_matrix_config.enable) 199 (!rgblight_config.enable && rgb_matrix_config.enable)
198#else 200# else
199 rgb_matrix_config.enable 201 rgb_matrix_config.enable
200#endif 202# endif
201 ) { 203 ) {
202 switch (biton32(layer_state)) { 204 switch (biton32(layer_state)) {
205 case _GAMEPAD:
206 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
207 break;
208 case _DIABLO:
209 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER);
210 break;
203 case _RAISE: 211 case _RAISE:
204 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 212 rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
213 break;
205 case _LOWER: 214 case _LOWER:
206 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 215 rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
216 break;
207 case _ADJUST: 217 case _ADJUST:
208 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, LED_FLAG_MODIFIER); break; 218 rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
209 default: 219 break;
220 default: {
221 bool mods_enabled = IS_LAYER_ON(_MODS);
210 switch (biton32(default_layer_state)) { 222 switch (biton32(default_layer_state)) {
211 case _QWERTY: 223 case _QWERTY:
212 rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, LED_FLAG_MODIFIER); break; 224 rgb_matrix_layer_helper(HSV_CYAN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
213 case _COLEMAK: 225 break;
214 rgb_matrix_layer_helper(0xFF, 0x00, 0xFF, LED_FLAG_MODIFIER); break; 226 case _COLEMAK:
215 case _DVORAK: 227 rgb_matrix_layer_helper(HSV_MAGENTA, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
216 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 228 break;
217 case _WORKMAN: 229 case _DVORAK:
218 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, LED_FLAG_MODIFIER); break; 230 rgb_matrix_layer_helper(HSV_SPRINGGREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
219 case _NORMAN: 231 break;
220 rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D, LED_FLAG_MODIFIER); break; 232 case _WORKMAN:
221 case _MALTRON: 233 rgb_matrix_layer_helper(HSV_GOLDENROD, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
222 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_MODIFIER); break; 234 break;
223 case _EUCALYN: 235 case _NORMAN:
224 rgb_matrix_layer_helper(0xFF, 0x80, 0xBF, LED_FLAG_MODIFIER); break; 236 rgb_matrix_layer_helper(HSV_CORAL, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
225 case _CARPLAX: 237 break;
226 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, LED_FLAG_MODIFIER); break; 238 case _MALTRON:
239 rgb_matrix_layer_helper(HSV_YELLOW, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
240 break;
241 case _EUCALYN:
242 rgb_matrix_layer_helper(HSV_PINK, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
243 break;
244 case _CARPLAX:
245 rgb_matrix_layer_helper(HSV_BLUE, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
246 break;
227 } 247 }
248 break;
249 }
228 } 250 }
229 } 251 }
230 252
231 switch (biton32(default_layer_state)) { 253 switch (biton32(default_layer_state)) {
232 case _QWERTY: 254 case _QWERTY:
233 rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0xFF); break; 255 rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0xFF);
256 break;
234 case _COLEMAK: 257 case _COLEMAK:
235 rgb_matrix_set_color(is_ez ? 41 : 42, 0xFF, 0x00, 0xFF); break; 258 rgb_matrix_set_color(is_ez ? 41 : 42, 0xFF, 0x00, 0xFF);
259 break;
236 case _DVORAK: 260 case _DVORAK:
237 rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0x00); break; 261 rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0x00);
262 break;
238 case _WORKMAN: 263 case _WORKMAN:
239 rgb_matrix_set_color(is_ez ? 41 : 42, 0xD9, 0xA5, 0x21); break; 264 rgb_matrix_set_color(is_ez ? 41 : 42, 0xD9, 0xA5, 0x21);
265 break;
240 } 266 }
241 if ( (this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK)) { 267 if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
242 rgb_matrix_set_color(24, 0x00, 0xFF, 0x00); 268 rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
243 rgb_matrix_set_color(36, 0x00, 0xFF, 0x00); 269 rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
244 } 270 }
245 if ( (this_mod | this_osm) & MOD_MASK_CTRL) { 271 if ((this_mod | this_osm) & MOD_MASK_CTRL) {
246 rgb_matrix_set_color(25, 0xFF, 0x00, 0x00); 272 rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
247 rgb_matrix_set_color(34, 0xFF, 0x00, 0x00); 273 rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
248 rgb_matrix_set_color(37, 0xFF, 0x00, 0x00); 274 rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
249
250 } 275 }
251 if ( (this_mod | this_osm) & MOD_MASK_GUI) { 276 if ((this_mod | this_osm) & MOD_MASK_GUI) {
252 rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00); 277 rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
253 } 278 }
254 if ( (this_mod | this_osm) & MOD_MASK_ALT) { 279 if ((this_mod | this_osm) & MOD_MASK_ALT) {
255 rgb_matrix_set_color(38, 0x00, 0x00, 0xFF); 280 rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
256 } 281 }
257} 282}
258 283
259void matrix_init_keymap(void) { 284void matrix_init_keymap(void) {
260 // rgblight_mode(RGB_MATRIX_MULTISPLASH); 285 // rgblight_mode(RGB_MATRIX_MULTISPLASH);
261} 286}
262#else //RGB_MATRIX_INIT 287#else // RGB_MATRIX_INIT
263 288
264void matrix_init_keymap(void) { 289void matrix_init_keymap(void) {
265#if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck) 290# if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
266 setPinOutput(D5); 291 setPinOutput(D5);
267 writePinHigh(D5); 292 writePinHigh(D5);
268 293
269 setPinOutput(B0); 294 setPinOutput(B0);
270 writePinHigh(B0); 295 writePinHigh(B0);
271#endif 296# endif
272} 297}
273#endif //RGB_MATRIX_INIT 298#endif // RGB_MATRIX_INIT
274 299
275#ifdef ENCODER_ENABLE 300#ifdef ENCODER_ENABLE
276void encoder_update(bool clockwise) { 301void encoder_update(bool clockwise) {
@@ -279,34 +304,42 @@ void encoder_update(bool clockwise) {
279 clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU); 304 clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
280 break; 305 break;
281 case _LOWER: 306 case _LOWER:
282#ifdef RGB_MATRIX_ENABLE 307# ifdef RGB_MATRIX_ENABLE
283 clockwise ? rgb_matrix_step() : rgblight_step_reverse(); 308 clockwise ? rgb_matrix_step() : rgb_matrix_step_reverse();
284#else 309# else
285 clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP); 310 clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
286#endif 311# endif
287 break; 312 break;
288 case _ADJUST: 313 case _ADJUST:
289#ifdef AUDIO_CLICKY 314# ifdef AUDIO_CLICKY
290 clockwise ? clicky_freq_up() : clicky_freq_down(); 315 clockwise ? clicky_freq_up() : clicky_freq_down();
291#endif 316# endif
292 break; 317 break;
293 default: 318 default:
294 clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP); 319 clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP);
295 } 320 }
296#ifdef AUDIO_CLICKY 321# ifdef AUDIO_CLICKY
297 clicky_play(); 322 clicky_play();
298#endif 323# endif
299} 324}
300#endif // ENCODER_ENABLE 325#endif // ENCODER_ENABLE
301 326
302#ifdef KEYBOARD_planck_rev6 327#ifdef KEYBOARD_planck_rev6
303void dip_update(uint8_t index, bool active) { 328void dip_update(uint8_t index, bool active) {
304 switch (index) { 329 switch (index) {
305 case 0: 330 case 0:
306 if(active) { audio_on(); } else { audio_off(); } 331 if (active) {
332 audio_on();
333 } else {
334 audio_off();
335 }
307 break; 336 break;
308 case 1: 337 case 1:
309 if(active) { clicky_on(); } else { clicky_off(); } 338 if (active) {
339 clicky_on();
340 } else {
341 clicky_off();
342 }
310 break; 343 break;
311 case 2: 344 case 2:
312 keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = active; 345 keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = active;
@@ -316,11 +349,10 @@ void dip_update(uint8_t index, bool active) {
316 break; 349 break;
317 } 350 }
318} 351}
319#endif // KEYBOARD_planck_rev6 352#endif // KEYBOARD_planck_rev6
320 353
321#ifdef KEYBOARD_planck_ez 354#ifdef KEYBOARD_planck_ez
322layer_state_t layer_state_set_keymap(layer_state_t state) { 355layer_state_t layer_state_set_keymap(layer_state_t state) {
323
324 palClearPad(GPIOB, 8); 356 palClearPad(GPIOB, 8);
325 palClearPad(GPIOB, 9); 357 palClearPad(GPIOB, 9);
326 switch (biton32(state)) { 358 switch (biton32(state)) {
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index 351201e2f..21ce7ebb1 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -21,7 +21,7 @@ endif
21ifneq (,$(findstring planck/ez,$(KEYBOARD))) # Make sure it IS the Planck Light 21ifneq (,$(findstring planck/ez,$(KEYBOARD))) # Make sure it IS the Planck Light
22 RGBLIGHT_ENABLE = no 22 RGBLIGHT_ENABLE = no
23 # SERIAL_LINK_ENABLE = yes 23 # SERIAL_LINK_ENABLE = yes
24 ENCODER_ENABLE = no 24 ENCODER_ENABLE = yes
25 RGB_MATRIX_ENABLE = IS31FL3737 25 RGB_MATRIX_ENABLE = IS31FL3737
26 INDICATOR_LIGHTS = yes 26 INDICATOR_LIGHTS = yes
27 RGBLIGHT_TWINKLE = yes 27 RGBLIGHT_TWINKLE = yes
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 123c284a2..7504338ff 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -1,21 +1,22 @@
1#pragma once 1#pragma once
2 2
3
4/* ws2812 RGB LED */ 3/* ws2812 RGB LED */
5#if defined(KEYBOARD_fractal) 4#if defined(KEYBOARD_fractal)
6# define RGB_DI_PIN D2 5# define RGB_DI_PIN D2
7# undef RGBLED_NUM 6# undef RGBLED_NUM
8# define RGBLIGHT_ANIMATIONS 7# define RGBLIGHT_ANIMATIONS
9# define RGBLED_NUM 29 // Number of LEDs 8# define RGBLED_NUM 29 // Number of LEDs
10# undef RGBLIGHT_HUE_STEP 9# undef RGBLIGHT_HUE_STEP
11# define RGBLIGHT_HUE_STEP 8 10# define RGBLIGHT_HUE_STEP 8
12# undef RGBLIGHT_SAT_STEP 11# undef RGBLIGHT_SAT_STEP
13# define RGBLIGHT_SAT_STEP 8 12# define RGBLIGHT_SAT_STEP 8
14# undef RGBLIGHT_VAL_STEP 13# undef RGBLIGHT_VAL_STEP
15# define RGBLIGHT_VAL_STEP 8 14# define RGBLIGHT_VAL_STEP 8
16# define RGBLIGHT_LIMIT_VAL 175 15# define RGBLIGHT_LIMIT_VAL 175
17# define RGBLIGHT_SLEEP 16# define RGBLIGHT_SLEEP
18 17
19# define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3 18# define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
20# define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14 19# define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
20# define B7_AUDIO
21# define NO_MUSIC_MODE
21#endif 22#endif
diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c
index bf0907a51..26be99af5 100644
--- a/layouts/community/ortho_5x12/drashna/keymap.c
+++ b/layouts/community/ortho_5x12/drashna/keymap.c
@@ -19,6 +19,7 @@
19#include QMK_KEYBOARD_H 19#include QMK_KEYBOARD_H
20#include "drashna.h" 20#include "drashna.h"
21 21
22// clang-format off
22#define LAYOUT_ortho_5x12_base( \ 23#define LAYOUT_ortho_5x12_base( \
23 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ 24 K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
24 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ 25 K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@@ -135,22 +136,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
135 _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, 136 _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
136 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 137 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
137) 138)
138
139
140};
141
142bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
143 switch (keycode) {
144 }
145 return true;
146}; 139};
147 140// clang-format on
148void matrix_init_keymap(void) {
149#ifdef KEYBOARD_fractal
150 setPinOutput(D5);
151 writePinHigh(D5);
152
153 setPinOutput(B0);
154 writePinHigh(B0);
155#endif
156}
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk
index 160419fcc..ee7c2ad63 100644
--- a/layouts/community/ortho_5x12/drashna/rules.mk
+++ b/layouts/community/ortho_5x12/drashna/rules.mk
@@ -7,7 +7,7 @@ TAP_DANCE_ENABLE = no
7AUDIO_ENABLE = yes 7AUDIO_ENABLE = yes
8ifneq (,$(findstring fractal,$(KEYBOARD))) # Make sure it IS the Planck Light 8ifneq (,$(findstring fractal,$(KEYBOARD))) # Make sure it IS the Planck Light
9 RGB_MATRIX_ENABLE = no 9 RGB_MATRIX_ENABLE = no
10 AUDIO_ENABLE = no 10 AUDIO_ENABLE = yes
11 RGBLIGHT_ENABLE = yes 11 RGBLIGHT_ENABLE = yes
12 RGBLIGHT_TWINKLE = yes 12 RGBLIGHT_TWINKLE = yes
13 BOOTLOADER = qmk-dfu 13 BOOTLOADER = qmk-dfu
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-26 21:04:02 +0000