diff options
51 files changed, 359 insertions, 122 deletions
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md index 7d7971bbe..fc6682601 100644 --- a/docs/feature_led_matrix.md +++ b/docs/feature_led_matrix.md | |||
@@ -164,26 +164,26 @@ You can disable a single effect by defining `DISABLE_[EFFECT_NAME]` in your `con | |||
164 | 164 | ||
165 | |Define |Description | | 165 | |Define |Description | |
166 | |-------------------------------------------------------|-----------------------------------------------| | 166 | |-------------------------------------------------------|-----------------------------------------------| |
167 | |`#define DISABLE_LED_MATRIX_ALPHAS_MODS` |Disables `LED_MATRIX_ALPHAS_MODS` | | 167 | |`#define ENABLE_LED_MATRIX_ALPHAS_MODS` |Enables `LED_MATRIX_ALPHAS_MODS` | |
168 | |`#define DISABLE_LED_MATRIX_BREATHING` |Disables `LED_MATRIX_BREATHING` | | 168 | |`#define ENABLE_LED_MATRIX_BREATHING` |Enables `LED_MATRIX_BREATHING` | |
169 | |`#define DISABLE_LED_MATRIX_BAND` |Disables `LED_MATRIX_BAND` | | 169 | |`#define ENABLE_LED_MATRIX_BAND` |Enables `LED_MATRIX_BAND` | |
170 | |`#define DISABLE_LED_MATRIX_BAND_PINWHEEL` |Disables `LED_MATRIX_BAND_PINWHEEL` | | 170 | |`#define ENABLE_LED_MATRIX_BAND_PINWHEEL` |Enables `LED_MATRIX_BAND_PINWHEEL` | |
171 | |`#define DISABLE_LED_MATRIX_BAND_SPIRAL` |Disables `LED_MATRIX_BAND_SPIRAL` | | 171 | |`#define ENABLE_LED_MATRIX_BAND_SPIRAL` |Enables `LED_MATRIX_BAND_SPIRAL` | |
172 | |`#define DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT` |Disables `LED_MATRIX_CYCLE_LEFT_RIGHT` | | 172 | |`#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT` |Enables `LED_MATRIX_CYCLE_LEFT_RIGHT` | |
173 | |`#define DISABLE_LED_MATRIX_CYCLE_UP_DOWN` |Disables `LED_MATRIX_CYCLE_UP_DOWN` | | 173 | |`#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN` |Enables `LED_MATRIX_CYCLE_UP_DOWN` | |
174 | |`#define DISABLE_LED_MATRIX_CYCLE_OUT_IN` |Disables `LED_MATRIX_CYCLE_OUT_IN` | | 174 | |`#define ENABLE_LED_MATRIX_CYCLE_OUT_IN` |Enables `LED_MATRIX_CYCLE_OUT_IN` | |
175 | |`#define DISABLE_LED_MATRIX_DUAL_BEACON` |Disables `LED_MATRIX_DUAL_BEACON` | | 175 | |`#define ENABLE_LED_MATRIX_DUAL_BEACON` |Enables `LED_MATRIX_DUAL_BEACON` | |
176 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE` |Disables `LED_MATRIX_SOLID_REACTIVE_SIMPLE` | | 176 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE` |Enables `LED_MATRIX_SOLID_REACTIVE_SIMPLE` | |
177 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE` |Disables `LED_MATRIX_SOLID_REACTIVE_WIDE` | | 177 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE` |Enables `LED_MATRIX_SOLID_REACTIVE_WIDE` | |
178 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE` |Disables `LED_MATRIX_SOLID_REACTIVE_MULTIWIDE` | | 178 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE` |Enables `LED_MATRIX_SOLID_REACTIVE_MULTIWIDE` | |
179 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS` |Disables `LED_MATRIX_SOLID_REACTIVE_CROSS` | | 179 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS` |Enables `LED_MATRIX_SOLID_REACTIVE_CROSS` | |
180 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS` |Disables `LED_MATRIX_SOLID_REACTIVE_MULTICROSS`| | 180 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS` |Enables `LED_MATRIX_SOLID_REACTIVE_MULTICROSS`| |
181 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS` |Disables `LED_MATRIX_SOLID_REACTIVE_NEXUS` | | 181 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS` |Enables `LED_MATRIX_SOLID_REACTIVE_NEXUS` | |
182 | |`#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS` |Disables `LED_MATRIX_SOLID_REACTIVE_MULTINEXUS`| | 182 | |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS` |Enables `LED_MATRIX_SOLID_REACTIVE_MULTINEXUS`| |
183 | |`#define DISABLE_LED_MATRIX_SOLID_SPLASH` |Disables `LED_MATRIX_SOLID_SPLASH` | | 183 | |`#define ENABLE_LED_MATRIX_SOLID_SPLASH` |Enables `LED_MATRIX_SOLID_SPLASH` | |
184 | |`#define DISABLE_LED_MATRIX_SOLID_MULTISPLASH` |Disables `LED_MATRIX_SOLID_MULTISPLASH` | | 184 | |`#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH` |Enables `LED_MATRIX_SOLID_MULTISPLASH` | |
185 | |`#define DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT` |Disables `LED_MATRIX_WAVE_LEFT_RIGHT` | | 185 | |`#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT` |Enables `LED_MATRIX_WAVE_LEFT_RIGHT` | |
186 | |`#define DISABLE_LED_MATRIX_WAVE_UP_DOWN` |Disables `LED_MATRIX_WAVE_UP_DOWN` | | 186 | |`#define ENABLE_LED_MATRIX_WAVE_UP_DOWN` |Enables `LED_MATRIX_WAVE_UP_DOWN` | |
187 | 187 | ||
188 | ## Custom LED Matrix Effects :id=custom-led-matrix-effects | 188 | ## Custom LED Matrix Effects :id=custom-led-matrix-effects |
189 | 189 | ||
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md index 670d7e09b..31fa9ed36 100644 --- a/docs/feature_rgb_matrix.md +++ b/docs/feature_rgb_matrix.md | |||
@@ -448,46 +448,46 @@ You can disable a single effect by defining `DISABLE_[EFFECT_NAME]` in your `con | |||
448 | 448 | ||
449 | |Define |Description | | 449 | |Define |Description | |
450 | |-------------------------------------------------------|-----------------------------------------------| | 450 | |-------------------------------------------------------|-----------------------------------------------| |
451 | |`#define DISABLE_RGB_MATRIX_ALPHAS_MODS` |Disables `RGB_MATRIX_ALPHAS_MODS` | | 451 | |`#define ENABLE_RGB_MATRIX_ALPHAS_MODS` |Enables `RGB_MATRIX_ALPHAS_MODS` | |
452 | |`#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN` |Disables `RGB_MATRIX_GRADIENT_UP_DOWN` | | 452 | |`#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN` |Enables `RGB_MATRIX_GRADIENT_UP_DOWN` | |
453 | |`#define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT` |Disables `MATRIX_GRADIENT_LEFT_RIGHT` | | 453 | |`#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT` |Enables `MATRIX_GRADIENT_LEFT_RIGHT` | |
454 | |`#define DISABLE_RGB_MATRIX_BREATHING` |Disables `RGB_MATRIX_BREATHING` | | 454 | |`#define ENABLE_RGB_MATRIX_BREATHING` |Enables `RGB_MATRIX_BREATHING` | |
455 | |`#define DISABLE_RGB_MATRIX_BAND_SAT` |Disables `RGB_MATRIX_BAND_SAT` | | 455 | |`#define ENABLE_RGB_MATRIX_BAND_SAT` |Enables `RGB_MATRIX_BAND_SAT` | |
456 | |`#define DISABLE_RGB_MATRIX_BAND_VAL` |Disables `RGB_MATRIX_BAND_VAL` | | 456 | |`#define ENABLE_RGB_MATRIX_BAND_VAL` |Enables `RGB_MATRIX_BAND_VAL` | |
457 | |`#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT` |Disables `RGB_MATRIX_BAND_PINWHEEL_SAT` | | 457 | |`#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT` |Enables `RGB_MATRIX_BAND_PINWHEEL_SAT` | |
458 | |`#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL` |Disables `RGB_MATRIX_BAND_PINWHEEL_VAL` | | 458 | |`#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL` |Enables `RGB_MATRIX_BAND_PINWHEEL_VAL` | |
459 | |`#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT` |Disables `RGB_MATRIX_BAND_SPIRAL_SAT` | | 459 | |`#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT` |Enables `RGB_MATRIX_BAND_SPIRAL_SAT` | |
460 | |`#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL` |Disables `RGB_MATRIX_BAND_SPIRAL_VAL` | | 460 | |`#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL` |Enables `RGB_MATRIX_BAND_SPIRAL_VAL` | |
461 | |`#define DISABLE_RGB_MATRIX_CYCLE_ALL` |Disables `RGB_MATRIX_CYCLE_ALL` | | 461 | |`#define ENABLE_RGB_MATRIX_CYCLE_ALL` |Enables `RGB_MATRIX_CYCLE_ALL` | |
462 | |`#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT` |Disables `RGB_MATRIX_CYCLE_LEFT_RIGHT` | | 462 | |`#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT` |Enables `RGB_MATRIX_CYCLE_LEFT_RIGHT` | |
463 | |`#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN` |Disables `RGB_MATRIX_CYCLE_UP_DOWN` | | 463 | |`#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN` |Enables `RGB_MATRIX_CYCLE_UP_DOWN` | |
464 | |`#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON` |Disables `RGB_MATRIX_RAINBOW_MOVING_CHEVRON` | | 464 | |`#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON` |Enables `RGB_MATRIX_RAINBOW_MOVING_CHEVRON` | |
465 | |`#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN` |Disables `RGB_MATRIX_CYCLE_OUT_IN` | | 465 | |`#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN` |Enables `RGB_MATRIX_CYCLE_OUT_IN` | |
466 | |`#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL` |Disables `RGB_MATRIX_CYCLE_OUT_IN_DUAL` | | 466 | |`#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL` |Enables `RGB_MATRIX_CYCLE_OUT_IN_DUAL` | |
467 | |`#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL` |Disables `RGB_MATRIX_CYCLE_PINWHEEL` | | 467 | |`#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL` |Enables `RGB_MATRIX_CYCLE_PINWHEEL` | |
468 | |`#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL` |Disables `RGB_MATRIX_CYCLE_SPIRAL` | | 468 | |`#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL` |Enables `RGB_MATRIX_CYCLE_SPIRAL` | |
469 | |`#define DISABLE_RGB_MATRIX_DUAL_BEACON` |Disables `RGB_MATRIX_DUAL_BEACON` | | 469 | |`#define ENABLE_RGB_MATRIX_DUAL_BEACON` |Enables `RGB_MATRIX_DUAL_BEACON` | |
470 | |`#define DISABLE_RGB_MATRIX_RAINBOW_BEACON` |Disables `RGB_MATRIX_RAINBOW_BEACON` | | 470 | |`#define ENABLE_RGB_MATRIX_RAINBOW_BEACON` |Enables `RGB_MATRIX_RAINBOW_BEACON` | |
471 | |`#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS` |Disables `RGB_MATRIX_RAINBOW_PINWHEELS` | | 471 | |`#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS` |Enables `RGB_MATRIX_RAINBOW_PINWHEELS` | |
472 | |`#define DISABLE_RGB_MATRIX_RAINDROPS` |Disables `RGB_MATRIX_RAINDROPS` | | 472 | |`#define ENABLE_RGB_MATRIX_RAINDROPS` |Enables `RGB_MATRIX_RAINDROPS` | |
473 | |`#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS` |Disables `RGB_MATRIX_JELLYBEAN_RAINDROPS` | | 473 | |`#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS` |Enables `RGB_MATRIX_JELLYBEAN_RAINDROPS` | |
474 | |`#define DISABLE_RGB_MATRIX_HUE_BREATHING` |Disables `RGB_MATRIX_HUE_BREATHING` | | 474 | |`#define ENABLE_RGB_MATRIX_HUE_BREATHING` |Enables `RGB_MATRIX_HUE_BREATHING` | |
475 | |`#define DISABLE_RGB_MATRIX_HUE_PENDULUM` |Disables `RGB_MATRIX_HUE_PENDULUM` | | 475 | |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM` |Enables `RGB_MATRIX_HUE_PENDULUM` | |
476 | |`#define DISABLE_RGB_MATRIX_HUE_WAVE ` |Disables `RGB_MATRIX_HUE_WAVE ` | | 476 | |`#define ENABLE_RGB_MATRIX_HUE_WAVE ` |Enables `RGB_MATRIX_HUE_WAVE ` | |
477 | |`#define DISABLE_RGB_MATRIX_TYPING_HEATMAP` |Disables `RGB_MATRIX_TYPING_HEATMAP` | | 477 | |`#define ENABLE_RGB_MATRIX_TYPING_HEATMAP` |Enables `RGB_MATRIX_TYPING_HEATMAP` | |
478 | |`#define DISABLE_RGB_MATRIX_DIGITAL_RAIN` |Disables `RGB_MATRIX_DIGITAL_RAIN` | | 478 | |`#define ENABLE_RGB_MATRIX_DIGITAL_RAIN` |Enables `RGB_MATRIX_DIGITAL_RAIN` | |
479 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE` |Disables `RGB_MATRIX_SOLID_REACTIVE_SIMPLE` | | 479 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE` |Enables `RGB_MATRIX_SOLID_REACTIVE_SIMPLE` | |
480 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE` |Disables `RGB_MATRIX_SOLID_REACTIVE` | | 480 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE` |Enables `RGB_MATRIX_SOLID_REACTIVE` | |
481 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE` |Disables `RGB_MATRIX_SOLID_REACTIVE_WIDE` | | 481 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE` |Enables `RGB_MATRIX_SOLID_REACTIVE_WIDE` | |
482 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE` |Disables `RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE` | | 482 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE` |Enables `RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE` | |
483 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS` |Disables `RGB_MATRIX_SOLID_REACTIVE_CROSS` | | 483 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS` |Enables `RGB_MATRIX_SOLID_REACTIVE_CROSS` | |
484 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS` |Disables `RGB_MATRIX_SOLID_REACTIVE_MULTICROSS`| | 484 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS` |Enables `RGB_MATRIX_SOLID_REACTIVE_MULTICROSS`| |
485 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS` |Disables `RGB_MATRIX_SOLID_REACTIVE_NEXUS` | | 485 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS` |Enables `RGB_MATRIX_SOLID_REACTIVE_NEXUS` | |
486 | |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS` |Disables `RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS`| | 486 | |`#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS` |Enables `RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS`| |
487 | |`#define DISABLE_RGB_MATRIX_SPLASH` |Disables `RGB_MATRIX_SPLASH` | | 487 | |`#define ENABLE_RGB_MATRIX_SPLASH` |Enables `RGB_MATRIX_SPLASH` | |
488 | |`#define DISABLE_RGB_MATRIX_MULTISPLASH` |Disables `RGB_MATRIX_MULTISPLASH` | | 488 | |`#define ENABLE_RGB_MATRIX_MULTISPLASH` |Enables `RGB_MATRIX_MULTISPLASH` | |
489 | |`#define DISABLE_RGB_MATRIX_SOLID_SPLASH` |Disables `RGB_MATRIX_SOLID_SPLASH` | | 489 | |`#define ENABLE_RGB_MATRIX_SOLID_SPLASH` |Enables `RGB_MATRIX_SOLID_SPLASH` | |
490 | |`#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH` |Disables `RGB_MATRIX_SOLID_MULTISPLASH` | | 490 | |`#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH` |Enables `RGB_MATRIX_SOLID_MULTISPLASH` | |
491 | 491 | ||
492 | ### RGB Matrix Effect Typing Heatmap :id=rgb-matrix-effect-typing-heatmap | 492 | ### RGB Matrix Effect Typing Heatmap :id=rgb-matrix-effect-typing-heatmap |
493 | 493 | ||
diff --git a/quantum/led_matrix/animations/alpha_mods_anim.h b/quantum/led_matrix/animations/alpha_mods_anim.h index a4638fde6..14038cd08 100644 --- a/quantum/led_matrix/animations/alpha_mods_anim.h +++ b/quantum/led_matrix/animations/alpha_mods_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_ALPHAS_MODS | 1 | #ifdef ENABLE_LED_MATRIX_ALPHAS_MODS |
2 | LED_MATRIX_EFFECT(ALPHAS_MODS) | 2 | LED_MATRIX_EFFECT(ALPHAS_MODS) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/band_anim.h b/quantum/led_matrix/animations/band_anim.h index f9cb85dc4..5548787b8 100644 --- a/quantum/led_matrix/animations/band_anim.h +++ b/quantum/led_matrix/animations/band_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_BAND | 1 | #ifdef ENABLE_LED_MATRIX_BAND |
2 | LED_MATRIX_EFFECT(BAND) | 2 | LED_MATRIX_EFFECT(BAND) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/band_pinwheel_anim.h b/quantum/led_matrix/animations/band_pinwheel_anim.h index d3144bffb..89651582d 100644 --- a/quantum/led_matrix/animations/band_pinwheel_anim.h +++ b/quantum/led_matrix/animations/band_pinwheel_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_BAND_PINWHEEL | 1 | #ifdef ENABLE_LED_MATRIX_BAND_PINWHEEL |
2 | LED_MATRIX_EFFECT(BAND_PINWHEEL) | 2 | LED_MATRIX_EFFECT(BAND_PINWHEEL) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/band_spiral_anim.h b/quantum/led_matrix/animations/band_spiral_anim.h index defbe6967..70b0ffaea 100644 --- a/quantum/led_matrix/animations/band_spiral_anim.h +++ b/quantum/led_matrix/animations/band_spiral_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_BAND_SPIRAL | 1 | #ifdef ENABLE_LED_MATRIX_BAND_SPIRAL |
2 | LED_MATRIX_EFFECT(BAND_SPIRAL) | 2 | LED_MATRIX_EFFECT(BAND_SPIRAL) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/breathing_anim.h b/quantum/led_matrix/animations/breathing_anim.h index 4f49f5069..e3f600c45 100644 --- a/quantum/led_matrix/animations/breathing_anim.h +++ b/quantum/led_matrix/animations/breathing_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_BREATHING | 1 | #ifdef ENABLE_LED_MATRIX_BREATHING |
2 | LED_MATRIX_EFFECT(BREATHING) | 2 | LED_MATRIX_EFFECT(BREATHING) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/cycle_left_right_anim.h b/quantum/led_matrix/animations/cycle_left_right_anim.h index c426d02fd..769e6d794 100644 --- a/quantum/led_matrix/animations/cycle_left_right_anim.h +++ b/quantum/led_matrix/animations/cycle_left_right_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT | 1 | #ifdef ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT |
2 | LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) | 2 | LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/cycle_out_in_anim.h b/quantum/led_matrix/animations/cycle_out_in_anim.h index 55527556f..6adf9c25f 100644 --- a/quantum/led_matrix/animations/cycle_out_in_anim.h +++ b/quantum/led_matrix/animations/cycle_out_in_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_CYCLE_OUT_IN | 1 | #ifdef ENABLE_LED_MATRIX_CYCLE_OUT_IN |
2 | LED_MATRIX_EFFECT(CYCLE_OUT_IN) | 2 | LED_MATRIX_EFFECT(CYCLE_OUT_IN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/cycle_up_down_anim.h b/quantum/led_matrix/animations/cycle_up_down_anim.h index d97de0d1e..7a5868ac2 100644 --- a/quantum/led_matrix/animations/cycle_up_down_anim.h +++ b/quantum/led_matrix/animations/cycle_up_down_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_CYCLE_UP_DOWN | 1 | #ifdef ENABLE_LED_MATRIX_CYCLE_UP_DOWN |
2 | LED_MATRIX_EFFECT(CYCLE_UP_DOWN) | 2 | LED_MATRIX_EFFECT(CYCLE_UP_DOWN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/dual_beacon_anim.h b/quantum/led_matrix/animations/dual_beacon_anim.h index e1bc5ae46..3552c9fc3 100644 --- a/quantum/led_matrix/animations/dual_beacon_anim.h +++ b/quantum/led_matrix/animations/dual_beacon_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_DUAL_BEACON | 1 | #ifdef ENABLE_LED_MATRIX_DUAL_BEACON |
2 | LED_MATRIX_EFFECT(DUAL_BEACON) | 2 | LED_MATRIX_EFFECT(DUAL_BEACON) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/solid_reactive_cross.h b/quantum/led_matrix/animations/solid_reactive_cross.h index 94425c959..3a3c46be1 100644 --- a/quantum/led_matrix/animations/solid_reactive_cross.h +++ b/quantum/led_matrix/animations/solid_reactive_cross.h | |||
@@ -1,11 +1,11 @@ | |||
1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED |
2 | # if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) | 2 | # if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) |
3 | 3 | ||
4 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS | 4 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS |
5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_CROSS) | 5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_CROSS) |
6 | # endif | 6 | # endif |
7 | 7 | ||
8 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS | 8 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS |
9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS) | 9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS) |
10 | # endif | 10 | # endif |
11 | 11 | ||
@@ -22,11 +22,11 @@ static uint8_t SOLID_REACTIVE_CROSS_math(uint8_t val, int16_t dx, int16_t dy, ui | |||
22 | return qadd8(val, 255 - effect); | 22 | return qadd8(val, 255 - effect); |
23 | } | 23 | } |
24 | 24 | ||
25 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS | 25 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS |
26 | 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); } | 26 | 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 | # endif | 27 | # endif |
28 | 28 | ||
29 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS | 29 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS |
30 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); } | 30 | bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); } |
31 | # endif | 31 | # endif |
32 | 32 | ||
diff --git a/quantum/led_matrix/animations/solid_reactive_nexus.h b/quantum/led_matrix/animations/solid_reactive_nexus.h index 504b1104f..2520b8e1d 100644 --- a/quantum/led_matrix/animations/solid_reactive_nexus.h +++ b/quantum/led_matrix/animations/solid_reactive_nexus.h | |||
@@ -1,11 +1,11 @@ | |||
1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED |
2 | # if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) | 2 | # if defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) |
3 | 3 | ||
4 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS | 4 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS |
5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_NEXUS) | 5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_NEXUS) |
6 | # endif | 6 | # endif |
7 | 7 | ||
8 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS | 8 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS |
9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTINEXUS) | 9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTINEXUS) |
10 | # endif | 10 | # endif |
11 | 11 | ||
@@ -19,11 +19,11 @@ static uint8_t SOLID_REACTIVE_NEXUS_math(uint8_t val, int16_t dx, int16_t dy, ui | |||
19 | return qadd8(val, 255 - effect); | 19 | return qadd8(val, 255 - effect); |
20 | } | 20 | } |
21 | 21 | ||
22 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS | 22 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS |
23 | bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); } | 23 | bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); } |
24 | # endif | 24 | # endif |
25 | 25 | ||
26 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS | 26 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS |
27 | bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); } | 27 | bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); } |
28 | # endif | 28 | # endif |
29 | 29 | ||
diff --git a/quantum/led_matrix/animations/solid_reactive_simple_anim.h b/quantum/led_matrix/animations/solid_reactive_simple_anim.h index 4752a8416..43f6ad9ab 100644 --- a/quantum/led_matrix/animations/solid_reactive_simple_anim.h +++ b/quantum/led_matrix/animations/solid_reactive_simple_anim.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED |
2 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE | 2 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE |
3 | LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE) | 3 | LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE) |
4 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 4 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
5 | 5 | ||
diff --git a/quantum/led_matrix/animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h index 922e32fe5..d683b0251 100644 --- a/quantum/led_matrix/animations/solid_reactive_wide.h +++ b/quantum/led_matrix/animations/solid_reactive_wide.h | |||
@@ -1,11 +1,11 @@ | |||
1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED |
2 | # if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) | 2 | # if !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) |
3 | 3 | ||
4 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE | 4 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE |
5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE) | 5 | LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE) |
6 | # endif | 6 | # endif |
7 | 7 | ||
8 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE | 8 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE |
9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTIWIDE) | 9 | LED_MATRIX_EFFECT(SOLID_REACTIVE_MULTIWIDE) |
10 | # endif | 10 | # endif |
11 | 11 | ||
@@ -17,11 +17,11 @@ static uint8_t SOLID_REACTIVE_WIDE_math(uint8_t val, int16_t dx, int16_t dy, uin | |||
17 | return qadd8(val, 255 - effect); | 17 | return qadd8(val, 255 - effect); |
18 | } | 18 | } |
19 | 19 | ||
20 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE | 20 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE |
21 | bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); } | 21 | bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); } |
22 | # endif | 22 | # endif |
23 | 23 | ||
24 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE | 24 | # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE |
25 | bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); } | 25 | bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); } |
26 | # endif | 26 | # endif |
27 | 27 | ||
diff --git a/quantum/led_matrix/animations/solid_splash_anim.h b/quantum/led_matrix/animations/solid_splash_anim.h index d95889b81..cf599c8fe 100644 --- a/quantum/led_matrix/animations/solid_splash_anim.h +++ b/quantum/led_matrix/animations/solid_splash_anim.h | |||
@@ -1,11 +1,11 @@ | |||
1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef LED_MATRIX_KEYREACTIVE_ENABLED |
2 | # if !defined(DISABLE_LED_MATRIX_SOLID_SPLASH) || !defined(DISABLE_LED_MATRIX_SOLID_MULTISPLASH) | 2 | # if !defined(DISABLE_LED_MATRIX_SOLID_SPLASH) || !defined(DISABLE_LED_MATRIX_SOLID_MULTISPLASH) |
3 | 3 | ||
4 | # ifndef DISABLE_LED_MATRIX_SOLID_SPLASH | 4 | # ifdef ENABLE_LED_MATRIX_SOLID_SPLASH |
5 | LED_MATRIX_EFFECT(SOLID_SPLASH) | 5 | LED_MATRIX_EFFECT(SOLID_SPLASH) |
6 | # endif | 6 | # endif |
7 | 7 | ||
8 | # ifndef DISABLE_LED_MATRIX_SOLID_MULTISPLASH | 8 | # ifdef ENABLE_LED_MATRIX_SOLID_MULTISPLASH |
9 | LED_MATRIX_EFFECT(SOLID_MULTISPLASH) | 9 | LED_MATRIX_EFFECT(SOLID_MULTISPLASH) |
10 | # endif | 10 | # endif |
11 | 11 | ||
@@ -17,11 +17,11 @@ uint8_t SOLID_SPLASH_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uin | |||
17 | return qadd8(val, 255 - effect); | 17 | return qadd8(val, 255 - effect); |
18 | } | 18 | } |
19 | 19 | ||
20 | # ifndef DISABLE_LED_MATRIX_SOLID_SPLASH | 20 | # ifdef ENABLE_LED_MATRIX_SOLID_SPLASH |
21 | bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); } | 21 | bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); } |
22 | # endif | 22 | # endif |
23 | 23 | ||
24 | # ifndef DISABLE_LED_MATRIX_SOLID_MULTISPLASH | 24 | # ifdef ENABLE_LED_MATRIX_SOLID_MULTISPLASH |
25 | bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); } | 25 | bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); } |
26 | # endif | 26 | # endif |
27 | 27 | ||
diff --git a/quantum/led_matrix/animations/wave_left_right_anim.h b/quantum/led_matrix/animations/wave_left_right_anim.h index 8579f1b45..c062cf968 100644 --- a/quantum/led_matrix/animations/wave_left_right_anim.h +++ b/quantum/led_matrix/animations/wave_left_right_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT | 1 | #ifdef ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT |
2 | LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT) | 2 | LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/animations/wave_up_down_anim.h b/quantum/led_matrix/animations/wave_up_down_anim.h index 635c60841..5e612f6b6 100644 --- a/quantum/led_matrix/animations/wave_up_down_anim.h +++ b/quantum/led_matrix/animations/wave_up_down_anim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | #ifndef DISABLE_LED_MATRIX_WAVE_UP_DOWN | 1 | #ifdef ENABLE_LED_MATRIX_WAVE_UP_DOWN |
2 | LED_MATRIX_EFFECT(WAVE_UP_DOWN) | 2 | LED_MATRIX_EFFECT(WAVE_UP_DOWN) |
3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS | 3 | # ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS |
4 | 4 | ||
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index 6f85854fb..a7a1c983f 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "led_matrix_types.h" | 24 | #include "led_matrix_types.h" |
25 | #include "quantum.h" | 25 | #include "quantum.h" |
26 | #include "led_matrix_legacy_enables.h" | ||
26 | 27 | ||
27 | #ifdef IS31FL3731 | 28 | #ifdef IS31FL3731 |
28 | # include "is31fl3731-simple.h" | 29 | # include "is31fl3731-simple.h" |
diff --git a/quantum/led_matrix/led_matrix_legacy_enables.h b/quantum/led_matrix/led_matrix_legacy_enables.h new file mode 100644 index 000000000..7738d2f34 --- /dev/null +++ b/quantum/led_matrix/led_matrix_legacy_enables.h | |||
@@ -0,0 +1,82 @@ | |||
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_LED_MATRIX_ALPHAS_MODS | ||
22 | # define ENABLE_LED_MATRIX_ALPHAS_MODS | ||
23 | #endif | ||
24 | #ifndef DISABLE_LED_MATRIX_BREATHING | ||
25 | # define ENABLE_LED_MATRIX_BREATHING | ||
26 | #endif | ||
27 | #ifndef DISABLE_LED_MATRIX_BAND | ||
28 | # define ENABLE_LED_MATRIX_BAND | ||
29 | #endif | ||
30 | #ifndef DISABLE_LED_MATRIX_BAND_PINWHEEL | ||
31 | # define ENABLE_LED_MATRIX_BAND_PINWHEEL | ||
32 | #endif | ||
33 | #ifndef DISABLE_LED_MATRIX_BAND_SPIRAL | ||
34 | # define ENABLE_LED_MATRIX_BAND_SPIRAL | ||
35 | #endif | ||
36 | #ifndef DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT | ||
37 | # define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT | ||
38 | #endif | ||
39 | #ifndef DISABLE_LED_MATRIX_CYCLE_UP_DOWN | ||
40 | # define ENABLE_LED_MATRIX_CYCLE_UP_DOWN | ||
41 | #endif | ||
42 | #ifndef DISABLE_LED_MATRIX_CYCLE_OUT_IN | ||
43 | # define ENABLE_LED_MATRIX_CYCLE_OUT_IN | ||
44 | #endif | ||
45 | #ifndef DISABLE_LED_MATRIX_DUAL_BEACON | ||
46 | # define ENABLE_LED_MATRIX_DUAL_BEACON | ||
47 | #endif | ||
48 | #if defined(LED_MATRIX_KEYREACTIVE_ENABLED) | ||
49 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE | ||
50 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE | ||
51 | # endif | ||
52 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE | ||
53 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE | ||
54 | # endif | ||
55 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
56 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||
57 | # endif | ||
58 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS | ||
59 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS | ||
60 | # endif | ||
61 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
62 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS | ||
63 | # endif | ||
64 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS | ||
65 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS | ||
66 | # endif | ||
67 | # ifndef DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
68 | # define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||
69 | # endif | ||
70 | # ifndef DISABLE_LED_MATRIX_SPLASH | ||
71 | # define ENABLE_LED_MATRIX_SPLASH | ||
72 | # endif | ||
73 | # ifndef DISABLE_LED_MATRIX_MULTISPLASH | ||
74 | # define ENABLE_LED_MATRIX_MULTISPLASH | ||
75 | # endif | ||
76 | #endif | ||
77 | #ifndef DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT | ||
78 | # define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT | ||
79 | #endif | ||
80 | #ifndef DISABLE_LED_MATRIX_WAVE_UP_DOWN | ||
81 | # define ENABLE_LED_MATRIX_WAVE_UP_DOWN | ||
82 | #endif | ||
diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c index b9fee1ca5..69853cd5c 100644 --- a/quantum/process_keycode/process_rgb.c +++ b/quantum/process_keycode/process_rgb.c | |||
@@ -161,7 +161,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { | |||
161 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_BREATHING) | 161 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_BREATHING) |
162 | handleKeycodeRGBMode(RGBLIGHT_MODE_BREATHING, RGBLIGHT_MODE_BREATHING_end); | 162 | handleKeycodeRGBMode(RGBLIGHT_MODE_BREATHING, RGBLIGHT_MODE_BREATHING_end); |
163 | #endif | 163 | #endif |
164 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && !defined(DISABLE_RGB_MATRIX_BREATHING) | 164 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && defined(ENABLE_RGB_MATRIX_BREATHING) |
165 | rgb_matrix_mode(RGB_MATRIX_BREATHING); | 165 | rgb_matrix_mode(RGB_MATRIX_BREATHING); |
166 | #endif | 166 | #endif |
167 | return false; | 167 | return false; |
@@ -169,7 +169,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { | |||
169 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_MOOD) | 169 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_MOOD) |
170 | handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_MOOD, RGBLIGHT_MODE_RAINBOW_MOOD_end); | 170 | handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_MOOD, RGBLIGHT_MODE_RAINBOW_MOOD_end); |
171 | #endif | 171 | #endif |
172 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && !defined(DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT) | 172 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && defined(ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT) |
173 | rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT); | 173 | rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT); |
174 | #endif | 174 | #endif |
175 | return false; | 175 | return false; |
@@ -177,7 +177,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { | |||
177 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_SWIRL) | 177 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_SWIRL) |
178 | handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_SWIRL, RGBLIGHT_MODE_RAINBOW_SWIRL_end); | 178 | handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_SWIRL, RGBLIGHT_MODE_RAINBOW_SWIRL_end); |
179 | #endif | 179 | #endif |
180 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && !defined(DISABLE_RGB_MATRIX_CYCLE_PINWHEEL) | 180 | #if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && defined(ENABLE_RGB_MATRIX_CYCLE_PINWHEEL) |
181 | rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL); | 181 | rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL); |
182 | #endif | 182 | #endif |
183 | return false; | 183 | return false; |
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 | ||