Move matrix config to info.json, part 4 (#20001)

7 files changed, 15 insertions, 21 deletions

diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
index 3a5898c546..4366a8a3e9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP27 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN GP29
 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index e4f48e6c7e..796d22dc71 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Assembled",
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
index 67e9646845..fd7bb0f107 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP27 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index aec0957ed6..7796a7c311 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Splinky",
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index a30b98a10a..250732dc7a 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP27, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP28 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN GP29
 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index a4fe592587..a6e0d16a65 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,6 +4,11 @@
         "device_version": "2.0.0",
         "pid": "0x1835"
     },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index 3ea785525c..d282c635ea 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.