10 files changed, 20 insertions, 64 deletions
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h
index fe2db0a478..33991d4c8f 100644
--- a/keyboards/massdrop/alt/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define SERIAL_NUM          "Unavailable"
 
-#define MATRIX_ROW_PINS { A00, A01, A02, A03, A04 }
-#define MATRIX_COL_PINS { B04, B05, B06, B07, B08, B09, B10, B11, B12, B13, A05, A06, A07, A10, A11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Temporary solution for matrix delay */
 #define IGNORE_ATOMIC_BLOCK
 
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
index 128a990b46..8306bcdab3 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEED3",
         "device_version": "1.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"],
+        "rows": ["A00", "A01", "A02", "A03", "A04"]
+    },
+    "diode_direction": "COL2ROW",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index aadc0a915b..33991d4c8f 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define SERIAL_NUM          "Unavailable"
 
-#define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 }
-#define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Temporary solution for matrix delay */
 #define IGNORE_ATOMIC_BLOCK
 
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 34c60ca088..1e21627f28 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEED2",
         "device_version": "1.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
+        "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h
index 0869e77a7a..d5aefdcdd3 100644
--- a/keyboards/massdrop/thekey/config.h
+++ b/keyboards/massdrop/thekey/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
index 56fe74729c..71fac9f31b 100644
--- a/keyboards/massdrop/thekey/info.json
+++ b/keyboards/massdrop/thekey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
diff --git a/keyboards/massdrop/thekey/thekey.c b/keyboards/massdrop/thekey/thekey.c
deleted file mode 100644
index b32c302cd0..0000000000
--- a/keyboards/massdrop/thekey/thekey.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Joe Maples <joe@maples.dev>
- *
- * 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 "thekey.h"
diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h
index 3f7dc30ac1..d26d586264 100644
--- a/keyboards/massdrop/thekey_v2/config.h
+++ b/keyboards/massdrop/thekey_v2/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 5
 #define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3}
diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json
index 19ae416b6e..01604e6f2e 100644
--- a/keyboards/massdrop/thekey_v2/info.json
+++ b/keyboards/massdrop/thekey_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.c b/keyboards/massdrop/thekey_v2/thekey_v2.c
deleted file mode 100644
index b1a824d9d4..0000000000
--- a/keyboards/massdrop/thekey_v2/thekey_v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jason Wihardja
- *
- * 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 "thekey_v2.h"