8 files changed, 20 insertions, 54 deletions
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 43e53608e9..cbe8f13cdf 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,14 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B6
 
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 38f18f0cc1..4214de3415 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -8,6 +8,11 @@
     "pid": "0xEE60",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
+    "rows": ["F6", "F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index bf9fce0889..e34b4d34ab 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -3,18 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS \
-    { C6, D7, D6, D4 }
-#define MATRIX_COL_PINS \
-    { C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* LED Settings */
 #define LED_NUM 3
 #define LED_PINS \
diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json
index 6ef0d21391..ce4499442d 100644
--- a/keyboards/dm9records/lain/info.json
+++ b/keyboards/dm9records/lain/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE8F4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"],
+        "rows": ["C6", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index e808946006..b4b541dbfc 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/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 { B4, B5, B3, D4 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index 2854ea1481..d495b69365 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -8,6 +8,11 @@
     "pid": "0x27DB",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
+    "rows": ["B4", "B5", "B3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["ortho_4x12", "planck_mit"],
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 53f1566252..71400c3cf8 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/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 { B4, B5, B3, B0, C0 }
-#define MATRIX_COL_PINS { D7, D6, D5, D4, B1, B2, C1, C2, C3, C5, D1, D0, C4 }
-
-/* COL2ROW, 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/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
index d8eca7dd4a..e6425edb3d 100644
--- a/keyboards/dm9records/tartan/info.json
+++ b/keyboards/dm9records/tartan/info.json
@@ -8,6 +8,11 @@
     "pid": "0x27DB",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
+    "rows": ["B4", "B5", "B3", "B0", "C0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],