Fix additional board sizes for RGB Matrix (#15170)

1 files changed, 104 insertions, 137 deletions

diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index ee0de340a4..fcff40f35a 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -140,145 +140,112 @@
 // #    define REDUCE_RGB_MATRIX_EFFECTS_2
 
 // #    ifdef AUDIO_ENABLE
-#   ifdef CONSOLE_ENABLE
-// #        define DISABLE_RGB_MATRIX_SOLID_COLOR
-#       define DISABLE_RGB_MATRIX_ALPHAS_MODS
-#       define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#       define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#       define DISABLE_RGB_MATRIX_BREATHING
-#       define DISABLE_RGB_MATRIX_BAND_SAT
-#       define DISABLE_RGB_MATRIX_BAND_VAL
-#       define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#       define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#       define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#       define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#       define DISABLE_RGB_MATRIX_CYCLE_ALL
-#       define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#       define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#       define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-#       define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#       define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#       define DISABLE_RGB_MATRIX_DUAL_BEACON
-#       define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#       define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
-#       define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-#       define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#       define DISABLE_RGB_MATRIX_RAINDROPS
-#       define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#       define DISABLE_RGB_MATRIX_HUE_BREATHING
-#       define DISABLE_RGB_MATRIX_HUE_PENDULUM
-#       define DISABLE_RGB_MATRIX_HUE_WAVE
-#       define DISABLE_RGB_MATRIX_TYPING_HEATMAP
-#       define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#       define DISABLE_RGB_MATRIX_SPLASH
-#       define DISABLE_RGB_MATRIX_MULTISPLASH
-#       define DISABLE_RGB_MATRIX_SOLID_SPLASH
-#       define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#   else
-#       define DISABLE_RGB_MATRIX_SOLID_COLOR
-#       define DISABLE_RGB_MATRIX_ALPHAS_MODS
-#       define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#       define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#       define DISABLE_RGB_MATRIX_BREATHING
-#       define DISABLE_RGB_MATRIX_BAND_SAT
-#       define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#       define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#       define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#       define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-
-//  RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
-#       define DISABLE_RGB_MATRIX_RAINDROPS
-#       define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//  Recommendend not to use then.
-
-#       if defined(REDUCE_RGB_MATRIX_EFFECTS) || defined(VIA_ENABLE)
+#    ifdef CONSOLE_ENABLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    else
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#        define ENABLE_RGB_MATRIX_HUE_BREATHING
+#        define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#        define ENABLE_RGB_MATRIX_HUE_WAVE
+#        define ENABLE_RGB_MATRIX_FRACTAL
+#        define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#        if !defined(REDUCE_RGB_MATRIX_EFFECTS) && !defined(VIA_ENABLE)
 // #       ifdef REDUCE_RGB_MATRIX_EFFECTS
-#           define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#           define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#           define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-#           define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#           define DISABLE_RGB_MATRIX_DUAL_BEACON
-#           define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#           define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
-#       endif
-
-#       define DISABLE_RGB_MATRIX_HUE_BREATHING
-#       define DISABLE_RGB_MATRIX_HUE_PENDULUM
-#       define DISABLE_RGB_MATRIX_HUE_WAVE
-#       define DISABLE_RGB_MATRIX_TYPING_HEATMAP
-#       define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#       define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-
-#       if defined(REDUCE_RGB_MATRIX_EFFECTS_2) || defined(VIA_ENABLE)
+#            define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#            define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#            define ENABLE_RGB_MATRIX_DUAL_BEACON
+#            define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#            define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        endif
+
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_FRACTAL
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+
+#        if !defined(REDUCE_RGB_MATRIX_EFFECTS_2) && !defined(VIA_ENABLE)
 // #       ifdef REDUCE_RGB_MATRIX_EFFECTS_2
-#           define DISABLE_RGB_MATRIX_BAND_VAL
-#           define DISABLE_RGB_MATRIX_CYCLE_ALL
-#           define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#           define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#           define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-#           define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#           define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#           define DISABLE_RGB_MATRIX_MULTISPLASH
-#           define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#       endif
-// #           define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-#       define DISABLE_RGB_MATRIX_SPLASH
-#       define DISABLE_RGB_MATRIX_SOLID_SPLASH
-#   endif  // AUDIO_ENABLE
-
-// #define DISABLE_RGB_MATRIX_SOLID_COLOR
-// #define DISABLE_RGB_MATRIX_ALPHAS_MODS
-// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-// #define DISABLE_RGB_MATRIX_BREATHING
-// #define DISABLE_RGB_MATRIX_BAND_SAT  // white background ver. of _BAND_VAL
-// #define DISABLE_RGB_MATRIX_BAND_VAL
-// #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-// #define DISABLE_RGB_MATRIX_CYCLE_ALL
-// #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-// #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-// #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-// #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-// #define DISABLE_RGB_MATRIX_DUAL_BEACON
-// #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
-// #define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define DISABLE_RGB_MATRIX_RAINDROPS
-// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  //White ver of above.
-// #define DISABLE_RGB_MATRIX_HUE_BREATHING
-// #define DISABLE_RGB_MATRIX_HUE_PENDULUM
-// #define DISABLE_RGB_MATRIX_HUE_WAVE
-// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #define DISABLE_RGB_MATRIX_SPLASH
-// #define DISABLE_RGB_MATRIX_MULTISPLASH
-// #define DISABLE_RGB_MATRIX_SOLID_SPLASH
-// #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#            define ENABLE_RGB_MATRIX_BAND_VAL
+#            define ENABLE_RGB_MATRIX_CYCLE_ALL
+#            define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#            define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#            define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#            define ENABLE_RGB_MATRIX_MULTISPLASH
+#            define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#        endif
+// #define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    endif  // AUDIO_ENABLE
+
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+// #define ENABLE_RGB_MATRIX_CYCLE_ALL
+// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+// #define ENABLE_RGB_MATRIX_DUAL_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_FRACTAL
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
 #endif  // RGB_MATRIX_ENABLE
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */