Merge remote-tracking branch 'upstream/master'

1 files changed, 21 insertions, 17 deletions

diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index 115623caa4..ca2376145d 100644
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -1,9 +1,8 @@
 #include "process_records.h"
 #include "custom_keycodes.h"
-#include "timer_utils.h"
 
-#if defined(RGB_MATRIX_ENABLE)
-extern void eeconfig_update_rgb_matrix_default(void);
+#ifdef RGB_ENABLE
+#include "custom_rgb.h"
 #endif
 
 #ifdef TRILAYER_ENABLED
@@ -18,37 +17,36 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
     static uint16_t reset_timer;
 
 #ifndef TAP_DANCE_ENABLE
-    if (!process_tap_dance_double(keycode, record))
+    if (!process_custom_tap_dance(keycode, record))
         return false;
 #endif
 
     switch (keycode)
     {
         case RGBRST:
-            {
-#if defined(RGBLIGHT_ENABLE)
-                if (record->event.pressed)
-                {
-                    eeconfig_update_rgblight_default();
-                    rgblight_enable();
-                }
-#elif defined(RGB_MATRIX_ENABLE)
-                if (record->event.pressed)
-                    eeconfig_update_rgb_matrix_default();
+#ifdef RGB_ENABLE
+            if (record->event.pressed)
+                rgb_reset();
 #endif
-            }
             return false;
         case RESET:
             {
                 if (record->event.pressed)
                     reset_timer = timer_read() + 500;
-                else if (timer_expired(reset_timer))
+                else if (timer_expired(timer_read(), reset_timer))
                     reset_keyboard();
             }
             return false;
+#ifdef RGB_MATRIX_TOG_LAYERS
+        case RGB_TOG:
+            if (record->event.pressed) {
+              rgb_matrix_increase_flags();
+            }
+            return false;
+#endif
   }
 
-  return process_record_keymap(keycode, record);
+  return process_record_encoder(keycode, record) && process_record_keymap(keycode, record);
 }
 
 __attribute__ ((weak))
@@ -56,3 +54,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
 {
     return true;
 }
+
+__attribute__ ((weak))
+bool process_record_encoder(uint16_t keycode, keyrecord_t *record)
+{
+    return true;
+}