diff options
author | Albert Y <[email protected]> | 2021-06-23 17:45:05 +0800 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-23 19:45:05 +1000 |
commit | a913db63aa41f7d1c939d735fbd316a85225d935 (patch) | |
tree | 15967312e5fa0c5b99765af6cd66ac6770fb2927 /quantum/rgb_matrix_runners/effect_runner_reactive.h | |
parent | ced7e9a0ced2fc394eca1cc9e935caa0317b7172 (diff) | |
download | qmk_firmware-a913db63aa41f7d1c939d735fbd316a85225d935.tar.gz qmk_firmware-a913db63aa41f7d1c939d735fbd316a85225d935.zip |
Fix zero condition of reactive runners that will suspend RGB animation (#12710)0.13.13
* 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>
Diffstat (limited to 'quantum/rgb_matrix_runners/effect_runner_reactive.h')
-rw-r--r-- | quantum/rgb_matrix_runners/effect_runner_reactive.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive.h b/quantum/rgb_matrix_runners/effect_runner_reactive.h index 8485b61f3d..75b7c0df4e 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); bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) { RGB_MATRIX_USE_LIMITS(led_min, led_max); - uint16_t max_tick = 65535 / rgb_matrix_config.speed; + uint16_t max_tick = 65535 / qadd8(rgb_matrix_config.speed, 1); for (uint8_t i = led_min; i < led_max; i++) { RGB_MATRIX_TEST_LED_FLAGS(); uint16_t tick = max_tick; @@ -19,7 +19,7 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) { } } - uint16_t offset = scale16by8(tick, rgb_matrix_config.speed); + uint16_t offset = scale16by8(tick, qadd8(rgb_matrix_config.speed, 1)); RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } |