[Keyboard] Update to ZSA Boards (qmk#10119)

8 files changed, 6 insertions, 29 deletions

diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index 6f438d0d50..9550d6465c 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -146,11 +146,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       case VRSN:
         SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
         return false;
-      #ifdef RGBLIGHT_ENABLE
+#ifdef RGBLIGHT_ENABLE
       case RGB_SLD:
         rgblight_mode(1);
         return false;
-      #endif
+#endif
     }
   }
   return true;
diff --git a/keyboards/ergodox_ez/keymaps/glow/keymap.c b/keyboards/ergodox_ez/keymaps/glow/keymap.c
deleted file mode 100644
index 526c364029..0000000000
--- a/keyboards/ergodox_ez/keymaps/glow/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
-// Placeholder.  See ../default/keymap.c for details
diff --git a/keyboards/ergodox_ez/keymaps/glow/rules.mk b/keyboards/ergodox_ez/keymaps/glow/rules.mk
deleted file mode 100644
index 3c1b984562..0000000000
--- a/keyboards/ergodox_ez/keymaps/glow/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes # enable later
-
-SRC += ../default/keymap.c
-
-LINK_TIME_OPTIMIZATION_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/oryx/keymap.c b/keyboards/ergodox_ez/keymaps/oryx/keymap.c
index 81c8b1b912..f3190852cd 100644
--- a/keyboards/ergodox_ez/keymaps/oryx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/oryx/keymap.c
@@ -68,6 +68,7 @@ bool suspended = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
+#ifdef RGBLIGHT_ENABLE
       case RGB_SLD:
         if (record->event.pressed) {
                 rgblight_mode(1);
@@ -100,6 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 #endif
               }
         return false;
+#endif
     }
   return true;
 }
diff --git a/keyboards/ergodox_ez/keymaps/reactive/config.h b/keyboards/ergodox_ez/keymaps/reactive/config.h
deleted file mode 100644
index 6e86f8d9d0..0000000000
--- a/keyboards/ergodox_ez/keymaps/reactive/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#define DISABLE_RGB_MATRIX_ALPHAS_MODS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/ergodox_ez/keymaps/reactive/keymap.c b/keyboards/ergodox_ez/keymaps/reactive/keymap.c
deleted file mode 100644
index 526c364029..0000000000
--- a/keyboards/ergodox_ez/keymaps/reactive/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
-// Placeholder.  See ../default/keymap.c for details
diff --git a/keyboards/ergodox_ez/keymaps/reactive/rules.mk b/keyboards/ergodox_ez/keymaps/reactive/rules.mk
deleted file mode 100644
index b1be2c921b..0000000000
--- a/keyboards/ergodox_ez/keymaps/reactive/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes # enable later
-
-SRC += ../default/keymap.c
-
-LINK_TIME_OPTIMIZATION_ENABLE = yes
-COMMAND_ENABLE = no
diff --git a/keyboards/ergodox_ez/keymaps/webusb/keymap.c b/keyboards/ergodox_ez/keymaps/webusb/keymap.c
index 15eb76c15e..d37cc49fc3 100644
--- a/keyboards/ergodox_ez/keymaps/webusb/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/webusb/keymap.c
@@ -68,6 +68,7 @@ bool suspended = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
+#ifdef RGBLIGHT_ENABLE
       case RGB_SLD:
         if (record->event.pressed) {
                 rgblight_mode(1);
@@ -100,6 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 #endif
               }
         return false;
+#endif
     }
   return true;
 }