[Keymap] Cleanup of Drashna code (#7800)

* ifdef rgb stuff like a madman for RGB Coexistance

* Re-enable RGB Light on Planck

* fix RGB Coexistance issue

* Tweak feature settings for Ergodox EZ Glow

* Their powers combine, and I am Captain RGB

This one is for noroadsleft and yan.

* Limit brightness when both RGB features are enabled

* Change shutdown method

* Add RGB Coexistience stuff to keymap

* disable RGBLIGHT_SLEEP until a solution can be found

* Disable Unicode on the kyria

* Fix up Iris rev defines

* Fix up community layouts to compile properly

* Cleanup rgb stuff

* Merge ergodox keymaps

* Update CCCV macro to use tap_code16

* Enable Solenoid on C39

Because josh couldn't

* Enable RGB Light, not Matrix on rev6 keymap

* Only enable LTO on non-ARM boards

* Clean up Bootmagic OLED display

* Enable RGBLIGHT_SPLIT on kyria

Not that it does anything

* Add hotkey for discord

3 files changed, 23 insertions, 32 deletions

diff --git a/keyboards/kyria/keymaps/drashna/config.h b/keyboards/kyria/keymaps/drashna/config.h
index 83d6283f5..e566b16d5 100644
--- a/keyboards/kyria/keymaps/drashna/config.h
+++ b/keyboards/kyria/keymaps/drashna/config.h
@@ -31,6 +31,7 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_SPLIT
 #endif
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
diff --git a/keyboards/kyria/keymaps/drashna/keymap.c b/keyboards/kyria/keymaps/drashna/keymap.c
index bdb00e596..5604f1a69 100644
--- a/keyboards/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/kyria/keymaps/drashna/keymap.c
@@ -52,7 +52,7 @@ void add_keylog(uint16_t keycode);
   LAYOUT_wrapper( \
       KC_ESC,  K01,     K02,     K03,     K04,     K05,                                             K06,     K07,     K08,     K09,     K0A,     KC_MINS, \
    LALT_T(KC_TAB), K11, K12,     K13,     K14,     K15,                                             K16,     K17,     K18,     K19,     K1A, RALT_T(KC_QUOT), \
-      OS_LSFT, CTL_T(K21), K22,  K23,     K24,     K25,     KC_NO,   KC_NO,       KC_NO,   KC_NO,   K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+      OS_LSFT, CTL_T(K21), K22,  K23,     K24,     K25,     KC_NO,   KC_NO,  MEH(KC_MINS), KC_NO,   K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
                                  KC_MUTE, OS_LALT, KC_GRV,  KC_SPC,  BK_LWER,     DL_RAIS, KC_ENT,  OS_RGUI, UC(0x03A8), UC(0x2E2E) \
     )
 /* Re-pass though to allow templates to be used */
@@ -191,30 +191,14 @@ void render_keylogger_status(void) {
 void render_default_layer_state(void) {
     oled_write_P(PSTR("Layout: "), false);
     switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwerty "), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Colemak"), false);
-            break;
-        case _DVORAK:
-            oled_write_ln_P(PSTR("Dvorak"), false);
-            break;
-        case _WORKMAN:
-            oled_write_ln_P(PSTR("Workman"), false);
-            break;
-        case _NORMAN:
-            oled_write_ln_P(PSTR("Norman"), false);
-            break;
-        case _MALTRON:
-            oled_write_ln_P(PSTR("Maltron"), false);
-            break;
-        case _EUCALYN:
-            oled_write_ln_P(PSTR("Eucalyn"), false);
-            break;
-        case _CARPLAX:
-            oled_write_ln_P(PSTR("Carplax"), false);
-            break;
+        case _QWERTY:  oled_write_ln_P(PSTR("Qwerty"), false); break;
+        case _COLEMAK: oled_write_ln_P(PSTR("Colemak"), false); break;
+        case _DVORAK:  oled_write_ln_P(PSTR("Dvorak"), false);  break;
+        case _WORKMAN: oled_write_ln_P(PSTR("Workman"), false); break;
+        case _NORMAN:  oled_write_ln_P(PSTR("Norman"), false);  break;
+        case _MALTRON: oled_write_ln_P(PSTR("Maltron"), false); break;
+        case _EUCALYN: oled_write_ln_P(PSTR("Eucalyn"), false); break;
+        case _CARPLAX: oled_write_ln_P(PSTR("Carplax"), false); break;
     }
 }
 
@@ -230,11 +214,11 @@ void render_layer_state(void) {
 
 void render_keylock_status(uint8_t led_usb_state) {
     oled_write_P(PSTR("Lock: "), false);
-    oled_write_P(PSTR("NUM"), led_usb_state & (1 << USB_LED_NUM_LOCK));
+    oled_write_P(PSTR("NUML"), led_usb_state & (1 << USB_LED_NUM_LOCK));
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("CAPS"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
     oled_write_P(PSTR(" "), false);
-    oled_write_ln_P(PSTR("SCL"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+    oled_write_ln_P(PSTR("SCLK"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
 }
 
 void render_mod_status(uint8_t modifiers) {
@@ -255,15 +239,21 @@ void render_bootmagic_status(void) {
         {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
     };
     oled_write_P(PSTR("Boot  "), false);
-    oled_write_P(logo[0][0], !keymap_config.swap_lctl_lgui);
-    oled_write_P(logo[1][0], keymap_config.swap_lctl_lgui);
+    if (keymap_config.swap_lctl_lgui) {
+        oled_write_P(logo[1][0], false);
+    } else {
+        oled_write_P(logo[0][0], false);
+    }
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("NKRO"), keymap_config.nkro);
     oled_write_P(PSTR(" "), false);
     oled_write_ln_P(PSTR("GUI"), !keymap_config.no_gui);
     oled_write_P(PSTR("Magic "), false);
-    oled_write_P(logo[0][1], !keymap_config.swap_lctl_lgui);
-    oled_write_P(logo[1][1], keymap_config.swap_lctl_lgui);
+    if (keymap_config.swap_lctl_lgui) {
+        oled_write_P(logo[1][1], false);
+    } else {
+        oled_write_P(logo[0][1], false);
+    }
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("GRV"), keymap_config.swap_grave_esc);
     oled_write_P(PSTR("  "), false);
diff --git a/keyboards/kyria/keymaps/drashna/rules.mk b/keyboards/kyria/keymaps/drashna/rules.mk
index c1a37f5c5..e835340bb 100644
--- a/keyboards/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/kyria/keymaps/drashna/rules.mk
@@ -1,7 +1,7 @@
 OLED_DRIVER_ENABLE = yes   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-RGBLIGHT_STARTUP_ANIMATION = yes
+RGBLIGHT_STARTUP_ANIMATION = no
 
 BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no      # Mouse keys