Move matrix config to info.json, part 7 (#20020)

19 files changed, 45 insertions, 148 deletions

diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 4eaec15ad2..6f4decad61 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { F5 }
-#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
 
@@ -37,7 +32,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6    // Number of LEDs
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index 21df7d9dda..38f127cffc 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h
deleted file mode 100755
index 1b11bc5ce9..0000000000
--- a/keyboards/maple_computing/c39/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D1, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, C6, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json
index 370f21ad09..7cb73383a7 100755
--- a/keyboards/maple_computing/c39/info.json
+++ b/keyboards/maple_computing/c39/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCA39",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"],
+        "rows": ["D1", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h
index 40c2ce1f48..5070f05156 100644
--- a/keyboards/maple_computing/christmas_tree/config.h
+++ b/keyboards/maple_computing/christmas_tree/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 }
-#define MATRIX_COL_PINS { D1 }
-
-/* 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/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index d60dabe1df..3ef81f9fd3 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -7,6 +7,11 @@
     "vid": "0xFEED",
     "pid": "0x3070"
   },
+  "matrix_pins": {
+    "cols": ["D1"],
+    "rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D2"
   },
diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h
deleted file mode 100644
index 902f807051..0000000000
--- a/keyboards/maple_computing/ivy/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Let's Macro V2 pin-out */
-#define MATRIX_ROW_PINS { F1, B2, D3 }
-#define MATRIX_COL_PINS { F5, B3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index 19109ca73f..e9cf604e19 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "B3", "D5"],
+        "rows": ["F1", "B2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D2"
     },
diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h
index 24942e7a51..c2949ab3a7 100644
--- a/keyboards/maple_computing/jnao/config.h
+++ b/keyboards/maple_computing/jnao/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 }
-
-/* 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/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json
index afa5a8674e..cfc198c02e 100644
--- a/keyboards/maple_computing/jnao/info.json
+++ b/keyboards/maple_computing/jnao/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6017",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"],
+    "rows": ["E6", "F0", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D0"
   },
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index cd0ea962c2..aecb3f02bd 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../config.h"
-
-/* Let's Macro V2 pin-out */
-#define MATRIX_ROW_PINS { C6, B1, B3, D7 }
-#define MATRIX_COL_PINS { D2, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 10
 #define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 8ae1835b69..49f4c16bc9 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "F7"],
+        "rows": ["C6", "B1", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 55d2428db0..0a12b77265 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Let's Split EH? pin-out */
-#define MATRIX_ROW_PINS { B1, B3, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B2
 #define RGBLED_NUM 12    // Number of LEDs (each hand)
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 4574b10b64..4d2ee20c0b 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE401",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "B6", "B5", "D5"],
+        "rows": ["B1", "B3", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h
index cc2f0c8379..c59b7d33b1 100644
--- a/keyboards/maple_computing/minidox/config.h
+++ b/keyboards/maple_computing/minidox/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* 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/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
deleted file mode 100644
index 26979e4edc..0000000000
--- a/keyboards/maple_computing/minidox/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
-#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }
-
-//#define EE_HANDS
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index 83794bb116..9d1e2b806f 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "D3", "D2", "D1", "D4"],
+    "rows": ["B2", "B6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index 53e7bfe55f..d6c805d7c5 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/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 { C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, 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/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 69347412ce..fd4de0bcbf 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6007",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "B4", "B5", "B6", "C6"],
+    "rows": ["C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {