diff options
| author | Ryan Caltabiano <rcalt2vt@gmail.com> | 2019-05-19 23:12:29 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-07-12 07:39:35 -0700 |
| commit | cf215487ba35c6754cd1c52bb900a46bb52ed3a3 (patch) | |
| tree | 1eb5341becef835bb2ca34a7a3066fe8e26d803c /quantum/rgb_matrix_runners/effect_runner_i.h | |
| parent | e717dcaa09143615ae0b46bf625621f67a7b55ce (diff) | |
| download | qmk_firmware-cf215487ba35c6754cd1c52bb900a46bb52ed3a3.tar.gz qmk_firmware-cf215487ba35c6754cd1c52bb900a46bb52ed3a3.zip | |
Switching rgb_config_t to use HSV struct
Diffstat (limited to 'quantum/rgb_matrix_runners/effect_runner_i.h')
| -rw-r--r-- | quantum/rgb_matrix_runners/effect_runner_i.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/quantum/rgb_matrix_runners/effect_runner_i.h b/quantum/rgb_matrix_runners/effect_runner_i.h index 85405ba1b..d4a7ef392 100644 --- a/quantum/rgb_matrix_runners/effect_runner_i.h +++ b/quantum/rgb_matrix_runners/effect_runner_i.h | |||
| @@ -1,16 +1,14 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | typedef void (*i_f)(HSV* hsv, uint8_t i, uint8_t time); | 3 | typedef HSV (*i_f)(HSV hsv, uint8_t i, uint8_t time); |
| 4 | 4 | ||
| 5 | bool effect_runner_i(effect_params_t* params, i_f effect_func) { | 5 | bool 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 | HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val }; | ||
| 9 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); | 8 | uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4); |
| 10 | for (uint8_t i = led_min; i < led_max; i++) { | 9 | for (uint8_t i = led_min; i < led_max; i++) { |
| 11 | RGB_MATRIX_TEST_LED_FLAGS(); | 10 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 12 | effect_func(&hsv, i, time); | 11 | RGB rgb = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time)); |
| 13 | RGB rgb = hsv_to_rgb(hsv); | ||
| 14 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 12 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); |
| 15 | } | 13 | } |
| 16 | return led_max < DRIVER_LED_TOTAL; | 14 | return led_max < DRIVER_LED_TOTAL; |
