Move matrix config to info.json, part 5 (#20003)

Co-authored-by: Nick Brassel <nick@tzarc.org>

6 files changed, 15 insertions, 12 deletions

diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 68ad770787..9a425a91a8 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#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/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 8ff4f8d8ce..46138869fc 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,6 +7,11 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 51efda06a6..9a425a91a8 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define MATRIX_ROW_PINS { A14, A15, B3 }
-#define MATRIX_COL_PINS { B8, B5, B4 }
-#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/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index c9ec1e17d7..ed0b994805 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -7,6 +7,11 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B5", "B4"],
+        "rows": ["A14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index fd10220d9f..7b6f2e2120 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index a50da579e3..edfc012c28 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0201",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {