Move matrix config to info.json, part 6 (#20019)

6 files changed, 15 insertions, 97 deletions

diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
deleted file mode 100644
index 07e8b9ac93..0000000000
--- a/keyboards/converter/a1200/miss1200/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 8bits4ever
-
-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
-
-
-/*
- * 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 { F7, F6, F5, F4, F1, F0, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json
index 326d73ec83..74d569b8d9 100644
--- a/keyboards/converter/a1200/miss1200/info.json
+++ b/keyboards/converter/a1200/miss1200/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 6b2204ec43..21ba99e0b7 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/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 { F7, F6, F5, F4, F1, F0, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define TAPPING_TOGGLE 3
 
 #undef LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json
index dfbe75c79c..c37bdadd61 100644
--- a/keyboards/converter/a1200/mistress1200/info.json
+++ b/keyboards/converter/a1200/mistress1200/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
deleted file mode 100644
index c859413d18..0000000000
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 8bits4ever
-
-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
-
-
-/*
- * 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 { F0, F1, F2, F3, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json
index a69aa38278..e4d0c09c0f 100644
--- a/keyboards/converter/a1200/teensy2pp/info.json
+++ b/keyboards/converter/a1200/teensy2pp/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
+        "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B6"
     },