[Keymap] RGB Changes for Drashna Keyboards (#5803)

* Disable a bunch of reactive modes * Enable rgb matrix for Corne Keyboard * Convert CRKBD to rgb matrix * Add Gergo keyboard layout * Make Diablo 3 tap dance better * Add basic support for Planck EZ * Fix RGB Matrix stuff * Fix keycodes for Planck EZ * Update CRKBD OLED stuff * Fix typo for sleep on ergodox glow * Improve my gergo layout * Scrolling OLED key logger! * Change gergo layout * Hnadle unicode keycodes if unicode is disabled * Disable COMMAND/CONSOLE for gergo * Fix right side control * Re-enable LTO for all platforms Since I got updated arm gcc binaries that no longer error out on lto * Update formatting to match newer community standards Poor 2 space * Re-alight startup animation to use new HUE range * Streamline gitlab ci scripts * Disabled Space Cadet * Add support for breathing table * Enable new LTO Option And clean up defines that will now be repeatitive * Remove vscode settings * Additional formatting cleanup of config.h files
2024-12-22 16:36:58 +00:00 · 2019-05-06 22:34:09 -07:00 · 2019-05-06 22:34:09 -07:00 · f3d5b1091d
commit f3d5b1091d
parent 7a751f1141
38 changed files with 1414 additions and 1444 deletions
--- a/keyboards/crkbd/keymaps/drashna/config.h
+++ b/keyboards/crkbd/keymaps/drashna/config.h
@ -27,7 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS

-// #define SSD1306OLED
+#undef USE_I2C
+#undef SSD1306OLED

 #define USE_SERIAL_PD2

@ -35,17 +36,42 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define TAPPING_TERM 100

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 27
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 27

-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 100
+#   define RGBLIGHT_HUE_STEP 8
+#   define RGBLIGHT_SAT_STEP 8
+#   define RGBLIGHT_VAL_STEP 8
+#   define RGBLIGHT_LIMIT_VAL 100
 #endif

+#ifdef RGB_MATRIX_ENABLE
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+
+#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#   define DISABLE_RGB_MATRIX_CYCLE_ALL
+#   define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#   define DISABLE_RGB_MATRIX_DUAL_BEACON
+#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#   define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define DISABLE_RGB_MATRIX_RAINDROPS
+// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#   define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#   define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
 #ifdef AUDIO_ENABLE
-#define B6_AUDIO
+#   define B6_AUDIO
 // #define NO_MUSIC_MODE
 #endif

--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
--- a/keyboards/crkbd/keymaps/drashna/rules.mk
+++ b/keyboards/crkbd/keymaps/drashna/rules.mk
@ -14,9 +14,10 @@ MIDI_ENABLE                = no  # MIDI controls
 AUDIO_ENABLE               = no  # Audio output on port C6
 UNICODE_ENABLE             = no  # Unicode
 BLUETOOTH_ENABLE           = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE            = yes # Enable WS2812 RGB underlight.
+RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
 RGBLIGHT_STARTUP_ANIMATION = yes
+RGB_MATRIX_ENABLE = WS2812

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
@ -24,3 +25,7 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 BOOTLOADER = qmk-dfu

 OLED_DRIVER_ENABLE = yes
+
+ifneq ($(strip $(OLED_DRIVER_ENABLE)), yes)
+    RGB_MATRIX_SPLIT_RIGHT=yes
+endif
--- a/keyboards/gergo/keymaps/drashna/keymap.c
+++ b/keyboards/gergo/keymaps/drashna/keymap.c
@ -9,23 +9,17 @@
 #include QMK_KEYBOARD_H
 #include "drashna.h"

-// Blank template at the bottom

-enum customKeycodes {
-	URL  = 1
-};
-
-#define LAYOUT_gergo_wrapper(...)       LAYOUT_gergo(__VA_ARGS__)
 #define LAYOUT_gergo_base( \
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
  ) \
  LAYOUT_gergo_wrapper( \
-    KC_ESC,  K01,    K02,     K03,      K04,     K05,                                              K06,     K07,     K08,     K09,     K0A,    KC_PIPE,      \
-    KC_TAB, ALT_T(K11),  K12, K13,      K14,     K15,   _______,                         _______,  K16,     K17,     K18,     K19,     K1A, RGUI_T(KC_QUOT), \
-    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,   _______, _______,       _______, _______,  K26,     K27,     K28,     K29, CTL_T(K2A), OS_RSFT,      \
-                            _______, _______, KC_SPC, LT(_LOWER, KC_BSPC),      LT(_RAISE, KC_DEL), KC_ENT, _______, _______                            \
+    KC_ESC,  K01,    K02,     K03,      K04,     K05,                                                K06,     K07,     K08,     K09,     K0A,    KC_PIPE,      \
+    KC_TAB,  K11,    K12,     K13,      K14,     K15,     _______,                         _______,  K16,     K17,     K18,     K19,     K1A,    KC_QUOT, \
+    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     _______, _______,       _______, _______,  K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT,      \
+                                       KC_GRV,   KC_SPC,  BK_LWER, OS_LALT,       OS_RGUI, DL_RAIS, KC_ENT, _______                            \
    )

 #define LAYOUT_gergo_base_wrapper(...)       LAYOUT_gergo_base(__VA_ARGS__)
