X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Frgb_matrix_animations%2Fcolorband_spiral_val_anim.h;h=1d4cc0c84fe722647cbfd94ba21a22c5caa17543;hb=cf215487ba35c6754cd1c52bb900a46bb52ed3a3;hp=5aea0c8da11f59572080e8e6cd28252cf925c3f6;hpb=6b8be985551efc5a5f95dfea6dc1554352bc46e0;p=qmk_firmware.git

diff --git a/quantum/rgb_matrix_animations/colorband_spiral_val_anim.h b/quantum/rgb_matrix_animations/colorband_spiral_val_anim.h
index 5aea0c8da..1d4cc0c84 100644
--- a/quantum/rgb_matrix_animations/colorband_spiral_val_anim.h
+++ b/quantum/rgb_matrix_animations/colorband_spiral_val_anim.h
@@ -2,21 +2,13 @@
 RGB_MATRIX_EFFECT(BAND_SPIRAL_VAL)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-bool BAND_SPIRAL_VAL(effect_params_t* params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
+static HSV BAND_SPIRAL_VAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) {
+    hsv.v = scale8(hsv.v + dist - time - atan2_8(dy, dx), hsv.v);
+    return hsv;
+}
 
-  HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, 0 };
-  uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 2);
-  for (uint8_t i = led_min; i < led_max; i++) {
-    RGB_MATRIX_TEST_LED_FLAGS();
-    int16_t dx = g_led_config.point[i].x - 112;
-    int16_t dy = g_led_config.point[i].y - 32;
-    uint8_t dist = sqrt16(dx * dx + dy * dy);
-    hsv.v = rgb_matrix_config.val + dist - time - atan2_8(dy, dx);
-    RGB rgb = hsv_to_rgb(hsv);
-    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-  }
-  return led_max < DRIVER_LED_TOTAL;
+bool BAND_SPIRAL_VAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_VAL_math);
 }
 
 #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS