Fix starlight RGB animation to observe rgb on/off state & display ind…

…icators
qmk · Jun 2, 2024 · b824245 · b824245
1 parent 2f37a78
commit b824245
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/quantum/rgb_matrix/animations/starlight_anim.h b/quantum/rgb_matrix/animations/starlight_anim.h
@@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 void set_starlight_color(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
     uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
     HSV      hsv  = rgb_matrix_config.hsv;
     hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
@@ -11,20 +12,19 @@ void set_starlight_color(int i, effect_params_t* params) {
 }
 
 bool STARLIGHT(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (!params->init) {
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
             int rand_led = rand() % RGB_MATRIX_LED_COUNT;
             set_starlight_color(rand_led, params);
         }
-        return false;
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (int i = led_min; i < led_max; i++) {
-        set_starlight_color(i, params);
+    } else {
+        for (int i = led_min; i < led_max; i++) {
+            set_starlight_color(i, params);
+        }
     }
     return rgb_matrix_check_finished_leds(led_max);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif     // ENABLE_RGB_MATRIX_STARLIGHT
+#endif     // ENABLE_RGB_MATRIX_STARLIGHT
diff --git a/quantum/rgb_matrix/animations/starlight_dual_hue_anim.h b/quantum/rgb_matrix/animations/starlight_dual_hue_anim.h
@@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT_DUAL_HUE)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 void set_starlight_dual_hue_color(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
     uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
     HSV      hsv  = rgb_matrix_config.hsv;
     hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
@@ -12,20 +13,19 @@ void set_starlight_dual_hue_color(int i, effect_params_t* params) {
 }
 
 bool STARLIGHT_DUAL_HUE(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (!params->init) {
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
             int rand_led = rand() % RGB_MATRIX_LED_COUNT;
             set_starlight_dual_hue_color(rand_led, params);
         }
-        return false;
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (int i = led_min; i < led_max; i++) {
-        set_starlight_dual_hue_color(i, params);
+    } else {
+        for (int i = led_min; i < led_max; i++) {
+            set_starlight_dual_hue_color(i, params);
+        }
     }
     return rgb_matrix_check_finished_leds(led_max);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
+#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
diff --git a/quantum/rgb_matrix/animations/starlight_dual_sat_anim.h b/quantum/rgb_matrix/animations/starlight_dual_sat_anim.h
@@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(STARLIGHT_DUAL_SAT)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 void set_starlight_dual_sat_color(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
     uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
     HSV      hsv  = rgb_matrix_config.hsv;
     hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
@@ -12,20 +13,19 @@ void set_starlight_dual_sat_color(int i, effect_params_t* params) {
 }
 
 bool STARLIGHT_DUAL_SAT(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (!params->init) {
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 5)) % 5 == 0) {
             int rand_led = rand() % RGB_MATRIX_LED_COUNT;
             set_starlight_dual_sat_color(rand_led, params);
         }
-        return false;
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (int i = led_min; i < led_max; i++) {
-        set_starlight_dual_sat_color(i, params);
+    } else {
+        for (int i = led_min; i < led_max; i++) {
+            set_starlight_dual_sat_color(i, params);
+        }
     }
     return rgb_matrix_check_finished_leds(led_max);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
+#endif     // ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT