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

qmk · Oct 28, 2024 · 5b42ce0 · 5b42ce0
2 parents 1647ce2 + 25fac5e
commit 5b42ce0
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/quantum/rgb_matrix/animations/breathing_anim.h b/quantum/rgb_matrix/animations/breathing_anim.h
@@ -2,18 +2,13 @@
 RGB_MATRIX_EFFECT(BREATHING)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-bool BREATHING(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+hsv_t BREATHING_math(hsv_t hsv, uint8_t i, uint8_t time) {
+    hsv.v = scale8(abs8(sin8(time / 2) - 128) * 2, hsv.v);
+    return hsv;
+}
 
-    hsv_t    hsv  = rgb_matrix_config.hsv;
-    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
-    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
-    rgb_t rgb     = rgb_matrix_hsv_to_rgb(hsv);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        RGB_MATRIX_TEST_LED_FLAGS();
-        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-    }
-    return rgb_matrix_check_finished_leds(led_max);
+bool BREATHING(effect_params_t* params) {
+    return effect_runner_i(params, &BREATHING_math);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS