diff options
Diffstat (limited to 'quantum/led_matrix_animations')
-rw-r--r-- | quantum/led_matrix_animations/alpha_mods_anim.h | 2 | ||||
-rw-r--r-- | quantum/led_matrix_animations/band_anim.h | 6 | ||||
-rw-r--r-- | quantum/led_matrix_animations/band_pinwheel_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/band_spiral_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/breathing_anim.h | 2 | ||||
-rw-r--r-- | quantum/led_matrix_animations/cycle_left_right_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/cycle_out_in_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/cycle_up_down_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/dual_beacon_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/solid_reactive_cross.h | 12 | ||||
-rw-r--r-- | quantum/led_matrix_animations/solid_reactive_nexus.h | 12 | ||||
-rw-r--r-- | quantum/led_matrix_animations/solid_reactive_simple_anim.h | 12 | ||||
-rw-r--r-- | quantum/led_matrix_animations/solid_reactive_wide.h | 12 | ||||
-rw-r--r-- | quantum/led_matrix_animations/solid_splash_anim.h | 12 | ||||
-rw-r--r-- | quantum/led_matrix_animations/wave_left_right_anim.h | 10 | ||||
-rw-r--r-- | quantum/led_matrix_animations/wave_up_down_anim.h | 10 |
16 files changed, 48 insertions, 102 deletions
diff --git a/quantum/led_matrix_animations/alpha_mods_anim.h b/quantum/led_matrix_animations/alpha_mods_anim.h index a4638fde6..6f69f6892 100644 --- a/quantum/led_matrix_animations/alpha_mods_anim.h +++ b/quantum/led_matrix_animations/alpha_mods_anim.h | |||
@@ -21,4 +21,4 @@ bool ALPHAS_MODS(effect_params_t* params) { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 23 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
24 | #endif // DISABLE_LED_MATRIX_ALPHAS_MODS | 24 | #endif // DISABLE_LED_MATRIX_ALPHAS_MODS |
diff --git a/quantum/led_matrix_animations/band_anim.h b/quantum/led_matrix_animations/band_anim.h index 4a2b746a7..523dba1b7 100644 --- a/quantum/led_matrix_animations/band_anim.h +++ b/quantum/led_matrix_animations/band_anim.h | |||
@@ -7,9 +7,7 @@ static uint8_t BAND_math(uint8_t val, uint8_t i, uint8_t time) { | |||
7 | return scale8(v < 0 ? 0 : v, val); | 7 | return scale8(v < 0 ? 0 : v, val); |
8 | } | 8 | } |
9 | 9 | ||
10 | bool BAND(effect_params_t* params) { | 10 | bool BAND(effect_params_t* params) { return effect_runner_i(params, &BAND_math); } |
11 | return effect_runner_i(params, &BAND_math); | ||
12 | } | ||
13 | 11 | ||
14 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 12 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
15 | #endif // DISABLE_LED_MATRIX_BAND | 13 | #endif // DISABLE_LED_MATRIX_BAND |
diff --git a/quantum/led_matrix_animations/band_pinwheel_anim.h b/quantum/led_matrix_animations/band_pinwheel_anim.h index 9836320d2..fb3b835ca 100644 --- a/quantum/led_matrix_animations/band_pinwheel_anim.h +++ b/quantum/led_matrix_animations/band_pinwheel_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(BAND_PINWHEEL) | 2 | LED_MATRIX_EFFECT(BAND_PINWHEEL) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) { | 5 | static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) { return scale8(val - time - atan2_8(dy, dx) * 3, val); } |
6 | return scale8(val - time - atan2_8(dy, dx) * 3, val); | ||
7 | } | ||
8 | 6 | ||
9 | bool BAND_PINWHEEL(effect_params_t* params) { | 7 | bool BAND_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_math); } |
10 | return effect_runner_dx_dy(params, &BAND_PINWHEEL_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_BAND_PINWHEEL | 10 | #endif // DISABLE_LED_MATRIX_BAND_PINWHEEL |
diff --git a/quantum/led_matrix_animations/band_spiral_anim.h b/quantum/led_matrix_animations/band_spiral_anim.h index be17c03aa..fca22aad9 100644 --- a/quantum/led_matrix_animations/band_spiral_anim.h +++ b/quantum/led_matrix_animations/band_spiral_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(BAND_SPIRAL) | 2 | LED_MATRIX_EFFECT(BAND_SPIRAL) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { | 5 | static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(val + dist - time - atan2_8(dy, dx), val); } |
6 | return scale8(val + dist - time - atan2_8(dy, dx), val); | ||
7 | } | ||
8 | 6 | ||
9 | bool BAND_SPIRAL(effect_params_t* params) { | 7 | bool BAND_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math); } |
10 | return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_BAND_SPIRAL | 10 | #endif // DISABLE_LED_MATRIX_BAND_SPIRAL |
diff --git a/quantum/led_matrix_animations/breathing_anim.h b/quantum/led_matrix_animations/breathing_anim.h index 4f49f5069..00310e3f6 100644 --- a/quantum/led_matrix_animations/breathing_anim.h +++ b/quantum/led_matrix_animations/breathing_anim.h | |||
@@ -16,4 +16,4 @@ bool BREATHING(effect_params_t* params) { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 18 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
19 | #endif // DISABLE_LED_MATRIX_BREATHING | 19 | #endif // DISABLE_LED_MATRIX_BREATHING |
diff --git a/quantum/led_matrix_animations/cycle_left_right_anim.h b/quantum/led_matrix_animations/cycle_left_right_anim.h index 404fda26f..51e81d57c 100644 --- a/quantum/led_matrix_animations/cycle_left_right_anim.h +++ b/quantum/led_matrix_animations/cycle_left_right_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) | 2 | LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { | 5 | static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].x - time, val); } |
6 | return scale8(g_led_config.point[i].x - time, val); | ||
7 | } | ||
8 | 6 | ||
9 | bool CYCLE_LEFT_RIGHT(effect_params_t* params) { | 7 | bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); } |
10 | return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT | 10 | #endif // DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT |
diff --git a/quantum/led_matrix_animations/cycle_out_in_anim.h b/quantum/led_matrix_animations/cycle_out_in_anim.h index 3f5fc5b18..f62061552 100644 --- a/quantum/led_matrix_animations/cycle_out_in_anim.h +++ b/quantum/led_matrix_animations/cycle_out_in_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(CYCLE_OUT_IN) | 2 | LED_MATRIX_EFFECT(CYCLE_OUT_IN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { | 5 | static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(3 * dist / 2 + time, val); } |
6 | return scale8(3 * dist / 2 + time, val); | ||
7 | } | ||
8 | 6 | ||
9 | bool CYCLE_OUT_IN(effect_params_t* params) { | 7 | bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); } |
10 | return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_CYCLE_OUT_IN | 10 | #endif // DISABLE_LED_MATRIX_CYCLE_OUT_IN |
diff --git a/quantum/led_matrix_animations/cycle_up_down_anim.h b/quantum/led_matrix_animations/cycle_up_down_anim.h index 25fc211b1..bd1d12567 100644 --- a/quantum/led_matrix_animations/cycle_up_down_anim.h +++ b/quantum/led_matrix_animations/cycle_up_down_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(CYCLE_UP_DOWN) | 2 | LED_MATRIX_EFFECT(CYCLE_UP_DOWN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { | 5 | static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].y - time, val); } |
6 | return scale8(g_led_config.point[i].y - time, val); | ||
7 | } | ||
8 | 6 | ||
9 | bool CYCLE_UP_DOWN(effect_params_t* params) { | 7 | bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); } |
10 | return effect_runner_i(params, &CYCLE_UP_DOWN_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_CYCLE_UP_DOWN | 10 | #endif // DISABLE_LED_MATRIX_CYCLE_UP_DOWN |
diff --git a/quantum/led_matrix_animations/dual_beacon_anim.h b/quantum/led_matrix_animations/dual_beacon_anim.h index 1fa1df139..9b8a7877c 100644 --- a/quantum/led_matrix_animations/dual_beacon_anim.h +++ b/quantum/led_matrix_animations/dual_beacon_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(DUAL_BEACON) | 2 | LED_MATRIX_EFFECT(DUAL_BEACON) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) { | 5 | static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) { return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val); } |
6 | return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val); | ||
7 | } | ||
8 | 6 | ||
9 | bool DUAL_BEACON(effect_params_t* params) { | 7 | bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); } |
10 | return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_DUAL_BEACON | 10 | #endif // DISABLE_LED_MATRIX_DUAL_BEACON |
diff --git a/quantum/led_matrix_animations/solid_reactive_cross.h b/quantum/led_matrix_animations/solid_reactive_cross.h index a50d1fc62..f402d99b3 100644 --- a/quantum/led_matrix_animations/solid_reactive_cross.h +++ b/quantum/led_matrix_animations/solid_reactive_cross.h | |||
@@ -23,17 +23,13 @@ static uint8_t SOLID_REACTIVE_CROSS_math(uint8_t val, int16_t dx, int16_t dy, ui | |||
23 | } | 23 | } |
24 | 24 | ||
25 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS | 25 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS |
26 | bool SOLID_REACTIVE_CROSS(effect_params_t* params) { | 26 | bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); } |
27 | return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); | ||
28 | } | ||
29 | # endif | 27 | # endif |
30 | 28 | ||
31 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS | 29 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS |
32 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { | 30 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); } |
33 | return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); | ||
34 | } | ||
35 | # endif | 31 | # endif |
36 | 32 | ||
37 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 33 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
38 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) | 34 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) |
39 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 35 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
diff --git a/quantum/led_matrix_animations/solid_reactive_nexus.h b/quantum/led_matrix_animations/solid_reactive_nexus.h index 4638aac5a..4d0d25226 100644 --- a/quantum/led_matrix_animations/solid_reactive_nexus.h +++ b/quantum/led_matrix_animations/solid_reactive_nexus.h | |||
@@ -20,17 +20,13 @@ static uint8_t SOLID_REACTIVE_NEXUS_math(uint8_t val, int16_t dx, int16_t dy, ui | |||
20 | } | 20 | } |
21 | 21 | ||
22 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS | 22 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS |
23 | bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { | 23 | bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); } |
24 | return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); | ||
25 | } | ||
26 | # endif | 24 | # endif |
27 | 25 | ||
28 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS | 26 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS |
29 | bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { | 27 | bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); } |
30 | return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); | ||
31 | } | ||
32 | # endif | 28 | # endif |
33 | 29 | ||
34 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 30 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
35 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) | 31 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) |
36 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 32 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
diff --git a/quantum/led_matrix_animations/solid_reactive_simple_anim.h b/quantum/led_matrix_animations/solid_reactive_simple_anim.h index e1166a4fb..30e2527f6 100644 --- a/quantum/led_matrix_animations/solid_reactive_simple_anim.h +++ b/quantum/led_matrix_animations/solid_reactive_simple_anim.h | |||
@@ -3,14 +3,10 @@ | |||
3 | LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE) | 3 | LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE) |
4 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 4 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
5 | 5 | ||
6 | static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) { | 6 | static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) { return scale8(255 - offset, val); } |
7 | return scale8(255 - offset, val); | ||
8 | } | ||
9 | 7 | ||
10 | bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { | 8 | bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); } |
11 | return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); | ||
12 | } | ||
13 | 9 | ||
14 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 10 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
15 | # endif // DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE | 11 | # endif // DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE |
16 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 12 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
diff --git a/quantum/led_matrix_animations/solid_reactive_wide.h b/quantum/led_matrix_animations/solid_reactive_wide.h index 4bcaba331..34a230c25 100644 --- a/quantum/led_matrix_animations/solid_reactive_wide.h +++ b/quantum/led_matrix_animations/solid_reactive_wide.h | |||
@@ -18,17 +18,13 @@ static uint8_t SOLID_REACTIVE_WIDE_math(uint8_t val, int16_t dx, int16_t dy, uin | |||
18 | } | 18 | } |
19 | 19 | ||
20 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE | 20 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE |
21 | bool SOLID_REACTIVE_WIDE(effect_params_t* params) { | 21 | bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); } |
22 | return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); | ||
23 | } | ||
24 | # endif | 22 | # endif |
25 | 23 | ||
26 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE | 24 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE |
27 | bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { | 25 | bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); } |
28 | return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); | ||
29 | } | ||
30 | # endif | 26 | # endif |
31 | 27 | ||
32 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 28 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
33 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) | 29 | # endif // !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) |
34 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 30 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
diff --git a/quantum/led_matrix_animations/solid_splash_anim.h b/quantum/led_matrix_animations/solid_splash_anim.h index 3e9046640..4f6ba3d34 100644 --- a/quantum/led_matrix_animations/solid_splash_anim.h +++ b/quantum/led_matrix_animations/solid_splash_anim.h | |||
@@ -18,17 +18,13 @@ uint8_t SOLID_SPLASH_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uin | |||
18 | } | 18 | } |
19 | 19 | ||
20 | # ifndef DISABLE_LED_MATRIX_SOLID_SPLASH | 20 | # ifndef DISABLE_LED_MATRIX_SOLID_SPLASH |
21 | bool SOLID_SPLASH(effect_params_t* params) { | 21 | bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); } |
22 | return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); | ||
23 | } | ||
24 | # endif | 22 | # endif |
25 | 23 | ||
26 | # ifndef DISABLE_LED_MATRIX_SOLID_MULTISPLASH | 24 | # ifndef DISABLE_LED_MATRIX_SOLID_MULTISPLASH |
27 | bool SOLID_MULTISPLASH(effect_params_t* params) { | 25 | bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); } |
28 | return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); | ||
29 | } | ||
30 | # endif | 26 | # endif |
31 | 27 | ||
32 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 28 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
33 | # endif // !defined(DISABLE_LED_MATRIX_SPLASH) && !defined(DISABLE_LED_MATRIX_MULTISPLASH) | 29 | # endif // !defined(DISABLE_LED_MATRIX_SPLASH) && !defined(DISABLE_LED_MATRIX_MULTISPLASH) |
34 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 30 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
diff --git a/quantum/led_matrix_animations/wave_left_right_anim.h b/quantum/led_matrix_animations/wave_left_right_anim.h index d547c72ce..736f22ddc 100644 --- a/quantum/led_matrix_animations/wave_left_right_anim.h +++ b/quantum/led_matrix_animations/wave_left_right_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT) | 2 | LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { | 5 | static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].x - time), val); } |
6 | return scale8(sin8(g_led_config.point[i].x - time), val); | ||
7 | } | ||
8 | 6 | ||
9 | bool WAVE_LEFT_RIGHT(effect_params_t* params) { | 7 | bool WAVE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &WAVE_LEFT_RIGHT_math); } |
10 | return effect_runner_i(params, &WAVE_LEFT_RIGHT_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT | 10 | #endif // DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT |
diff --git a/quantum/led_matrix_animations/wave_up_down_anim.h b/quantum/led_matrix_animations/wave_up_down_anim.h index b68ff9bbc..3cab0597d 100644 --- a/quantum/led_matrix_animations/wave_up_down_anim.h +++ b/quantum/led_matrix_animations/wave_up_down_anim.h | |||
@@ -2,13 +2,9 @@ | |||
2 | LED_MATRIX_EFFECT(WAVE_UP_DOWN) | 2 | LED_MATRIX_EFFECT(WAVE_UP_DOWN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
5 | static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { | 5 | static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].y - time), val); } |
6 | return scale8(sin8(g_led_config.point[i].y - time), val); | ||
7 | } | ||
8 | 6 | ||
9 | bool WAVE_UP_DOWN(effect_params_t* params) { | 7 | bool WAVE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &WAVE_UP_DOWN_math); } |
10 | return effect_runner_i(params, &WAVE_UP_DOWN_math); | ||
11 | } | ||
12 | 8 | ||
13 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS | 9 | # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS |
14 | #endif // DISABLE_LED_MATRIX_WAVE_UP_DOWN | 10 | #endif // DISABLE_LED_MATRIX_WAVE_UP_DOWN |