--- a/keyboards/gergo/keymaps/drashna/rules.mk
+++ b/keyboards/gergo/keymaps/drashna/rules.mk
@ -0,0 +1,2 @@
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
--- a/keyboards/keebio/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
@ -29,24 +29,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 18     // Number of LEDs
-#define RGBLED_SPLIT { 9, 9 }
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 18     // Number of LEDs
+#   define RGBLED_SPLIT { 9, 9 }
+#   define RGBLIGHT_HUE_STEP 12
+#   define RGBLIGHT_SAT_STEP 12
+#   define RGBLIGHT_VAL_STEP 12
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2

-#define RGBLIGHT_LIMIT_VAL 225
+#   define RGBLIGHT_LIMIT_VAL 225
 #endif // RGBLIGHT_ENABLE

 #ifdef AUDIO_ENABLE
-#define C6_AUDIO
-#ifdef RGBLIGHT_ENABLE
-#define NO_MUSIC_MODE
-#endif //RGBLIGHT_ENABLE
+#   define C6_AUDIO
+#   ifdef RGBLIGHT_ENABLE
+#       define NO_MUSIC_MODE
+#   endif //RGBLIGHT_ENABLE
 #endif //AUDIO_ENABLE

 #define QMK_ESC_OUTPUT F6 // usually COL
@ -56,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#define PRODUCT         Drashna Hacked Iris Rev.2
+#   define PRODUCT         Drashna Hacked Iris Rev.2
 #endif

 #define SHFT_LED1 6
--- a/keyboards/keebio/iris/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c
@ -12,7 +12,7 @@
     KC_ESC,  ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS, \
     KC_TAB , K01,    K02,     K03,      K04,     K05,                           K06,     K07,     K08,     K09,     K0A,     KC_BSLS, \
     KC_C1R3, K11,    K12,     K13,      K14,     K15,                           K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-     OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     OS_LALT,     OS_RGUI, K26,     K27,     K28,     K29,  CTL_T(K2A), OS_RSFT, \
+     OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     OS_LALT,     OS_RGUI, K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
                             LT(_LOWER,KC_GRV), KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE                                      \
  )
 #define LAYOUT_iris_base_wrapper(...)       LAYOUT_iris_base(__VA_ARGS__)
@ -113,22 +113,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {


 void matrix_init_keymap(void) {
-  #ifndef CONVERT_TO_PROTON_C
+#ifndef CONVERT_TO_PROTON_C
    setPinOutput(D5);
    writePinHigh(D5);

    setPinOutput(B0);
    writePinHigh(B0);
-  #endif
+#endif
 }


 void keyboard_post_init_keymap(void) {
 #if BACKLIGHT_ENABLE
-  backlight_enable();
-  backlight_level(5);
-  #ifdef BACKLIGHT_BREATHING
-    breathing_enable();
-  #endif
+    backlight_enable();
+    backlight_level(5);
+    #ifdef BACKLIGHT_BREATHING
+        breathing_enable();
+    #endif
 #endif
 }
--- a/keyboards/keebio/iris/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk
@ -9,6 +9,7 @@ AUDIO_ENABLE      = no
 NKRO_ENABLE       = yes
 BACKLIGHT_ENABLE  = no
 SWAP_HANDS_ENABLE = no
+SPACE_CADET_ENABLE = no

 INDICATOR_LIGHTS  = no
 MACROS_ENABLED    = no
--- a/keyboards/keebio/iris/keymaps/drashna_lp/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna_lp/config.h
@ -21,15 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 16     // Number of LEDs
-#undef RGBLED_SPLIT
-#define RGBLED_SPLIT { 8, 8 }
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 16     // Number of LEDs
+#   undef RGBLED_SPLIT
+#   define RGBLED_SPLIT { 8, 8 }
 #endif

 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#define PRODUCT         Drashna Hacked Iris LP Rev.2 (Backlit)
+#   define PRODUCT         Drashna Hacked Iris LP Rev.2 (Backlit)
 #endif

 #undef SHFT_LED1
--- a/keyboards/keebio/iris/keymaps/drashna_old/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna_old/config.h
@ -21,15 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 16     // Number of LEDs
-#undef RGBLED_SPLIT
-#define RGBLED_SPLIT { 8, 8 }
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 16     // Number of LEDs
+#   undef RGBLED_SPLIT
+#   define RGBLED_SPLIT { 8, 8 }
 #endif

 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#define PRODUCT         Drashna Hacked Iris Rev.2 (16 LED)
+#   define PRODUCT         Drashna Hacked Iris Rev.2 (16 LED)
 #endif

 #undef SHFT_LED1
--- a/keyboards/keebio/viterbi/keymaps/drashna/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h
@ -21,35 +21,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 16
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 16

-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   define RGBLIGHT_HUE_STEP 8
+#   define RGBLIGHT_SAT_STEP 8
+#   define RGBLIGHT_VAL_STEP 8
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 #endif // RGBLIGHT_ENABLE


-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE


-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #undef PRODUCT
 #define PRODUCT   Drashnas Viterbi Macro Pad

 #ifdef AUDIO_ENABLE
-#define C6_AUDIO
-#define NO_MUSIC_MODE
+#   define C6_AUDIO
+#   define NO_MUSIC_MODE
 #endif

 #define LAYOUT_ortho_5x7( \
--- a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
@ -8,6 +8,7 @@ RGBLIGHT_ENABLE   = yes
 AUDIO_ENABLE      = yes
 NKRO_ENABLE       = yes
 SPLIT_KEYBOARD    = no
+SPACE_CADET_ENABLE = no

 NO_SECRETS        = yes
 MACROS_ENABLED    = yes
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
@ -20,6 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
+#   undef RGBLED_NUM
+#   define RGBLED_NUM 12
 #endif
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@ -39,37 +39,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )

 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 16     // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
