4 files changed, 10 insertions, 30 deletions
diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index fc84c89bf6..19f01664b2 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -15,18 +15,6 @@
  */
 #pragma once
 
-
-/* matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 2
-
-/*
- * Keyboard Matrix Assignments
- *
- * On this board we have direct connection: no diodes.
- */
-#define DIRECT_PINS {{ B0, B1 }}
-
 #define RGBLED_NUM 2
 #define RGB_DI_PIN B2
 
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index f06e823a88..4284b0548b 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0202",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "direct": [
+      ["B0", "B1"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index 2dcbc92637..77f57ce322 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -9,6 +9,11 @@
     },
     "processor": "atmega16u2",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D3", "D0", "C4", "B4"]
+        ]
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}]
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 9a1e233d32..0b4e44336c 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -23,29 +23,11 @@ where some things are disabled to save space as well.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * On this board we have direct connection: no diodes.
- */
-#define DIRECT_PINS        \
-    {                      \
-        { D3, D0, C4, B4 } \
-    }
-
 /* Backlight Setup */
 // Looks like each backlight LED is connected to a single output, D5 is the one furtherst away from USB port
 #define BACKLIGHT_PIN D5
 #define BACKLIGHT_LEVELS 6
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
 This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk
 We do not have enough space in the flash for this at the moment, maybe