8 files changed, 15 insertions, 92 deletions
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/config.h b/keyboards/tronguylabs/m122_3270/blackpill/config.h
deleted file mode 100644
index 03d97de30e..0000000000
--- a/keyboards/tronguylabs/m122_3270/blackpill/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@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
-
-// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
-// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
-// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
-// rows are inputs). Note that every usable I/O pin is used.
-#define MATRIX_COL_PINS { B0, B1, B10, B12, B13, B14, B15, A8, A7, A10, A6, A5, A15, B3, B4, B5, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { C13, C14, C15, A0, A1, A2, A3, A4 }
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json
index f5e8f4835d..b17554b7e0 100644
--- a/keyboards/tronguylabs/m122_3270/blackpill/info.json
+++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A7", "A10", "A6", "A5", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/config.h b/keyboards/tronguylabs/m122_3270/bluepill/config.h
deleted file mode 100644
index c8cf8523f6..0000000000
--- a/keyboards/tronguylabs/m122_3270/bluepill/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@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
-
-// place overrides below
-
-// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
-// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
-// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
-// rows are inputs). Note that every usable I/O pin is used.
-#define MATRIX_COL_PINS { B1, B10, B11, B12, B13, B14, B15, A8, B0, A10, A7, A6, A15, B3, B4, B5, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { C13, C14, C15, A1, A2, A3, A4, A5 }
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json
index 86af52a58d..e2f18d06e4 100644
--- a/keyboards/tronguylabs/m122_3270/bluepill/info.json
+++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "B0", "A10", "A7", "A6", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h
index e51a882c42..754e0977c4 100644
--- a/keyboards/tronguylabs/m122_3270/config.h
+++ b/keyboards/tronguylabs/m122_3270/config.h
@@ -19,6 +19,3 @@
 
 // Both controllers draw 100 mA or less
 #define USB_MAX_POWER_CONSUMPTION 100
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/tronguylabs/m122_3270/m122_3270.c b/keyboards/tronguylabs/m122_3270/m122_3270.c
deleted file mode 100644
index 397d495c23..0000000000
--- a/keyboards/tronguylabs/m122_3270/m122_3270.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James R. Maynard III
- *
- * 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/>.
- */
-
-#include "m122_3270.h"
diff --git a/keyboards/tronguylabs/m122_3270/teensy/config.h b/keyboards/tronguylabs/m122_3270/teensy/config.h
deleted file mode 100644
index b105ecad52..0000000000
--- a/keyboards/tronguylabs/m122_3270/teensy/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@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
-
-// Teensy pin assignments: I'm wiring things a bit more straightforwardly, and
-//    avoiding the LED on PD6
-#define MATRIX_COL_PINS { B5, B6, B7, D0, D1, D2, D3, D4, D5, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 }
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json
index def31867f6..7596f5fc15 100644
--- a/keyboards/tronguylabs/m122_3270/teensy/info.json
+++ b/keyboards/tronguylabs/m122_3270/teensy/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
+        "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }