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

5 files changed, 10 insertions, 40 deletions

diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 4063b253b6..a3de56d076 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -17,20 +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 DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B9
 #define WS2812_PWM_DRIVER   PWMD4
 #define WS2812_PWM_CHANNEL  4
diff --git a/keyboards/handwired/macroboard/f401/config.h b/keyboards/handwired/macroboard/f401/config.h
deleted file mode 100644
index c5ea2ff6a2..0000000000
--- a/keyboards/handwired/macroboard/f401/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Michał Szczepaniak
-
-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 { A4, A3, A2, A1, A0  }
-#define MATRIX_COL_PINS { A5, A6, A7, B0, B1, B10 }
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
index acd7e83f77..e14cb41fd3 100644
--- a/keyboards/handwired/macroboard/f401/info.json
+++ b/keyboards/handwired/macroboard/f401/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h
index c7004fd520..cc951dcefc 100644
--- a/keyboards/handwired/macroboard/f411/config.h
+++ b/keyboards/handwired/macroboard/f411/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 }
-
 #define AUDIO_INIT_DELAY
 #define AUDIO_PIN B10
 #define AUDIO_PWM_DRIVER PWMD2
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
index 2517a82403..a912b9f141 100644
--- a/keyboards/handwired/macroboard/f411/info.json
+++ b/keyboards/handwired/macroboard/f411/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["A15", "B3", "B4", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"