diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-11-15 10:41:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 10:41:04 -0800 |
| commit | 160b0558f55f1357e1a48175c949e98d32630e6b (patch) | |
| tree | 459e163bfda5c90a615dada0d282891795cb7d42 /quantum/rgb_matrix/animations/solid_reactive_cross.h | |
| parent | c9fd69871165eb889be5421df518d8e35b2be027 (diff) | |
| download | qmk_firmware-160b0558f55f1357e1a48175c949e98d32630e6b.tar.gz qmk_firmware-160b0558f55f1357e1a48175c949e98d32630e6b.zip | |
Require explicit enabling of RGB Matrix modes (#15018)
Diffstat (limited to 'quantum/rgb_matrix/animations/solid_reactive_cross.h')
| -rw-r--r-- | quantum/rgb_matrix/animations/solid_reactive_cross.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/quantum/rgb_matrix/animations/solid_reactive_cross.h b/quantum/rgb_matrix/animations/solid_reactive_cross.h index f76c68e8c..496651f8a 100644 --- a/quantum/rgb_matrix/animations/solid_reactive_cross.h +++ b/quantum/rgb_matrix/animations/solid_reactive_cross.h | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED |
| 2 | # if !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS) | 2 | # if defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS) |
| 3 | 3 | ||
| 4 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 4 | # ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
| 5 | RGB_MATRIX_EFFECT(SOLID_REACTIVE_CROSS) | 5 | RGB_MATRIX_EFFECT(SOLID_REACTIVE_CROSS) |
| 6 | # endif | 6 | # endif |
| 7 | 7 | ||
| 8 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 8 | # ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
| 9 | RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS) | 9 | RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS) |
| 10 | # endif | 10 | # endif |
| 11 | 11 | ||
| @@ -23,14 +23,14 @@ static HSV SOLID_REACTIVE_CROSS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di | |||
| 23 | return hsv; | 23 | return hsv; |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 26 | # ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
| 27 | bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); } | 27 | bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); } |
| 28 | # endif | 28 | # endif |
| 29 | 29 | ||
| 30 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 30 | # ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
| 31 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); } | 31 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); } |
| 32 | # endif | 32 | # endif |
| 33 | 33 | ||
| 34 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 34 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 35 | # endif // !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS) | 35 | # endif // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS) |
| 36 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED | 36 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED |
