From ea2819b2c2f1fbb9bf85010602758166530939ce Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 26 Sep 2022 14:40:15 +1000
Subject: Change `{LED,RGB}_DISABLE_TIMEOUT` to `{LED,RGB}_MATRIX_TIMEOUT`
 (#18415)

---
 users/bbaserdem/config.h              | 2 +-
 users/drashna/rgb/rgb_matrix_config.h | 1 -
 users/vitoni/rgb_matrix_effects.h     | 6 +++---
 users/vitoni/vitoni.c                 | 8 ++++----
 users/xulkal/config.h                 | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'users')

diff --git a/users/bbaserdem/config.h b/users/bbaserdem/config.h
index 477378102b..3c467d5e7d 100644
--- a/users/bbaserdem/config.h
+++ b/users/bbaserdem/config.h
@@ -121,7 +121,7 @@
 // For perkey leds
 #ifdef RGB_MATRIX_ENABLE
 // This is not working
-//#   define RGB_DISABLE_TIMEOUT 1800000
+//#   define RGB_MATRIX_TIMEOUT 1800000
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED true
     // Start using this mode
 #   define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_BEACON
diff --git a/users/drashna/rgb/rgb_matrix_config.h b/users/drashna/rgb/rgb_matrix_config.h
index 33979a198e..86f238f392 100644
--- a/users/drashna/rgb/rgb_matrix_config.h
+++ b/users/drashna/rgb/rgb_matrix_config.h
@@ -6,7 +6,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/users/vitoni/rgb_matrix_effects.h b/users/vitoni/rgb_matrix_effects.h
index ed74500b18..c3234b159b 100644
--- a/users/vitoni/rgb_matrix_effects.h
+++ b/users/vitoni/rgb_matrix_effects.h
@@ -22,7 +22,7 @@ enum states {
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
     ,FADE_OUT           //!< before supending
 #endif
-    ,SUSPENDED          //!< expecting to be suspended by RGB_DISABLE_TIMEOUT any time
+    ,SUSPENDED          //!< expecting to be suspended by RGB_MATRIX_TIMEOUT any time
 };
 
 /**
@@ -99,8 +99,8 @@ bool fade_in(const uint8_t time);
 #endif
 
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
-#   if !defined(RGB_DISABLE_TIMEOUT)
-#       warning "RGB_DISABLE_WITH_FADE_OUT expects RGB_DISABLE_TIMEOUT to be defined"
+#   if !defined(RGB_MATRIX_TIMEOUT)
+#       warning "RGB_DISABLE_WITH_FADE_OUT expects RGB_MATRIX_TIMEOUT to be defined"
 #   endif
 #endif
 
diff --git a/users/vitoni/vitoni.c b/users/vitoni/vitoni.c
index 2a0ff5c46f..f8cb50ea78 100644
--- a/users/vitoni/vitoni.c
+++ b/users/vitoni/vitoni.c
@@ -31,17 +31,17 @@ void matrix_scan_user_rgb(void) {
 #endif
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
     const uint32_t fade_out_duration = scale_2_rgb_time(128);
-    const uint32_t start_fade_out_after_millis = (RGB_DISABLE_TIMEOUT) > fade_out_duration
-        ? (RGB_DISABLE_TIMEOUT) - fade_out_duration
+    const uint32_t start_fade_out_after_millis = (RGB_MATRIX_TIMEOUT) > fade_out_duration
+        ? (RGB_MATRIX_TIMEOUT) - fade_out_duration
         : 0;
 
     if (start_fade_out_after_millis <= inactivity_millis) {
         update_value(&state, FADE_OUT, &calc_offset);
     }
-#elif defined(RGB_DISABLE_TIMEOUT)
+#elif defined(RGB_MATRIX_TIMEOUT)
     // having to set brightness "manually" to black as starting point for fade in
     // for the time when returning from suspended state
-    if (RGB_DISABLE_TIMEOUT <= inactivity_millis + 15) {
+    if (RGB_MATRIX_TIMEOUT <= inactivity_millis + 15) {
         rgb_matrix_config.hsv.v = 0;
         state = SUSPENDED;
     }
diff --git a/users/xulkal/config.h b/users/xulkal/config.h
index 88e3efbe72..7f7782807e 100644
--- a/users/xulkal/config.h
+++ b/users/xulkal/config.h
@@ -31,5 +31,5 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-#define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_MATRIX_TIMEOUT 1200000
 #define OLED_SCROLL_TIMEOUT 20000
-- 
cgit v1.2.3