[Keymap] Drashna updates for 0.20.0 (#19960)

4 files changed, 27 insertions, 19 deletions

diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index cb11ea2748..07c4bfc008 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -37,6 +37,9 @@
 #    undef POINTING_DEVICE_CS_PIN
 #    define POINTING_DEVICE_CS_PIN A15 // b14
 #    define PMW33XX_LIFTOFF_DISTANCE 0b1111
+
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 33
+#    define RGB_MATRIX_LED_PROCESS_LIMIT 29
 #endif
 
 #undef ROTATIONAL_TRANSFORM_ANGLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
index 50a05e1b35..85bb2bc77f 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -16,6 +16,7 @@
  */
 #include "drashna.h"
 
+// clang-format off
 #define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__)
 #define LAYOUT_charybdis_4x6_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
@@ -26,14 +27,13 @@
      KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
      SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
      LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
-     OS_LSFT,CTL_T(K21),  K22,  K23,     K24,     K25,                K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \
+     OS_LSFT,CTL_T(K21),ALT_T(K22),GUI_T(K23),K24,K25,                K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \
                            SFT_T(KC_GRV), OS_LALT, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
                                            KC_SPC, BK_LWER,     DL_RAIS \
     )
 
 #define LAYOUT_base_wrapper(...)       LAYOUT_charybdis_4x6_base(__VA_ARGS__)
 
-// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
         _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
@@ -120,13 +120,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-
 void keyboard_post_init_keymap(void) {
 #ifdef RGB_MATRIX_ENABLE
-     g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] =
-        g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] =
-        g_led_config.flags[29] = g_led_config.flags[30] = g_led_config.flags[31] = g_led_config.flags[32] =
-        LED_FLAG_MODIFIER;
+    g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] = g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] = g_led_config.flags[29] = g_led_config.flags[30] = g_led_config.flags[31] = g_led_config.flags[32] = LED_FLAG_MODIFIER;
 #endif
 }
 
@@ -171,8 +167,8 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
     {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}},
     {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}},
     {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}},
-    {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}, {2, 4}},
-    };
+    {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}, {2, 4}}
+};
 
 #    ifdef ENCODER_MAP_ENABLE
 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
index 12e9cecda0..0b7759f156 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -37,8 +37,7 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
     NKRO_ENABLE           = yes # Enable N-Key Rollover
     RGBLIGHT_ENABLE       = no  # Enable keyboard RGB underglow
 
-    KEYBOARD_SHARED_EP    = yes
-    MOUSE_SHARED_EP       = yes
+    MOUSE_SHARED_EP       = no
 
     AUTOCORRECT_ENABLE    = yes
     CAPS_WORD_ENABLE      = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
index d4aa71440d..d80d006796 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
@@ -133,14 +133,24 @@ bool oled_task_keymap(void) {
 
 //    render_rgb_hsv(1, 13);
     oled_set_cursor(1, 13);
-    // oled_write_P(PSTR("Timer:"), false);
-    // oled_write(get_u8_str((uint8_t)(timer_elapsed32(oled_timer) / 1000), ' '), false);
-    oled_write_P(PSTR("Status: "), false);
-    if (is_oled_enabled) {
-        oled_write_P(PSTR("on "), false);
-    } else {
-        oled_write_P(PSTR("off"), false);
-    }
+    oled_write_P(PSTR("OS: "), false);
+    extern os_variant_t os_type;
+        switch (os_type) {
+            case OS_LINUX:
+                oled_write_ln_P(PSTR("Linux"), false);
+                break;
+            case OS_WINDOWS:
+                oled_write_ln_P(PSTR("Windows"), false);
+                break;
+            case OS_MACOS:
+                oled_write_ln_P(PSTR("MacOS"), false);
+                break;
+            case OS_IOS:
+                oled_write_ln_P(PSTR("iOS"), false);
+                break;
+            default:
+                break;
+        }
 
     render_keylogger_status(1, 14);