+#   define RGB_DI_PIN D3
+#   define RGBLED_NUM 16     // Number of LEDs
+#   define RGBLED_SPLIT { 8, 8 }

-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   define RGBLIGHT_HUE_STEP 12
+#   define RGBLIGHT_SAT_STEP 12
+#   define RGBLIGHT_VAL_STEP 12
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 #endif // RGBLIGHT_ENABLE

 #ifdef AUDIO_ENABLE
-#define C6_AUDIO
-#ifdef RGBLIGHT_ENABLE
-#define NO_MUSIC_MODE
-#endif
+#   define C6_AUDIO
+#   ifdef RGBLIGHT_ENABLE
+#       define NO_MUSIC_MODE
+#   endif
 #endif //AUDIO_ENABLE

 #undef PRODUCT
 #ifdef KEYBOARD_orthodox_rev1
-#define PRODUCT         Drashna Hacked Orthodox Rev.1
+#   define PRODUCT         Drashna Hacked Orthodox Rev.1
 #elif KEYBOARD_orthodox_rev3
-#define PRODUCT         Drashna Hacked Orthodox Rev.3
+#   define PRODUCT         Drashna Hacked Orthodox Rev.3
 #endif

 #define QMK_ESC_OUTPUT D7 // usually COL
 #ifdef KEYBOARD_orthodox_rev1
-#define QMK_ESC_INPUT D4 // usually ROW
+#   define QMK_ESC_INPUT D4 // usually ROW
 #else
-#define QMK_ESC_INPUT D2 // usually ROW
+#   define QMK_ESC_INPUT D2 // usually ROW
 #endif
 #define QMK_LED B0
 #define QMK_SPEAKER C6
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@ -38,8 +38,8 @@ uint8_t last_osm;
  ) \
  LAYOUT_wrapper( \
    KC_ESC,  K01,    K02,     K03,      K04,     K05,                                                             K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
-    KC_TAB,  K11,    K12,     K13,      K14,     K15,              OS_LALT, OS_LGUI,   OS_RALT, RAISE,          K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     LOWER,   KC_SPACE,KC_BSPC,   KC_DEL,  KC_ENT,  RAISE,   K26,     K27,     K28,     K29,  CTL_T(K2A), KC_MRSF  \
+    KC_TAB,  K11,    K12,     K13,      K14,     K15,              OS_LALT, OS_LGUI,   OS_RALT, RAISE,            K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
+    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     LOWER,   KC_SPACE,KC_BSPC,   KC_DEL,  KC_ENT,  RAISE,   K26,     K27,     K28,     K29, RCTL_T(K2A), KC_MRSF  \
  )
 #define LAYOUT_orthodox_base_wrapper(...)       LAYOUT_orthodox_base(__VA_ARGS__)

@ -123,11 +123,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };

 void matrix_init_keymap(void) {
-  #ifndef CONVERT_TO_PROTON_C
+#ifndef CONVERT_TO_PROTON_C
    setPinOutput(D5);
    writePinHigh(D5);

    setPinOutput(B0);
    writePinHigh(B0);
-  #endif
+#endif
 }
--- a/keyboards/orthodox/keymaps/drashna/rules.mk
+++ b/keyboards/orthodox/keymaps/drashna/rules.mk
@ -7,6 +7,7 @@ TAP_DANCE_ENABLE  = no
 RGBLIGHT_ENABLE   = yes
 AUDIO_ENABLE      = no
 NKRO_ENABLE       = yes
+SPACE_CADET_ENABLE = no

 INDICATOR_LIGHTS  = yes
 MACROS_ENABLED    = no
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@ -1,12 +1,11 @@
 #pragma once

 #ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 12
+#   undef RGBLIGHT_SAT_STEP
+#   define RGBLIGHT_SAT_STEP 12

-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
 #endif // RGBLIGHT_ENABLE


--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@ -1,19 +1,20 @@
-TAP_DANCE_ENABLE  = yes
-SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE    = no  # Commands for debug and configuration
+TAP_DANCE_ENABLE   = yes
+SLEEP_LED_ENABLE   = no  # Breathing sleep LED during USB suspend
+COMMAND_ENABLE     = no  # Commands for debug and configuration
+SPACE_CADET_ENABLE = no
 ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
-  RGBLIGHT_ENABLE = yes
+  RGBLIGHT_ENABLE   = yes
  RGB_MATRIX_ENABLE = no
 endif
-CONSOLE_ENABLE    = no
-BOOTMAGIC_ENABLE  = yes
+CONSOLE_ENABLE     = no
+BOOTMAGIC_ENABLE   = yes

-UNICODE_ENABLE    = yes
-UNICDOEMAP_ENABLE = no
+UNICODE_ENABLE     = yes
+UNICDOEMAP_ENABLE  = no

-MACROS_ENABLED    = no
-RGBLIGHT_TWINKLE  = no
-INDICATOR_LIGHTS  = no
+MACROS_ENABLED     = no
+RGBLIGHT_TWINKLE   = no
+INDICATOR_LIGHTS   = no
 RGBLIGHT_STARTUP_ANIMATION = yes

 DEBOUNCE_TYPE     = eager_pk
