Move matrix config to info.json, part 3 (#19991)

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

6 files changed, 15 insertions, 26 deletions

diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 3c23bce9be..c8c69d2ee0 100644
--- a/keyboards/eason/aeroboard/config.h
+++ b/keyboards/eason/aeroboard/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5, A4 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 73ef41d221..26f5309847 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8870",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5", "A4"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index 176ccc1689..0048707fd2 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -16,22 +16,6 @@
 
 #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 { F4, D1, B7, D0, F5 }
-#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 4c49f6feef..9935a33134 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6E6E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"],
+        "rows": ["F4", "D1", "B7", "D0", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F6"
     },
diff --git a/keyboards/eason/greatsword80/config.h b/keyboards/eason/greatsword80/config.h
index 73347f77df..9a0ee7ab72 100644
--- a/keyboards/eason/greatsword80/config.h
+++ b/keyboards/eason/greatsword80/config.h
@@ -16,11 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7, E2, F7, F6, F5, F4, B0, B1, B2, B3 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LED_CAPS_LOCK_PIN  F0
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/info.json
index 69e4bc7ef2..b3a448ef1b 100644
--- a/keyboards/eason/greatsword80/info.json
+++ b/keyboards/eason/greatsword80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x998F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {