diff options
author | Ryan Caltabiano <rcalt2vt@gmail.com> | 2019-05-19 23:12:29 -0500 |
---|---|---|
committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-07-16 13:04:11 +0900 |
commit | 92d137cec9a9ebf60ac99edd9f55706e15944667 (patch) | |
tree | e91b1ca4a76a8d71d4a1dd71441470774946ed30 /quantum/rgb_matrix_runners/effect_runner_reactive.h | |
parent | fd2246f9722b978a42e844447fa3d3ebf5b5d670 (diff) |
Switching rgb_config_t to use HSV struct (qmk#5933)
Diffstat (limited to 'quantum/rgb_matrix_runners/effect_runner_reactive.h')
-rw-r--r-- | quantum/rgb_matrix_runners/effect_runner_reactive.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive.h b/quantum/rgb_matrix_runners/effect_runner_reactive.h index 94cd7d5452..9da2814ce8 100644 --- a/quantum/rgb_matrix_runners/effect_runner_reactive.h +++ b/quantum/rgb_matrix_runners/effect_runner_reactive.h @@ -2,12 +2,11 @@ #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED -typedef void (*reactive_f)(HSV* hsv, uint16_t offset); +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); - HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val }; uint16_t max_tick = 65535 / rgb_matrix_config.speed; for (uint8_t i = led_min; i < led_max; i++) { RGB_MATRIX_TEST_LED_FLAGS(); @@ -21,8 +20,7 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) { } uint16_t offset = scale16by8(tick, rgb_matrix_config.speed); - effect_func(&hsv, offset); - RGB rgb = hsv_to_rgb(hsv); + RGB rgb = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset)); rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); } return led_max < DRIVER_LED_TOTAL; |