--- a/layouts/community/ergodox/drashna_glow/config.h
+++ b/layouts/community/ergodox/drashna_glow/config.h
@ -6,10 +6,21 @@
 #define PRODUCT         DrashnaDox - Hacked ErgoDox EZ Glow

 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  true// turn off effects when suspended
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED  true// turn off effects when suspended
 // #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
 // #define EECONFIG_RGB_MATRIX (uint32_t *)16
+
+#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#   define DISABLE_RGB_MATRIX_CYCLE_ALL
+#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#   define DISABLE_RGB_MATRIX_DUAL_BEACON
+#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+
 #endif
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@ -3,18 +3,17 @@
 // #define B6_AUDIO

 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#define RGB_DI_PIN B1
-#define RGBLED_NUM 16     // Number of LEDs
+#   define RGB_DI_PIN B1
+#   define RGBLED_NUM 16     // Number of LEDs

-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   define RGBLIGHT_HUE_STEP 12
+#   define RGBLIGHT_SAT_STEP 12
+#   define RGBLIGHT_VAL_STEP 12
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 #endif // RGBLIGHT_ENABLE

 #if defined(KEYBOARD_primekb_prime_m)
-#undef PRODUCT
-#define PRODUCT Drashna Hacked Prime_M Macro Pad
+#   undef PRODUCT
+#   define PRODUCT Drashna Hacked Prime_M Macro Pad
 #endif
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@ -2,49 +2,52 @@


 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#define RGB_DI_PIN B3
-#define RGBLED_NUM 13     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#   define RGB_DI_PIN B3
+#   define RGBLED_NUM 13     // Number of LEDs
+#   define RGBLIGHT_ANIMATIONS
+#   define RGBLIGHT_HUE_STEP 12
+#   define RGBLIGHT_SAT_STEP 12
+#   define RGBLIGHT_VAL_STEP 12
+#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#   ifdef RGB_MATRIX_ENABLE
+#       define RGBLIGHT_DISABLE_KEYCODES
+#   endif
 #endif // RGBLIGHT_ENABLE

 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
 // #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
-#define EECONFIG_RGB_MATRIX (uint32_t *)15
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
+#   ifndef KEYBOARD_planck_ez
+#       define EECONFIG_RGB_MATRIX (uint32_t *)15
+#   endif
 #endif

 #if defined(KEYBOARD_lets_split_rev2)
-#define USE_SERIAL
-#undef USE_I2C
-
-#define EE_HANDS
+#   define USE_SERIAL
+#   undef USE_I2C
+#   define EE_HANDS
 #endif

 #if !defined(KEYBOARD_planck_light)
-#ifdef RGBLIGHT_ENABLE
-#define NO_MUSIC_MODE
-#endif // RGBLIGHT_ENABLE
+#   ifdef RGBLIGHT_ENABLE
+#       define NO_MUSIC_MODE
+#   endif // RGBLIGHT_ENABLE
 #endif // KEYBOARD_planck_light


 #if defined(KEYBOARD_planck)
-#undef PRODUCT
-#if defined(KEYBOARD_planck_light)
-#define PRODUCT Drashna Hacked RGB Beacon (Planck Light)
-#elif defined(KEYBOARD_planck_rev6)
-#define PRODUCT Drashna Hacked Planck Rev6
-#elif defined(KEYBOARD_planck_EZ)
-#define PRODUCT Drashna Hacked Planck EZ
-#endif
+#   undef PRODUCT
+#   if defined(KEYBOARD_planck_light)
+#       define PRODUCT Drashna Hacked RGB Beacon (Planck Light)
+#   elif defined(KEYBOARD_planck_rev6)
+#       define PRODUCT Drashna Hacked Planck Rev6
+#   elif defined(KEYBOARD_planck_EZ)
+#   define PRODUCT Drashna Hacked Planck EZ
+#   endif
 #endif

 /*
@ -58,7 +61,7 @@
   - MIDI notes can be sent when in Music mode is on
 */

-#define MIDI_BASIC
+// #define MIDI_BASIC

 /* enable advanced MIDI features:
   - MIDI notes can be added to the keymap
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@ -5,16 +5,27 @@ CONSOLE_ENABLE    = no         # Console for debug(+400)
 COMMAND_ENABLE    = no        # Commands for debug and configuration
 TAP_DANCE_ENABLE  = no
 AUDIO_ENABLE      = yes
+SPACE_CADET_ENABLE = no
+
 ifeq (,$(findstring planck/rev6,$(KEYBOARD))) # Make sure it's NOT the Planck Rev6
-  RGBLIGHT_ENABLE             = yes
-  INDICATOR_LIGHTS            = yes
-  RGBLIGHT_TWINKLE            = yes
-  RGBLIGHT_STARTUP_ANIMATION  = yes
+    RGBLIGHT_ENABLE             = yes
+    INDICATOR_LIGHTS            = yes
+    RGBLIGHT_TWINKLE            = yes
+    RGBLIGHT_STARTUP_ANIMATION  = yes
 endif
 ifneq (,$(findstring planck/light,$(KEYBOARD))) # Make sure it IS the Planck Light
-  RGB_MATRIX_ENABLE           = yes
-  RGBLIGHT_ENABLE             = no
-  RGBLIGHT_STARTUP_ANIMATION  = no
+    RGB_MATRIX_ENABLE           = yes
+    RGBLIGHT_ENABLE             = no
+    RGBLIGHT_STARTUP_ANIMATION  = no
+endif
+ifneq (,$(findstring planck/ez,$(KEYBOARD))) # Make sure it IS the Planck Light
+    RGBLIGHT_ENABLE = no
+    # SERIAL_LINK_ENABLE = yes
+    ENCODER_ENABLE = no
+    RGB_MATRIX_ENABLE = IS31FL3737
+    INDICATOR_LIGHTS            = yes
+    RGBLIGHT_TWINKLE            = yes
+    RGBLIGHT_STARTUP_ANIMATION  = yes
 endif

 ifeq ($(strip $(PROTOCOL)), VUSB)
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@ -3,20 +3,19 @@

 /* ws2812 RGB LED */
 #if defined(KEYBOARD_fractal)
-  #define RGB_DI_PIN D2
-  #undef RGBLED_NUM
-  #define RGBLIGHT_ANIMATIONS
-  #define RGBLED_NUM 29     // Number of LEDs
-  #undef RGBLIGHT_HUE_STEP
-  #define RGBLIGHT_HUE_STEP 8
-  #undef RGBLIGHT_SAT_STEP
-  #define RGBLIGHT_SAT_STEP 8
-  #undef RGBLIGHT_VAL_STEP
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 175
-  #define RGBLIGHT_SLEEP
-
-  #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
-  #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
+#   define RGB_DI_PIN D2
+#   undef RGBLED_NUM
+#   define RGBLIGHT_ANIMATIONS
+#   define RGBLED_NUM 29     // Number of LEDs
+#   undef RGBLIGHT_HUE_STEP
+#   define RGBLIGHT_HUE_STEP 8
+#   undef RGBLIGHT_SAT_STEP
+#   define RGBLIGHT_SAT_STEP 8
+#   undef RGBLIGHT_VAL_STEP
+#   define RGBLIGHT_VAL_STEP 8
+#   define RGBLIGHT_LIMIT_VAL 175
+#   define RGBLIGHT_SLEEP

+#   define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
+#   define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
 #endif
--- a/users/drashna/.gitlab-ci.yml
+++ b/users/drashna/.gitlab-ci.yml
@ -1,9 +1,7 @@
 stages:
  - test
-  - build
-  - deploy

-Preliminary Test:
+QMK Firmware:
  stage: test
  variables:
    GIT_SUBMODULE_STRATEGY: recursive
@ -18,36 +16,7 @@ Preliminary Test:
  script:
    - make test:all
    - make planck/rev6:default planck/rev5:default
-
-QMK Firmware Defaults:
-  stage: deploy
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-  tags:
-    - linux
-  image: ubuntu:18.10
-  before_script:
-    - apt-get update -qy
-    - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi gcc-avr git libnewlib-arm-none-eabi unzip wget zip
-    - avr-gcc --version
-    - uname -a
-  script:
-    - make test:all
-    - make all:default -j16
-
-Drashna Firmware:
-  stage: build
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-  tags:
-    - linux
-  image: ubuntu:18.10
-  before_script:
-    - apt-get update -qy
-    - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi gcc-avr git libnewlib-arm-none-eabi unzip wget zip
-    - avr-gcc --version
-  script:
-    - make keebio/iris/rev2:drashna keebio/iris/rev2:drashna_old ergodox_ez:drashna ergodox_ez:drashna_glow keebio/viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna planck/rev6:drashna fractal:drashna primekb/prime_m:drashna -j16 --output-sync
+    - make keebio/iris/rev2:drashna keebio/iris/rev2:drashna_old ergodox_ez:drashna ergodox_ez:drashna_glow keebio/viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna planck/rev6:drashna fractal:drashna primekb/prime_m:drashna -j2 --output-sync
  artifacts:
    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
    paths:
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@ -2,50 +2,43 @@


 #ifdef AUDIO_ENABLE
-  #define AUDIO_CLICKY
-  #define STARTUP_SONG SONG(RICK_ROLL)
-  #define GOODBYE_SONG  SONG(SONIC_RING)
-  #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+#   define AUDIO_CLICKY
+#   define STARTUP_SONG SONG(RICK_ROLL)
+#   define GOODBYE_SONG  SONG(SONIC_RING)
+#   define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
                                    SONG(COLEMAK_SOUND), \
                                    SONG(DVORAK_SOUND), \
                                    SONG(OVERWATCH_THEME) \
-                                  }
+                                }

-  #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
-  // #ifdef RGBLIGHT_ENABLE
-  // #define NO_MUSIC_MODE
-  // #endif //RGBLIGHT_ENABLE/
-  // #ifndef __arm__
-  //   #undef  NOTE_REST
-  //   #define NOTE_REST         1.00f
-  // #endif // !__arm__
+#   define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f

-#define UNICODE_SONG_OSX SONG(RICK_ROLL)
-#define UNICODE_SONG_LNX SONG(RICK_ROLL)
-#define UNICODE_SONG_WIN SONG(RICK_ROLL)
-#define UNICODE_SONG_BSD SONG(RICK_ROLL)
-#define UNICODE_SONG_WINC SONG(RICK_ROLL)
+#   define UNICODE_SONG_OSX SONG(RICK_ROLL)
+#   define UNICODE_SONG_LNX SONG(RICK_ROLL)
+#   define UNICODE_SONG_WIN SONG(RICK_ROLL)
+#   define UNICODE_SONG_BSD SONG(RICK_ROLL)
+#   define UNICODE_SONG_WINC SONG(RICK_ROLL)

 #endif // !AUDIO_ENABLE

 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_SLEEP
-  #undef RGBLIGHT_ANIMATIONS
-  #define RGBLIGHT_EFFECT_BREATHING
-  #define RGBLIGHT_EFFECT_SNAKE
-  #define RGBLIGHT_EFFECT_KNIGHT
+#   define RGBLIGHT_SLEEP
+#   undef RGBLIGHT_ANIMATIONS
+#   define RGBLIGHT_EFFECT_BREATHING
+#   define RGBLIGHT_EFFECT_SNAKE
+#   define RGBLIGHT_EFFECT_KNIGHT
 #endif // RGBLIGHT_ENABLE

 #ifndef ONESHOT_TAP_TOGGLE
-  #define ONESHOT_TAP_TOGGLE 2
+#   define ONESHOT_TAP_TOGGLE 2
 #endif // !ONESHOT_TAP_TOGGLE

 #ifndef ONESHOT_TIMEOUT
-  #define ONESHOT_TIMEOUT 3000
+#   define ONESHOT_TIMEOUT 3000
 #endif// !ONESHOT_TIMEOUT

 #ifndef QMK_KEYS_PER_SCAN
-  #define QMK_KEYS_PER_SCAN 4
+#   define QMK_KEYS_PER_SCAN 4
 #endif // !QMK_KEYS_PER_SCAN


@ -62,24 +55,27 @@
 #define FORCE_NKRO

 #ifndef TAPPING_TOGGLE
-  #define TAPPING_TOGGLE  1
+#   define TAPPING_TOGGLE  1
 #endif

 #ifdef TAPPING_TERM
-  #undef TAPPING_TERM
+#   undef TAPPING_TERM
 #endif // TAPPING_TERM
 #if defined(KEYBOARD_ergodox_ez)
-  #define TAPPING_TERM 185
+#   define TAPPING_TERM 185
 #elif defined(KEYBOARD_crkbd)
-  #define TAPPING_TERM 200
+#   define TAPPING_TERM 200
 #else
-  #define TAPPING_TERM 175
+#   define TAPPING_TERM 175
 #endif


-// Disable action_get_macro and fn_actions, since we don't use these
-// and it saves on space in the firmware.
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define TAP_CODE_DELAY 5
+
+/* Disable unused and unneeded features to reduce on firmware size */
+#ifdef LOCKING_SUPPORT_ENABLE
+#   undef LOCKING_SUPPORT_ENABLE
+#endif
+#ifdef LOCKING_RESYNC_ENABLE
+#   undef LOCKING_RESYNC_ENABLE
+#endif
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@ -22,36 +22,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wrappers.h"
 #include "process_records.h"
 #ifdef TAP_DANCE_ENABLE
-  #include "tap_dances.h"
+#   include "tap_dances.h"
 #endif // TAP_DANCE_ENABLE
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-  #include "rgb_stuff.h"
+#   include "rgb_stuff.h"
 #endif
 #if defined(AUDIO_ENABLE) && __GNUC__ > 7
-  #if __has_include("drashna_song_list.h")
-    #include "drashna_song_list.h"
-  #endif
+#   if __has_include("drashna_song_list.h")
+#       include "drashna_song_list.h"
+#   endif
 #endif

 /* Define layer names */
 enum userspace_layers {
-  _QWERTY = 0,
-  _NUMLOCK = 0,
-  _COLEMAK,
-  _DVORAK,
-  _WORKMAN,
-  _NORMAN,
-  _MALTRON,
-  _EUCALYN,
-  _CARPLAX,
-  _MODS, /* layer 8 */
-  _GAMEPAD,
-  _DIABLO,
-  _MACROS,
-  _MEDIA,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
+    _QWERTY = 0,
+    _NUMLOCK = 0,
+    _COLEMAK,
+    _DVORAK,
+    _WORKMAN,
+    _NORMAN,
+    _MALTRON,
+    _EUCALYN,
+    _CARPLAX,
+    _MODS, /* layer 8 */
+    _GAMEPAD,
+    _DIABLO,
+    _MACROS,
+    _MEDIA,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
 };

 /*
@ -73,14 +73,14 @@ void led_set_keymap(uint8_t usb_led);
 void eeconfig_init_keymap(void);

 typedef union {
-  uint32_t raw;
-  struct {
-    bool     rgb_layer_change :1;
-    bool     is_overwatch     :1;
-    bool     nuke_switch      :1;
-    uint8_t  unicode_mod      :4;
-    bool     swapped_numbers  :1;
-  };
+    uint32_t raw;
+    struct {
+        bool     rgb_layer_change :1;
+        bool     is_overwatch     :1;
+        bool     nuke_switch      :1;
+        uint8_t  unicode_mod      :4;
+        bool     swapped_numbers  :1;
+    };
 } userspace_config_t;

 extern userspace_config_t userspace_config;
@ -92,13 +92,13 @@ But since TD() doesn't work when tap dance is disabled
 We use custom codes here, so we can substitute the right stuff
 */
 #ifdef TAP_DANCE_ENABLE
