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

16 files changed, 50 insertions, 78 deletions

diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index ff4b7bb3aa..84c2fd11dc 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -17,17 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
 #define AUDIO_VOICES
 #define AUDIO_PIN C6
 
-/* COL2ROW or 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/planck/ez/config.h b/keyboards/planck/ez/config.h
index 04bfc314ce..6828e4dce2 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -18,23 +18,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)
- *
-*/
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define MUSIC_MAP
 #undef AUDIO_VOICES
 #undef AUDIO_PIN
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index ae67be691d..786814b987 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -6,6 +6,11 @@
     "vid": "0x3297",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index 7a64f87174..d4001dd80b 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -1,14 +1,5 @@
 #pragma once
 
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS \
-    { B0, E7, F0, F1 }
-#define MATRIX_COL_PINS \
-    { E6, E3, E4, D3, D4, D5, C0, A7, A6, E1, E0, D7 }
-
 #define AUDIO_PIN     C6
 #define AUDIO_PIN_ALT B5
 
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index c2ab19563e..5958899759 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -8,6 +8,11 @@
     "pid": "0xBEA2",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"],
+    "rows": ["B0", "E7", "F0", "F1"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "A5"
   },
diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json
index ebf11c9c8b..649132c30c 100644
--- a/keyboards/planck/rev1/info.json
+++ b/keyboards/planck/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json
index b7a3a31628..ac4c605313 100644
--- a/keyboards/planck/rev2/info.json
+++ b/keyboards/planck/rev2/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json
index 4ba0085cda..c853b9230d 100644
--- a/keyboards/planck/rev3/info.json
+++ b/keyboards/planck/rev3/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json
index 46513d8248..c541e2dc4d 100644
--- a/keyboards/planck/rev4/info.json
+++ b/keyboards/planck/rev4/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.4"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
index 9fb2ae811e..883572e8e1 100644
--- a/keyboards/planck/rev5/info.json
+++ b/keyboards/planck/rev5/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.5"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index a60c086b5b..5bde659509 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -17,23 +17,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)
- *
-*/
-/* Note: These are not used for arm boards. They're here purely as documentation. */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS { B14, A15, A0, B9 }
 
 #define MUSIC_MAP
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 9cc60ab5f0..904b998d03 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index 192d3fc6d8..296e1ac6d9 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -17,25 +17,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)
- *
- */
-/* Note: These are not used for arm boards. They're here purely as documentation. */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS \
-    { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS \
-    { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS \
     { B14, A15, A0, B9 }
 
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index 828f0c20b8..0b5279b2fb 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h
index bd93164345..832fb0789c 100644
--- a/keyboards/planck/thk/config.h
+++ b/keyboards/planck/thk/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// THK has a different pin-out
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A7, A6, A5, A4 }
-#define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A3, A2, A1, A0, B0 }
-
 #define TAPPING_TOGGLE 3
 
 #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index 418dda97da..c99041be74 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -8,6 +8,11 @@
     "pid": "0x25A7",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
+    "rows": ["A7", "A6", "A5", "A4"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B4", "pin_b": "B3"},