Merge remote-tracking branch 'origin/develop' into xap

qmk · Oct 28, 2024 · 1647ce2 · 1647ce2
2 parents b394a46 + dd7287b
commit 1647ce2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
@@ -2,25 +2,33 @@
 RGB_MATRIX_EFFECT(JELLYBEAN_RAINDROPS)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static void jellybean_raindrops_set_color(int i, effect_params_t* params) {
+static void jellybean_raindrops_set_color(uint8_t i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+
     hsv_t hsv = {random8(), random8_min_max(127, 255), rgb_matrix_config.hsv.v};
     rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 }
 
 bool JELLYBEAN_RAINDROPS(effect_params_t* params) {
+    static uint16_t index = RGB_MATRIX_LED_COUNT + 1;
+
+    // Periodic trigger for LED change
+    if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 5 == 0)) {
+        index = random8_max(RGB_MATRIX_LED_COUNT);
+    }
+
     RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    if (!params->init) {
-        // Change one LED every tick, make sure speed is not 0
-        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 5 == 0) {
-            jellybean_raindrops_set_color(random8_max(RGB_MATRIX_LED_COUNT), params);
-        }
-    } else {
-        for (int i = led_min; i < led_max; i++) {
+    if (params->init) {
+        for (uint8_t i = led_min; i < led_max; i++) {
             jellybean_raindrops_set_color(i, params);
         }
     }
+    // Change LED once and set index out of range till next trigger
+    else if (led_min <= index && index < led_max) {
+        jellybean_raindrops_set_color(index, params);
+        index = RGB_MATRIX_LED_COUNT + 1;
+    }
     return rgb_matrix_check_finished_leds(led_max);
 }
 

diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -6,25 +6,20 @@ RGB_MATRIX_EFFECT(PIXEL_RAIN)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 static bool PIXEL_RAIN(effect_params_t* params) {
-    static uint32_t wait_timer = 0;
+    static fast_timer_t timer = 0;
+    static uint16_t     index = RGB_MATRIX_LED_COUNT + 1;
 
-    inline uint32_t interval(void) {
-        return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    if ((params->iter == 0) && (timer_elapsed_fast(timer) > (320 - rgb_matrix_config.speed))) {
+        index = random8_max(RGB_MATRIX_LED_COUNT);
+        timer = timer_read_fast();
     }
 
-    inline void rain_pixel(uint8_t led_index) {
-        if (!HAS_ANY_FLAGS(g_led_config.flags[led_index], params->flags)) {
-            return;
-        }
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    if (led_min <= index && index < led_max && HAS_ANY_FLAGS(g_led_config.flags[index], params->flags)) {
         hsv_t hsv = (random8() & 2) ? (hsv_t){0, 0, 0} : (hsv_t){random8(), random8_min_max(127, 255), rgb_matrix_config.hsv.v};
         rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
-        rgb_matrix_set_color(led_index, rgb.r, rgb.g, rgb.b);
-        wait_timer = g_rgb_timer + interval();
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    if (g_rgb_timer > wait_timer) {
-        rain_pixel(random8_max(RGB_MATRIX_LED_COUNT));
+        rgb_matrix_set_color(index, rgb.r, rgb.g, rgb.b);
+        index = RGB_MATRIX_LED_COUNT + 1;
     }
     return rgb_matrix_check_finished_leds(led_max);
 }