X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Frgb_matrix_animations%2Fsolid_reactive_anim.h;h=dd49b6530eb6fba8c4c30a773fda11474bce412a;hb=cf215487ba35c6754cd1c52bb900a46bb52ed3a3;hp=220e542331a5feb9a677f46c6831d6270d263f54;hpb=c98247e3dd2958bd2d8969dc75170e7e2757b895;p=qmk_firmware.git

diff --git a/quantum/rgb_matrix_animations/solid_reactive_anim.h b/quantum/rgb_matrix_animations/solid_reactive_anim.h
index 220e54233..dd49b6530 100644
--- a/quantum/rgb_matrix_animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix_animations/solid_reactive_anim.h
@@ -1,33 +1,17 @@
-#pragma once
-#if defined(RGB_MATRIX_KEYREACTIVE_ENABLED)
+#ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 #ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE
+RGB_MATRIX_EFFECT(SOLID_REACTIVE)
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-extern rgb_config_t rgb_matrix_config;
-extern last_hit_t g_last_hit_tracker;
-
-bool rgb_matrix_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++) {
-    uint16_t tick = max_tick;
-    for(uint8_t j = 0; j < g_last_hit_tracker.count; 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 HSV SOLID_REACTIVE_math(HSV hsv,  uint16_t offset) {
+    hsv.h += qsub8(130, offset);
+    return hsv;
+}
 
-    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 // DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED)
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED