Merge remote-tracking branch 'qmk/master' into merge-2022-09-10

2022-09-10 04:10:44 -06:00
parent dda43c887d 405a32ddf4
commit d4fa6703b8
9866 changed files with 143396 additions and 44465 deletions
--- a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
@ -5,6 +5,9 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE)
 #        ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS

 static HSV SOLID_REACTIVE_SIMPLE_math(HSV hsv, uint16_t offset) {
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
    hsv.v = scale8(255 - offset, hsv.v);
    return hsv;
 }