3 files changed, 15 insertions(+), 11 deletions(-)

M users/xulkal/config.h
M users/xulkal/custom_rgb.c
M users/xulkal/process_records.c

@@ 28,3 28,7 @@
 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 #define DISABLE_RGB_MATRIX_SPLASH
 #define DISABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+#define RGB_DISABLE_TIMEOUT 1200000
+#define OLED_SCROLL_TIMEOUT 20000

@@ 10,17 10,17 @@ void rgb_matrix_increase_flags(void)
             }
             break;
         case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                rgb_matrix_set_color_all(0, 0, 0);
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_disable_noeeprom();
             }
             break;
         case LED_FLAG_UNDERGLOW: {
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-                rgb_matrix_disable_noeeprom();
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_set_color_all(0, 0, 0);
             }
             break;
         default: {
-                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                 rgb_matrix_enable_noeeprom();
             }
             break;


@@ 31,8 31,8 @@ void rgb_matrix_decrease_flags(void)
 {
     switch (rgb_matrix_get_flags()) {
         case LED_FLAG_ALL: {
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-                rgb_matrix_disable_noeeprom();
+                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                rgb_matrix_set_color_all(0, 0, 0);
             }
             break;
         case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {


@@ 41,12 41,12 @@ void rgb_matrix_decrease_flags(void)
             }
             break;
         case LED_FLAG_UNDERGLOW: {
-                rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                rgb_matrix_set_color_all(0, 0, 0);
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_disable_noeeprom();
             }
             break;
         default: {
-                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
                 rgb_matrix_enable_noeeprom();
             }
             break;

@@ 40,7 40,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 #ifdef RGB_MATRIX_TOG_LAYERS
         case RGB_TOG:
             if (record->event.pressed) {
-              rgb_matrix_decrease_flags();
+              rgb_matrix_increase_flags();
             }
             return false;
 #endif