[Keymap] Update to Drashna keymap and user code (based on develop) (#12936)

3 files changed, 9 insertions, 17 deletions

diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 65e05f64b6..5a2d2f2e27 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -90,13 +90,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
   ),
 
-  [_MODS] = LAYOUT_split_3x6_3_wrapper(
-      _______, ___________________BLANK___________________,                  ___________________BLANK___________________, _______,
-      _______, ___________________BLANK___________________,                  ___________________BLANK___________________, _______,
-      KC_LSFT, ___________________BLANK___________________,                  ___________________BLANK___________________, KC_RSFT,
-                                     _______, _______, _______,        _______, _______, _______
-  ),
-
   [_LOWER] = LAYOUT_split_3x6_3_wrapper(
     KC_F11,  _________________LOWER_L1__________________,                    _________________LOWER_R1__________________, KC_F11,
     KC_F12,  _________________LOWER_L2__________________,                    _________________LOWER_R2__________________, KC_PIPE,
@@ -179,7 +172,6 @@ void check_default_layer(uint8_t mode, uint8_t type, uint8_t led_min, uint8_t le
 }
 
 void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (!is_keyboard_master()) return;
     if (userspace_config.rgb_layer_change) {
         switch (get_highest_layer(layer_state)) {
             case _GAMEPAD:
@@ -198,7 +190,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                 rgb_matrix_layer_helper(HSV_RED, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW, led_min, led_max);
                 break;
             default: {
-                check_default_layer(IS_LAYER_ON(_MODS), LED_FLAG_UNDERGLOW, led_min, led_max);
+                check_default_layer(0, LED_FLAG_UNDERGLOW, led_min, led_max);
                 break;
             }
         }
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk
index 984066bc30..cbb0b1c113 100644
--- a/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/layouts/community/split_3x6_3/drashna/rules.mk
@@ -3,17 +3,16 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE           = lite # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE            = no  # Mouse keys(+4700)
-EXTRAKEY_ENABLE            = yes # Audio control and System control(+450)
-CONSOLE_ENABLE             = no  # Console for debug(+400)
+BOOTMAGIC_ENABLE           = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE            = no  # Mouse keys
+EXTRAKEY_ENABLE            = yes # Audio control and System control
+CONSOLE_ENABLE             = no  # Console for debug
 COMMAND_ENABLE             = no  # Commands for debug and configuration
 NKRO_ENABLE                = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE           = no  # Enable keyboard backlight functionality
-MIDI_ENABLE                = no  # MIDI controls
-AUDIO_ENABLE               = no  # Audio output on port C6
+AUDIO_ENABLE               = no  # Audio output
 UNICODE_ENABLE             = no  # Unicode
-BLUETOOTH_ENABLE           = no  # Enable Bluetooth with the Adafruit EZ-Key HID
+BLUETOOTH_ENABLE           = no  # Enable Bluetooth
 RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
 
@@ -23,7 +22,7 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
     OLED_DRIVER_ENABLE = yes
     RGB_MATRIX_ENABLE = yes
-    HAPTIC_ENABLE = SOLENOID
+    HAPTIC_ENABLE = no
     BOOTLOADER = qmk-dfu
 endif
 
@@ -31,4 +30,5 @@ ifeq ($(strip $(CTPC)), yes)
     HAPTIC_ENABLE = no
     WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file
     SERIAL_DRIVER = usart
+    SWAP_HANDS_ENABLE = yes
 endif
diff --git a/layouts/community/split_3x6_3/drashna/ssd1306.c b/layouts/community/split_3x6_3/drashna/ssd1306.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/layouts/community/split_3x6_3/drashna/ssd1306.c
+++ /dev/null