diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-17 11:19:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 04:19:00 +1000 |
| commit | 7da97c293da851851c204af065a0c8d2f884effd (patch) | |
| tree | d1ebbc3898f66b570bf6005bdfffe0682efa8240 /quantum/rgb_matrix | |
| parent | 85351dc23d423d1fa5d23aed8b4b478c49949b46 (diff) | |
| download | qmk_firmware-7da97c293da851851c204af065a0c8d2f884effd.tar.gz qmk_firmware-7da97c293da851851c204af065a0c8d2f884effd.zip | |
Rgb matrix/enable modes explicitly (#13758)
* Change animations to require explicet activation
* Add support for legacy config
* Make default for now
* Add LED Matrix support
* change LED Matrix docs
Diffstat (limited to 'quantum/rgb_matrix')
30 files changed, 184 insertions, 30 deletions
diff --git a/quantum/rgb_matrix/animations/alpha_mods_anim.h b/quantum/rgb_matrix/animations/alpha_mods_anim.h index 426d88ef3..3f2c9b799 100644 --- a/quantum/rgb_matrix/animations/alpha_mods_anim.h +++ b/quantum/rgb_matrix/animations/alpha_mods_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS | 1 | #ifdef ENABLE_RGB_MATRIX_ALPHAS_MODS |
| 2 | RGB_MATRIX_EFFECT(ALPHAS_MODS) | 2 | RGB_MATRIX_EFFECT(ALPHAS_MODS) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/breathing_anim.h b/quantum/rgb_matrix/animations/breathing_anim.h index 340bd93e5..a00ccb83a 100644 --- a/quantum/rgb_matrix/animations/breathing_anim.h +++ b/quantum/rgb_matrix/animations/breathing_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BREATHING | 1 | #ifdef ENABLE_RGB_MATRIX_BREATHING |
| 2 | RGB_MATRIX_EFFECT(BREATHING) | 2 | RGB_MATRIX_EFFECT(BREATHING) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h index 3df3cfda7..ac9578922 100644 --- a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h +++ b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
| 2 | RGB_MATRIX_EFFECT(BAND_PINWHEEL_SAT) | 2 | RGB_MATRIX_EFFECT(BAND_PINWHEEL_SAT) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h index 7d80074fd..f7fe4b76e 100644 --- a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h +++ b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL |
| 2 | RGB_MATRIX_EFFECT(BAND_PINWHEEL_VAL) | 2 | RGB_MATRIX_EFFECT(BAND_PINWHEEL_VAL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_sat_anim.h b/quantum/rgb_matrix/animations/colorband_sat_anim.h index 35b830af6..96a6cbf5c 100644 --- a/quantum/rgb_matrix/animations/colorband_sat_anim.h +++ b/quantum/rgb_matrix/animations/colorband_sat_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_SAT | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_SAT |
| 2 | RGB_MATRIX_EFFECT(BAND_SAT) | 2 | RGB_MATRIX_EFFECT(BAND_SAT) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h index 048157aa1..52f6040d8 100644 --- a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h +++ b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
| 2 | RGB_MATRIX_EFFECT(BAND_SPIRAL_SAT) | 2 | RGB_MATRIX_EFFECT(BAND_SPIRAL_SAT) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h index bff2da161..d5752e27f 100644 --- a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h +++ b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL |
| 2 | RGB_MATRIX_EFFECT(BAND_SPIRAL_VAL) | 2 | RGB_MATRIX_EFFECT(BAND_SPIRAL_VAL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/colorband_val_anim.h b/quantum/rgb_matrix/animations/colorband_val_anim.h index f1aaf1d06..32bc6f52a 100644 --- a/quantum/rgb_matrix/animations/colorband_val_anim.h +++ b/quantum/rgb_matrix/animations/colorband_val_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_BAND_VAL | 1 | #ifdef ENABLE_RGB_MATRIX_BAND_VAL |
| 2 | RGB_MATRIX_EFFECT(BAND_VAL) | 2 | RGB_MATRIX_EFFECT(BAND_VAL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_all_anim.h b/quantum/rgb_matrix/animations/cycle_all_anim.h index faf8598a3..20af94b6b 100644 --- a/quantum/rgb_matrix/animations/cycle_all_anim.h +++ b/quantum/rgb_matrix/animations/cycle_all_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_ALL | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_ALL |
| 2 | RGB_MATRIX_EFFECT(CYCLE_ALL) | 2 | RGB_MATRIX_EFFECT(CYCLE_ALL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_left_right_anim.h b/quantum/rgb_matrix/animations/cycle_left_right_anim.h index cf911eb93..7f84f4bd5 100644 --- a/quantum/rgb_matrix/animations/cycle_left_right_anim.h +++ b/quantum/rgb_matrix/animations/cycle_left_right_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 2 | RGB_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) | 2 | RGB_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_anim.h index d66acd4b2..2277f16a2 100644 --- a/quantum/rgb_matrix/animations/cycle_out_in_anim.h +++ b/quantum/rgb_matrix/animations/cycle_out_in_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_OUT_IN | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
| 2 | RGB_MATRIX_EFFECT(CYCLE_OUT_IN) | 2 | RGB_MATRIX_EFFECT(CYCLE_OUT_IN) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h index fe8396140..981c0afd0 100644 --- a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h +++ b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
| 2 | RGB_MATRIX_EFFECT(CYCLE_OUT_IN_DUAL) | 2 | RGB_MATRIX_EFFECT(CYCLE_OUT_IN_DUAL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h index 779988709..1a7db4a4c 100644 --- a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h +++ b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_PINWHEEL | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL |
| 2 | RGB_MATRIX_EFFECT(CYCLE_PINWHEEL) | 2 | RGB_MATRIX_EFFECT(CYCLE_PINWHEEL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_spiral_anim.h b/quantum/rgb_matrix/animations/cycle_spiral_anim.h index 80cfb0dbc..245cdc237 100644 --- a/quantum/rgb_matrix/animations/cycle_spiral_anim.h +++ b/quantum/rgb_matrix/animations/cycle_spiral_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_SPIRAL | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_SPIRAL |
| 2 | RGB_MATRIX_EFFECT(CYCLE_SPIRAL) | 2 | RGB_MATRIX_EFFECT(CYCLE_SPIRAL) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/cycle_up_down_anim.h b/quantum/rgb_matrix/animations/cycle_up_down_anim.h index 5016f739d..c9b5a5413 100644 --- a/quantum/rgb_matrix/animations/cycle_up_down_anim.h +++ b/quantum/rgb_matrix/animations/cycle_up_down_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | 1 | #ifdef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
| 2 | RGB_MATRIX_EFFECT(CYCLE_UP_DOWN) | 2 | RGB_MATRIX_EFFECT(CYCLE_UP_DOWN) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/dual_beacon_anim.h b/quantum/rgb_matrix/animations/dual_beacon_anim.h index ce9487168..5c06080a2 100644 --- a/quantum/rgb_matrix/animations/dual_beacon_anim.h +++ b/quantum/rgb_matrix/animations/dual_beacon_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_DUAL_BEACON | 1 | #ifdef ENABLE_RGB_MATRIX_DUAL_BEACON |
| 2 | RGB_MATRIX_EFFECT(DUAL_BEACON) | 2 | RGB_MATRIX_EFFECT(DUAL_BEACON) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/gradient_left_right_anim.h b/quantum/rgb_matrix/animations/gradient_left_right_anim.h index 53dfd04e2..b4f2752ff 100644 --- a/quantum/rgb_matrix/animations/gradient_left_right_anim.h +++ b/quantum/rgb_matrix/animations/gradient_left_right_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | 1 | #ifdef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT |
| 2 | RGB_MATRIX_EFFECT(GRADIENT_LEFT_RIGHT) | 2 | RGB_MATRIX_EFFECT(GRADIENT_LEFT_RIGHT) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/gradient_up_down_anim.h b/quantum/rgb_matrix/animations/gradient_up_down_anim.h index 7e0d2898c..3fd45cf99 100644 --- a/quantum/rgb_matrix/animations/gradient_up_down_anim.h +++ b/quantum/rgb_matrix/animations/gradient_up_down_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 1 | #ifdef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
| 2 | RGB_MATRIX_EFFECT(GRADIENT_UP_DOWN) | 2 | RGB_MATRIX_EFFECT(GRADIENT_UP_DOWN) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/hue_breathing_anim.h b/quantum/rgb_matrix/animations/hue_breathing_anim.h index 54dea958a..6d974b8c3 100644 --- a/quantum/rgb_matrix/animations/hue_breathing_anim.h +++ b/quantum/rgb_matrix/animations/hue_breathing_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_HUE_BREATHING | 1 | #ifdef ENABLE_RGB_MATRIX_HUE_BREATHING |
| 2 | RGB_MATRIX_EFFECT(HUE_BREATHING) | 2 | RGB_MATRIX_EFFECT(HUE_BREATHING) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/hue_pendulum_anim.h b/quantum/rgb_matrix/animations/hue_pendulum_anim.h index 2d8d36174..a6e1c1074 100644 --- a/quantum/rgb_matrix/animations/hue_pendulum_anim.h +++ b/quantum/rgb_matrix/animations/hue_pendulum_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_HUE_PENDULUM | 1 | #ifdef ENABLE_RGB_MATRIX_HUE_PENDULUM |
| 2 | RGB_MATRIX_EFFECT(HUE_PENDULUM) | 2 | RGB_MATRIX_EFFECT(HUE_PENDULUM) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/hue_wave_anim.h b/quantum/rgb_matrix/animations/hue_wave_anim.h index fd9026fc9..b1c72b733 100644 --- a/quantum/rgb_matrix/animations/hue_wave_anim.h +++ b/quantum/rgb_matrix/animations/hue_wave_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_HUE_WAVE | 1 | #ifdef ENABLE_RGB_MATRIX_HUE_WAVE |
| 2 | RGB_MATRIX_EFFECT(HUE_WAVE) | 2 | RGB_MATRIX_EFFECT(HUE_WAVE) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h index a17e954b1..7d8eafffb 100644 --- a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h +++ b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | 1 | #ifdef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS |
| 2 | RGB_MATRIX_EFFECT(JELLYBEAN_RAINDROPS) | 2 | RGB_MATRIX_EFFECT(JELLYBEAN_RAINDROPS) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h index 977261182..b54d997f6 100644 --- a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h +++ b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_BEACON | 1 | #ifdef ENABLE_RGB_MATRIX_RAINBOW_BEACON |
| 2 | RGB_MATRIX_EFFECT(RAINBOW_BEACON) | 2 | RGB_MATRIX_EFFECT(RAINBOW_BEACON) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h index e51e7b251..50db92201 100644 --- a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h +++ b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 1 | #ifdef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
| 2 | RGB_MATRIX_EFFECT(RAINBOW_MOVING_CHEVRON) | 2 | RGB_MATRIX_EFFECT(RAINBOW_MOVING_CHEVRON) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h index 1cd4ed2ac..3299f15df 100644 --- a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h +++ b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 1 | #ifdef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
| 2 | RGB_MATRIX_EFFECT(RAINBOW_PINWHEELS) | 2 | RGB_MATRIX_EFFECT(RAINBOW_PINWHEELS) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h index 38359cdca..c01688e2c 100644 --- a/quantum/rgb_matrix/animations/raindrops_anim.h +++ b/quantum/rgb_matrix/animations/raindrops_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #ifndef DISABLE_RGB_MATRIX_RAINDROPS | 1 | #ifdef ENABLE_RGB_MATRIX_RAINDROPS |
| 2 | RGB_MATRIX_EFFECT(RAINDROPS) | 2 | RGB_MATRIX_EFFECT(RAINDROPS) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h index e7dda11a2..28f040109 100644 --- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h +++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP) | 1 | #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP) |
| 2 | RGB_MATRIX_EFFECT(TYPING_HEATMAP) | 2 | RGB_MATRIX_EFFECT(TYPING_HEATMAP) |
| 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 4 | 4 | ||
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index 624e85158..e5635ee03 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c | |||
| @@ -92,7 +92,7 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv | |||
| 92 | #endif | 92 | #endif |
| 93 | 93 | ||
| 94 | #if !defined(RGB_MATRIX_STARTUP_MODE) | 94 | #if !defined(RGB_MATRIX_STARTUP_MODE) |
| 95 | # ifndef DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 95 | # ifdef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 96 | # define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT | 96 | # define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 97 | # else | 97 | # else |
| 98 | // fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace | 98 | // fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace |
| @@ -243,11 +243,11 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) { | |||
| 243 | } | 243 | } |
| 244 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED | 244 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED |
| 245 | 245 | ||
| 246 | #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP) | 246 | #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP) |
| 247 | if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) { | 247 | if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) { |
| 248 | process_rgb_matrix_typing_heatmap(row, col); | 248 | process_rgb_matrix_typing_heatmap(row, col); |
| 249 | } | 249 | } |
| 250 | #endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP) | 250 | #endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP) |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | void rgb_matrix_test(void) { | 253 | void rgb_matrix_test(void) { |
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index 58ac29da3..f53e011c1 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "rgb_matrix_types.h" | 23 | #include "rgb_matrix_types.h" |
| 24 | #include "color.h" | 24 | #include "color.h" |
| 25 | #include "quantum.h" | 25 | #include "quantum.h" |
| 26 | #include "rgb_matrix_legacy_enables.h" | ||
| 26 | 27 | ||
| 27 | #ifdef IS31FL3731 | 28 | #ifdef IS31FL3731 |
| 28 | # include "is31fl3731.h" | 29 | # include "is31fl3731.h" |
diff --git a/quantum/rgb_matrix/rgb_matrix_legacy_enables.h b/quantum/rgb_matrix/rgb_matrix_legacy_enables.h new file mode 100644 index 000000000..398858ebc --- /dev/null +++ b/quantum/rgb_matrix/rgb_matrix_legacy_enables.h | |||
| @@ -0,0 +1,153 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | // to-do: remove this | ||
| 18 | |||
| 19 | #pragma once | ||
| 20 | |||
| 21 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS | ||
| 22 | # define ENABLE_RGB_MATRIX_ALPHAS_MODS | ||
| 23 | #endif | ||
| 24 | #ifndef DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||
| 25 | # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||
| 26 | #endif | ||
| 27 | #ifndef DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||
| 28 | # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||
| 29 | #endif | ||
| 30 | #ifndef DISABLE_RGB_MATRIX_BREATHING | ||
| 31 | # define ENABLE_RGB_MATRIX_BREATHING | ||
| 32 | #endif | ||
| 33 | #ifndef DISABLE_RGB_MATRIX_BAND_SAT | ||
| 34 | # define ENABLE_RGB_MATRIX_BAND_SAT | ||
| 35 | #endif | ||
| 36 | #ifndef DISABLE_RGB_MATRIX_BAND_VAL | ||
| 37 | # define ENABLE_RGB_MATRIX_BAND_VAL | ||
| 38 | #endif | ||
| 39 | #ifndef DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | ||
| 40 | # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | ||
| 41 | #endif | ||
| 42 | #ifndef DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | ||
| 43 | # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | ||
| 44 | #endif | ||
| 45 | #ifndef DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | ||
| 46 | # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT | ||
| 47 | #endif | ||
| 48 | #ifndef DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL | ||
| 49 | # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL | ||
| 50 | #endif | ||
| 51 | #ifndef DISABLE_RGB_MATRIX_CYCLE_ALL | ||
| 52 | # define ENABLE_RGB_MATRIX_CYCLE_ALL | ||
| 53 | #endif | ||
| 54 | #ifndef DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | ||
| 55 | # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | ||
| 56 | #endif | ||
| 57 | #ifndef DISABLE_RGB_MATRIX_CYCLE_UP_DOWN | ||
| 58 | # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN | ||
| 59 | #endif | ||
| 60 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | ||
| 61 | # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | ||
| 62 | #endif | ||
| 63 | #ifndef DISABLE_RGB_MATRIX_CYCLE_OUT_IN | ||
| 64 | # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | ||
| 65 | #endif | ||
| 66 | #ifndef DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | ||
| 67 | # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | ||
| 68 | #endif | ||
| 69 | #ifndef DISABLE_RGB_MATRIX_CYCLE_PINWHEEL | ||
| 70 | # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL | ||
| 71 | #endif | ||
| 72 | #ifndef DISABLE_RGB_MATRIX_CYCLE_SPIRAL | ||
| 73 | # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL | ||
| 74 | #endif | ||
| 75 | #ifndef DISABLE_RGB_MATRIX_DUAL_BEACON | ||
| 76 | # define ENABLE_RGB_MATRIX_DUAL_BEACON | ||
| 77 | #endif | ||
| 78 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_BEACON | ||
| 79 | # define ENABLE_RGB_MATRIX_RAINBOW_BEACON | ||
| 80 | #endif | ||
| 81 | #ifndef DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS | ||
| 82 | # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS | ||
| 83 | #endif | ||
| 84 | #ifndef DISABLE_RGB_MATRIX_RAINDROPS | ||
| 85 | # define ENABLE_RGB_MATRIX_RAINDROPS | ||
| 86 | #endif | ||
| 87 | #ifndef DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | ||
| 88 | # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | ||
| 89 | #endif | ||
| 90 | #ifndef DISABLE_RGB_MATRIX_HUE_BREATHING | ||
| 91 | # define ENABLE_RGB_MATRIX_HUE_BREATHING | ||
| 92 | #endif | ||
| 93 | #ifndef DISABLE_RGB_MATRIX_HUE_PENDULUM | ||
| 94 | # define ENABLE_RGB_MATRIX_HUE_PENDULUM | ||
| 95 | #endif | ||
| 96 | #ifndef DISABLE_RGB_MATRIX_HUE_WAVE | ||
| 97 | # define ENABLE_RGB_MATRIX_HUE_WAVE | ||
| 98 | #endif | ||
| 99 | #ifndef DISABLE_RGB_MATRIX_PIXEL_RAIN | ||
| 100 | # define ENABLE_RGB_MATRIX_PIXEL_RAIN | ||
| 101 | #endif | ||
| 102 | #ifndef DISABLE_RGB_MATRIX_PIXEL_FLOW | ||
| 103 | # define ENABLE_RGB_MATRIX_PIXEL_FLOW | ||
| 104 | #endif | ||
| 105 | #ifndef DISABLE_RGB_MATRIX_PIXEL_FRACTAL | ||
| 106 | # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL | ||
| 107 | #endif | ||
| 108 | #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) | ||
| 109 | # ifndef DISABLE_RGB_MATRIX_TYPING_HEATMAP | ||
| 110 | # define ENABLE_RGB_MATRIX_TYPING_HEATMAP | ||
| 111 | # endif | ||
| 112 | # ifndef DISABLE_RGB_MATRIX_DIGITAL_RAIN | ||
| 113 | # define ENABLE_RGB_MATRIX_DIGITAL_RAIN | ||
| 114 | # endif | ||
| 115 | #endif | ||
| 116 | #if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) | ||
| 117 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
| 118 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
| 119 | # endif | ||
| 120 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE | ||
| 121 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE | ||
| 122 | # endif | ||
| 123 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | ||
| 124 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | ||
| 125 | # endif | ||
| 126 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
| 127 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
| 128 | # endif | ||
| 129 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | ||
| 130 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | ||
| 131 | # endif | ||
| 132 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
| 133 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
| 134 | # endif | ||
| 135 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | ||
| 136 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | ||
| 137 | # endif | ||
| 138 | # ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
| 139 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
| 140 | # endif | ||
| 141 | # ifndef DISABLE_RGB_MATRIX_SPLASH | ||
| 142 | # define ENABLE_RGB_MATRIX_SPLASH | ||
| 143 | # endif | ||
| 144 | # ifndef DISABLE_RGB_MATRIX_MULTISPLASH | ||
| 145 | # define ENABLE_RGB_MATRIX_MULTISPLASH | ||
| 146 | # endif | ||
| 147 | # ifndef DISABLE_RGB_MATRIX_SOLID_SPLASH | ||
| 148 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||
| 149 | # endif | ||
| 150 | # ifndef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
| 151 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
| 152 | # endif | ||
| 153 | #endif | ||