-#define KC_D3_1 TD(TD_D3_1)
-#define KC_D3_2 TD(TD_D3_2)
-#define KC_D3_3 TD(TD_D3_3)
-#define KC_D3_4 TD(TD_D3_4)
+#   define KC_D3_1 TD(TD_D3_1)
+#   define KC_D3_2 TD(TD_D3_2)
+#   define KC_D3_3 TD(TD_D3_3)
+#   define KC_D3_4 TD(TD_D3_4)
 #else // TAP_DANCE_ENABLE
-#define KC_D3_1 KC_1
-#define KC_D3_2 KC_2
-#define KC_D3_3 KC_3
-#define KC_D3_4 KC_4
+#   define KC_D3_1 KC_1
+#   define KC_D3_2 KC_2
+#   define KC_D3_3 KC_3
+#   define KC_D3_4 KC_4
 #endif // TAP_DANCE_ENABLE
--- a/users/drashna/process_records.c
+++ b/users/drashna/process_records.c
@ -4,12 +4,12 @@ uint16_t copy_paste_timer;

 __attribute__ ((weak))
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
+    return true;
 }

 __attribute__ ((weak))
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-  return true;
+    return true;
 }

 // Defines actions tor my global custom keycodes. Defined in drashna.h file
@ -18,140 +18,140 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {

  // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef KEYLOGGER_ENABLE
-  #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_keebio_iris_rev2)
-    xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
-  #else
-    xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-  #endif
+#   if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_keebio_iris_rev2)
+        xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
+#   else
+        xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+#   endif
 #endif //KEYLOGGER_ENABLE

-  switch (keycode) {
-  case KC_QWERTY ... KC_CARPLAX:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(keycode - KC_QWERTY);
-    }
-    break;
+    switch (keycode) {
+    case KC_QWERTY ... KC_CARPLAX:
+        if (record->event.pressed) {
+            set_single_persistent_default_layer(keycode - KC_QWERTY);
+        }
+        break;

-  case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-    if (!record->event.pressed) {
-      uint8_t temp_mod = get_mods();
-      uint8_t temp_osm = get_oneshot_mods();
-      clear_mods(); clear_oneshot_mods();
-      send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY);
+    case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
+        if (!record->event.pressed) {
+            uint8_t temp_mod = get_mods();
+            uint8_t temp_osm = get_oneshot_mods();
+            clear_mods(); clear_oneshot_mods();
+            send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY);
 #ifndef MAKE_BOOTLOADER
-      if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT )
+        if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT )
 #endif
-      {
-        #if defined(__arm__)
-          send_string_with_delay_P(PSTR(":dfu-util"), TAP_CODE_DELAY);
-        #elif defined(BOOTLOADER_DFU)
-          send_string_with_delay_P(PSTR(":dfu"), TAP_CODE_DELAY);
-        #elif defined(BOOTLOADER_HALFKAY)
-          send_string_with_delay_P(PSTR(":teensy"), TAP_CODE_DELAY);
-        #elif defined(BOOTLOADER_CATERINA)
-          send_string_with_delay_P(PSTR(":avrdude"), TAP_CODE_DELAY);
-        #endif // bootloader options
-       }
-      if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), TAP_CODE_DELAY); }
-      send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
-    }
-    break;
+        {
+            #if defined(__arm__)
+            send_string_with_delay_P(PSTR(":dfu-util"), TAP_CODE_DELAY);
+            #elif defined(BOOTLOADER_DFU)
+            send_string_with_delay_P(PSTR(":dfu"), TAP_CODE_DELAY);
+            #elif defined(BOOTLOADER_HALFKAY)
+            send_string_with_delay_P(PSTR(":teensy"), TAP_CODE_DELAY);
+            #elif defined(BOOTLOADER_CATERINA)
+            send_string_with_delay_P(PSTR(":avrdude"), TAP_CODE_DELAY);
+            #endif // bootloader options
+        }
+        if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), TAP_CODE_DELAY); }
+            send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
+        }
+        break;

-  case VRSN: // Prints firmware version
-    if (record->event.pressed) {
-      send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
-    }
-    break;
+    case VRSN: // Prints firmware version
+        if (record->event.pressed) {
+            send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
+        }
+        break;

-// These are a serious of gaming macros.
-// Only enables for the viterbi, basically,
-// to save on firmware space, since it's limited.
+    // These are a serious of gaming macros.
+    // Only enables for the viterbi, basically,
+    // to save on firmware space, since it's limited.
 #ifdef MACROS_ENABLED
-  case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros
-    if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeconfig_update_user(userspace_config.raw); }
+    case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros
+        if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeconfig_update_user(userspace_config.raw); }
 #ifdef RGBLIGHT_ENABLE
-    userspace_config.is_overwatch ? rgblight_mode_noeeprom(17) : rgblight_mode_noeeprom(18);
+        userspace_config.is_overwatch ? rgblight_mode_noeeprom(17) : rgblight_mode_noeeprom(18);
 #endif //RGBLIGHT_ENABLE
-    break;
-  case KC_SALT:
-    return send_game_macro("Salt, salt, salt...", record, false);
-  case KC_MORESALT:
-    return  send_game_macro("Please sir, can I have some more salt?!", record, false);
-  case KC_SALTHARD:
-    return send_game_macro("Your salt only makes me harder, and even more aggressive!", record, false);
-  case KC_GOODGAME:
-    return send_game_macro("Good game, everyone!", record, false);
-  case KC_GLHF:
-    return send_game_macro("Good luck, have fun!!!", record, false);
-  case KC_SYMM:
-    return send_game_macro("Left click to win!", record, false);
-  case KC_JUSTGAME:
-    return send_game_macro("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.", record, false);
-  case KC_TORB:
-    return send_game_macro("That was positively riveting!", record, false);
-  case KC_AIM:
-    send_game_macro("That aim is absolutely amazing. It's almost like you're a machine!", record, true);
-    return send_game_macro("Wait! That aim is TOO good!  You're clearly using an aim hack! CHEATER!", record, false);
-  case KC_C9:
-    return send_game_macro("OMG!!!  C9!!!", record, false);
-  case KC_GGEZ:
-    return send_game_macro("That was a fantastic game, though it was a bit easy. Try harder next time!", record, false);
+        break;
+    case KC_SALT:
+        return send_game_macro("Salt, salt, salt...", record, false);
+    case KC_MORESALT:
+        return  send_game_macro("Please sir, can I have some more salt?!", record, false);
+    case KC_SALTHARD:
+        return send_game_macro("Your salt only makes me harder, and even more aggressive!", record, false);
+    case KC_GOODGAME:
+        return send_game_macro("Good game, everyone!", record, false);
+    case KC_GLHF:
+        return send_game_macro("Good luck, have fun!!!", record, false);
+    case KC_SYMM:
+        return send_game_macro("Left click to win!", record, false);
+    case KC_JUSTGAME:
+        return send_game_macro("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.", record, false);
+    case KC_TORB:
+        return send_game_macro("That was positively riveting!", record, false);
+    case KC_AIM:
+        send_game_macro("That aim is absolutely amazing. It's almost like you're a machine!", record, true);
+        return send_game_macro("Wait! That aim is TOO good!  You're clearly using an aim hack! CHEATER!", record, false);
+    case KC_C9:
+        return send_game_macro("OMG!!!  C9!!!", record, false);
+    case KC_GGEZ:
+        return send_game_macro("That was a fantastic game, though it was a bit easy. Try harder next time!", record, false);
 #endif // MACROS_ENABLED


-  case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
+    case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
 #ifdef TAP_DANCE_ENABLE
-    if (record->event.pressed) {
-      uint8_t dtime;
-      for (dtime = 0; dtime < 4; dtime++) {
-        diablo_key_time[dtime] = diablo_times[0];
-      }
-    }
+        if (record->event.pressed) {
+            uint8_t dtime;
+            for (dtime = 0; dtime < 4; dtime++) {
+                diablo_timer[dtime].key_time = diablo_times[0];
+            }
+        }
 #endif // TAP_DANCE_ENABLE
-    break;
+        break;


  case KC_CCCV:                                    // One key copy/paste
-    if(record->event.pressed){
-      copy_paste_timer = timer_read();
-    } else {
-      if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {   // Hold, copy
-        register_code(KC_LCTL);
-        tap_code(KC_C);
-        unregister_code(KC_LCTL);
-      } else {                                // Tap, paste
-        register_code(KC_LCTL);
-        tap_code(KC_V);
-        unregister_code(KC_LCTL);
-      }
-    }
-    break;
+        if(record->event.pressed){
+            copy_paste_timer = timer_read();
+            } else {
+            if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {   // Hold, copy
+                register_code(KC_LCTL);
+                tap_code(KC_C);
+                unregister_code(KC_LCTL);
+            } else {                                // Tap, paste
+                register_code(KC_LCTL);
+                tap_code(KC_V);
+                unregister_code(KC_LCTL);
+            }
+        }
+        break;
 #ifdef UNICODE_ENABLE
-  case UC_FLIP: // (ノಠ痊ಠ)ノ彡┻━┻
-    if (record->event.pressed) {
-      send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
-    }
-    break;
-  case UC_TABL: // ┬─┬ノ( º _ ºノ)
-    if (record->event.pressed) {
-      send_unicode_hex_string("252C 2500 252C 30CE 0028 0020 00BA 0020 005F 0020 00BA 30CE 0029");
-    }
-    break;
-  case UC_SHRG: // ¯\_(ツ)_/¯
-    if (record->event.pressed) {
-      send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
-    }
-    break;
-  case UC_DISA: // ಠ_ಠ
-    if (record->event.pressed) {
-      send_unicode_hex_string("0CA0 005F 0CA0");
-    }
-    break;
+    case UC_FLIP: // (ノಠ痊ಠ)ノ彡┻━┻
+        if (record->event.pressed) {
+            send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+        }
+        break;
+    case UC_TABL: // ┬─┬ノ( º _ ºノ)
+        if (record->event.pressed) {
+            send_unicode_hex_string("252C 2500 252C 30CE 0028 0020 00BA 0020 005F 0020 00BA 30CE 0029");
+        }
+        break;
+    case UC_SHRG: // ¯\_(ツ)_/¯
+        if (record->event.pressed) {
+            send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
+        }
+        break;
+    case UC_DISA: // ಠ_ಠ
+        if (record->event.pressed) {
+            send_unicode_hex_string("0CA0 005F 0CA0");
+        }
+        break;
 #endif
-  }
-  return process_record_keymap(keycode, record) &&
+    }
+    return process_record_keymap(keycode, record) &&
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-    process_record_user_rgb(keycode, record) &&
+        process_record_user_rgb(keycode, record) &&
 #endif // RGBLIGHT_ENABLE
-    process_record_secrets(keycode, record);
+        process_record_secrets(keycode, record);
 }
--- a/Show More
+++ b/Show More