diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2019-05-10 18:55:02 -0500 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-10 16:55:02 -0700 |
| commit | 62ba66d61821fec6a5ad3bdccdf738e15e082461 (patch) | |
| tree | 4b0fb100299a7a7e9a51cbbe96da94df8a57483f /quantum/rgb_matrix_animations/alpha_mods_anim.h | |
| parent | febaf9dec42ce4d4ade316f811145a291137ee94 (diff) | |
| download | qmk_firmware-62ba66d61821fec6a5ad3bdccdf738e15e082461.tar.gz qmk_firmware-62ba66d61821fec6a5ad3bdccdf738e15e082461.zip | |
Cleanup/rgb matrix (#5811)
* clean up rgb matrix extern usage
Moved rgb matrix boiler plate into macros
Rebased onto typing heatmap pr
* Fixing the reversed frame buffer access in digital rain
* Fixing digital rain & typing heatmap if keyreactive effects are not enabled
* Apply suggestions from code review
Co-Authored-By: Drashna Jaelre <drashna@live.com>
* Adding parenthesizes to DRIVER_LED_TOTAL where necessary
* Updated docs
* added notes about parentheses
Diffstat (limited to 'quantum/rgb_matrix_animations/alpha_mods_anim.h')
| -rw-r--r-- | quantum/rgb_matrix_animations/alpha_mods_anim.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/quantum/rgb_matrix_animations/alpha_mods_anim.h b/quantum/rgb_matrix_animations/alpha_mods_anim.h index d7f6f4655..0fee19aef 100644 --- a/quantum/rgb_matrix_animations/alpha_mods_anim.h +++ b/quantum/rgb_matrix_animations/alpha_mods_anim.h | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | #pragma once | ||
| 2 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS | 1 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS |
| 3 | 2 | RGB_MATRIX_EFFECT(ALPHAS_MODS) | |
| 4 | extern led_config_t g_led_config; | 3 | #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 5 | extern rgb_config_t rgb_matrix_config; | ||
| 6 | 4 | ||
| 7 | // alphas = color1, mods = color2 | 5 | // alphas = color1, mods = color2 |
| 8 | bool rgb_matrix_alphas_mods(effect_params_t* params) { | 6 | bool ALPHAS_MODS(effect_params_t* params) { |
| 9 | RGB_MATRIX_USE_LIMITS(led_min, led_max); | 7 | RGB_MATRIX_USE_LIMITS(led_min, led_max); |
| 10 | 8 | ||
| 11 | HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val }; | 9 | HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val }; |
| @@ -24,4 +22,5 @@ bool rgb_matrix_alphas_mods(effect_params_t* params) { | |||
| 24 | return led_max < DRIVER_LED_TOTAL; | 22 | return led_max < DRIVER_LED_TOTAL; |
| 25 | } | 23 | } |
| 26 | 24 | ||
| 25 | #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS | ||
| 27 | #endif // DISABLE_RGB_MATRIX_ALPHAS_MODS | 26 | #endif // DISABLE_RGB_MATRIX_ALPHAS_MODS |