[Keymap] Xulkal keymap tweeks (#5746)

* Minor keymap tweeks and more oled data

* Update keymap.c

diff --git a/keyboards/sol/keymaps/xulkal/keymap.c b/keyboards/sol/keymaps/xulkal/keymap.c
index be64d9e7c3a646212335caf0b16f61f4a6dcc72e..4591034d21f31b2b1c461da93988eaba7d94eeb9 100644 (file)
--- a/keyboards/sol/keymaps/xulkal/keymap.c
+++ b/keyboards/sol/keymaps/xulkal/keymap.c
@@ -92,15 +92,29 @@ static void render_logo(void) {
   oled_write_P(sol_logo, false);
 }
 
+extern rgb_config_t rgb_matrix_config;
+
 static void render_status(void) {
   // Render to mode icon
-  static const char PROGMEM mode_logo[2][4] = {
-    {0x97,0x98,0x0a,0},
-    {0xb7,0xb8,0x0a,0} };
+  static const char PROGMEM mode_logo[2][3] = {
+    {0x97,0x98,0},
+    {0xb7,0xb8,0} };
 
     oled_write_P(mode_logo[0], false);
+
+#if defined(RGB_MATRIX_ENABLE)
+    static char buffer[20] = {0};
+    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
+    oled_write(buffer, false);
+#endif
+
     oled_write_P(mode_logo[1], false);
 
+#if defined(RGB_MATRIX_ENABLE)
+    snprintf(buffer, sizeof(buffer), "         s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
+    oled_write(buffer, false);
+#endif
+
   // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
   oled_write_P(PSTR("Layer: "), false);
   switch (biton32(layer_state)) {

diff --git a/users/xulkal/config.h b/users/xulkal/config.h
index 5f56f7a14b11425475cbf5cfe304e68d370869bf..6ff4ca49df44225531fd42d1bac8f5ff517292c3 100644 (file)
--- a/users/xulkal/config.h
+++ b/users/xulkal/config.h
@@ -11,3 +11,17 @@
 #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC
 #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS
 #define RCPO_KEYS KC_RCTL, KC_TRNS, KC_EQL
+
+// No need for the single versions when multi performance isn't a problem =D
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+
+// Don't like or feel to identical to other effects
+#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS

diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index af849a0729672ceacf7732681138beb1c2319eb3..531f99eb065c166b9aef7814c1bf1f5ed7451781 100644 (file)
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -11,6 +11,10 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 #endif
 
+#if defined(RGB_MATRIX_ENABLE)
+extern void eeconfig_update_rgb_matrix_default(void);
+#endif
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -56,12 +60,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
+#if defined(RGBLIGHT_ENABLE)
         if (record->event.pressed) {
           eeconfig_update_rgblight_default();
           rgblight_enable();
         }
-      #endif
+#elif defined(RGB_MATRIX_ENABLE)
+        if (record->event.pressed) {
+          eeconfig_update_rgb_matrix_default();
+        }
+#endif
       return false;
       break;
   }