aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Y <76888457+filterpaper@users.noreply.github.com>2021-06-23 17:45:05 +0800
committerGitHub <noreply@github.com>2021-06-23 19:45:05 +1000
commita913db63aa41f7d1c939d735fbd316a85225d935 (patch)
tree15967312e5fa0c5b99765af6cd66ac6770fb2927
parentced7e9a0ced2fc394eca1cc9e935caa0317b7172 (diff)
downloadqmk_firmware-a913db63aa41f7d1c939d735fbd316a85225d935.tar.gz
qmk_firmware-a913db63aa41f7d1c939d735fbd316a85225d935.zip
Fix zero condition of reactive runners that will suspend RGB animation (#12710)
* Avoid zero or overflow from user's rgb_matrix_config.speed * Avoid zero tick for reactive splash. * Avoid zero time for animation runner. Co-authored-by: filterpaper <filterpaper@localhost>
-rw-r--r--quantum/rgb_matrix_runners/effect_runner_i.h2
-rw-r--r--quantum/rgb_matrix_runners/effect_runner_reactive.h4
-rw-r--r--quantum/rgb_matrix_runners/effect_runner_reactive_splash.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/quantum/rgb_matrix_runners/effect_runner_i.h b/quantum/rgb_matrix_runners/effect_runner_i.h
index 95bfe8b39..1881cd6c6 100644
--- a/quantum/rgb_matrix_runners/effect_runner_i.h
+++ b/quantum/rgb_matrix_runners/effect_runner_i.h
@@ -5,7 +5,7 @@ typedef HSV (*i_f)(HSV hsv, uint8_t i, uint8_t time);
5bool effect_runner_i(effect_params_t* params, i_f effect_func) { 5bool effect_runner_i(effect_params_t* params, i_f effect_func) {
6 RGB_MATRIX_USE_LIMITS(led_min, led_max); 6 RGB_MATRIX_USE_LIMITS(led_min, led_max);
7 7
8 uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4); 8 uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
9 for (uint8_t i = led_min; i < led_max; i++) { 9 for (uint8_t i = led_min; i < led_max; i++) {
10 RGB_MATRIX_TEST_LED_FLAGS(); 10 RGB_MATRIX_TEST_LED_FLAGS();
11 RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time)); 11 RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive.h b/quantum/rgb_matrix_runners/effect_runner_reactive.h
index 8485b61f3..75b7c0df4 100644
--- a/quantum/rgb_matrix_runners/effect_runner_reactive.h
+++ b/quantum/rgb_matrix_runners/effect_runner_reactive.h
@@ -7,7 +7,7 @@ typedef HSV (*reactive_f)(HSV hsv, uint16_t offset);
7bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) { 7bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
8 RGB_MATRIX_USE_LIMITS(led_min, led_max); 8 RGB_MATRIX_USE_LIMITS(led_min, led_max);
9 9
10 uint16_t max_tick = 65535 / rgb_matrix_config.speed; 10 uint16_t max_tick = 65535 / qadd8(rgb_matrix_config.speed, 1);
11 for (uint8_t i = led_min; i < led_max; i++) { 11 for (uint8_t i = led_min; i < led_max; i++) {
12 RGB_MATRIX_TEST_LED_FLAGS(); 12 RGB_MATRIX_TEST_LED_FLAGS();
13 uint16_t tick = max_tick; 13 uint16_t tick = max_tick;
@@ -19,7 +19,7 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
19 } 19 }
20 } 20 }
21 21
22 uint16_t offset = scale16by8(tick, rgb_matrix_config.speed); 22 uint16_t offset = scale16by8(tick, qadd8(rgb_matrix_config.speed, 1));
23 RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset)); 23 RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset));
24 rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); 24 rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
25 } 25 }
diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h b/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
index 5c69d0fbb..2e46ffb35 100644
--- a/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
+++ b/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
@@ -16,7 +16,7 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
16 int16_t dx = g_led_config.point[i].x - g_last_hit_tracker.x[j]; 16 int16_t dx = g_led_config.point[i].x - g_last_hit_tracker.x[j];
17 int16_t dy = g_led_config.point[i].y - g_last_hit_tracker.y[j]; 17 int16_t dy = g_led_config.point[i].y - g_last_hit_tracker.y[j];
18 uint8_t dist = sqrt16(dx * dx + dy * dy); 18 uint8_t dist = sqrt16(dx * dx + dy * dy);
19 uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], rgb_matrix_config.speed); 19 uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], qadd8(rgb_matrix_config.speed, 1));
20 hsv = effect_func(hsv, dx, dy, dist, tick); 20 hsv = effect_func(hsv, dx, dy, dist, tick);
21 } 21 }
22 hsv.v = scale8(hsv.v, rgb_matrix_config.hsv.v); 22 hsv.v = scale8(hsv.v, rgb_matrix_config.hsv.v);