6 files changed, 15 insertions, 41 deletions
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index a6e5ac891f..cd1f84bc1f 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 5089486866..217d979c41 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -6,6 +6,11 @@
     "pid": "0xAA97",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 5,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
index 947e340c32..ddfe166509 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
@@ -16,8 +16,7 @@
 
 #pragma once
 
-#define RGB_DI_PIN F7
-#ifdef  RGB_DI_PIN
+#define WS2812_DI_PIN F7
   #define RGBLED_NUM 15
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -28,6 +27,5 @@
   #define RGBLIGHT_EFFECT_KNIGHT
   #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- #endif
 
 // place overrides here
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
index 065b8f5233..14cde79827 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
@@ -31,7 +31,7 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 **config.h**
 ```
 [...]
-#define RGB_DI_PIN F7
+#define WS2812_DI_PIN F7
 #define RGBLED_NUM 15        // Change this number to the amount of LEDs on the strip you soldered
 [...]
 ```
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 61604a74a9..85da50eba8 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -44,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
    #define RGBLIGHT_HUE_STEP 12
    #define RGBLIGHT_SAT_STEP 25
@@ -62,4 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index 17bc326890..6bf10eedee 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -6,11 +6,19 @@
       "pid": "0xAA98",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
+      "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D0",
       "levels": 5,
       "breathing": true
     },
+    "ws2812": {
+      "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {