1 files changed, 5 insertions, 23 deletions
diff --git a/quantum/rgb_matrix_animations/solid_reactive_anim.h b/quantum/rgb_matrix_animations/solid_reactive_anim.h
index 37e339907a..762a95db31 100644
--- a/quantum/rgb_matrix_animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix_animations/solid_reactive_anim.h
@@ -3,30 +3,12 @@
 RGB_MATRIX_EFFECT(SOLID_REACTIVE)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-bool SOLID_REACTIVE(effect_params_t* params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-  HSV hsv = { rgb_matrix_config.hue, 255, rgb_matrix_config.val };
-  // Max tick based on speed scale ensures results from scale16by8 with rgb_matrix_config.speed are no greater than 255
-  uint16_t max_tick = 65535 / rgb_matrix_config.speed;
-  // Relies on hue being 8-bit and wrapping
-  for (uint8_t i = led_min; i < led_max; i++) {
-    RGB_MATRIX_TEST_LED_FLAGS();
-    uint16_t tick = max_tick;
-    // Reverse search to find most recent key hit
-    for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
-      if (g_last_hit_tracker.index[j] == i && g_last_hit_tracker.tick[j] < tick) {
-        tick = g_last_hit_tracker.tick[j];
-        break;
-      }
-    }
+static void SOLID_REACTIVE_math(HSV* hsv, uint16_t offset) {
+    hsv->h = rgb_matrix_config.hue + qsub8(130, offset);
+}
 
-    uint16_t  offset = scale16by8(tick, rgb_matrix_config.speed);
-    hsv.h = rgb_matrix_config.hue + qsub8(130, offset);
-    RGB rgb = hsv_to_rgb(hsv);
-    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-  }
-  return led_max < DRIVER_LED_TOTAL;
+bool SOLID_REACTIVE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_math);
 }
 
 #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS