11 files changed, 25 insertions, 36 deletions
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 98b7bf0dbd..beb580a588 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -19,9 +19,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index 9c2d38d6d9..b60b78ea81 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11, C12 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 58
 #define DRIVER_2_LED_TOTAL 26
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json
index e7b843f107..c9aa18024e 100644
--- a/keyboards/durgod/dgk6x/galaxy/info.json
+++ b/keyboards/durgod/dgk6x/galaxy/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6A1A",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11", "C12"],
+    "rows": ["A0", "A1", "A2", "A3", "A4", "A5"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT_75_ansi": {
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index ff390f5b2e..b1b29b182a 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 58
 #define DRIVER_2_LED_TOTAL 10
diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json
index 2ebd9c8a41..f553a06c9b 100644
--- a/keyboards/durgod/dgk6x/hades/info.json
+++ b/keyboards/durgod/dgk6x/hades/info.json
@@ -8,6 +8,11 @@
       "pid": "0x4AD3",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11"],
+    "rows": ["A0", "A1", "A2", "A3", "A4"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index bb3c168f81..0709407c88 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 53
 #define DRIVER_2_LED_TOTAL 8
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json
index c7d020bfdf..b7ee00bc8d 100644
--- a/keyboards/durgod/dgk6x/venus/info.json
+++ b/keyboards/durgod/dgk6x/venus/info.json
@@ -8,6 +8,11 @@
       "pid": "0x7EC5",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10"],
+    "rows": ["A0", "A1", "A2", "A3", "A4"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
index 20885ecb29..9d84d39156 100644
--- a/keyboards/durgod/k310/base/config.h
+++ b/keyboards/durgod/k310/base/config.h
@@ -20,12 +20,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
-#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json
index 7e5f9aa8d3..6047c40fc0 100644
--- a/keyboards/durgod/k310/base/info.json
+++ b/keyboards/durgod/k310/base/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C9",
         "num_lock": "C8",
diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h
index 3616ab53af..9d84d39156 100644
--- a/keyboards/durgod/k320/base/config.h
+++ b/keyboards/durgod/k320/base/config.h
@@ -20,12 +20,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 }
-#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json
index 2fe54b1701..134dcdbd63 100644
--- a/keyboards/durgod/k320/base/info.json
+++ b/keyboards/durgod/k320/base/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C9",
         "scroll_lock": "A8",