6 files changed, 22 insertions, 20 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 16d91b69a2..9db69dcf3a 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS { B12, A6, B13, B9, B8 }
-#define MATRIX_COL_PINS_RIGHT { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS_RIGHT  { B12, A6, B13, B9, B8 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define MATRIX_IO_DELAY 5
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 4d91a00c84..2e598c5b3b 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -6,13 +6,24 @@
         "vid": "0xFEED",
         "pid": "0x7812"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+        "rows": ["B12", "A6", "B13", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"}
         ]
     },
     "split": {
-        "soft_serial_pin": "A15"
+        "soft_serial_pin": "A15",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+                "rows": ["B12", "A6", "B13", "B9", "B8"]
+            }
+        }
     },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 1eda8feab4..b168318aa0 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -18,8 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define TAP_CODE_DELAY 10
-
-#define MATRIX_ROW_PINS { D1, D0, A0, A1, A2 }
-#define MATRIX_COL_PINS { D6, D5, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index e94e896858..038fbc3ca5 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7811",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+        "rows": ["D1", "D0", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B3"},
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 8161a873e5..a102a34946 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3, A1, A0, C15, C14, C13, A15, B3, B4, B5}
-#define MATRIX_ROW_PINS { B6, A2, B7, B9, B8 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 0b0877b38b..0b107f335c 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"],
+        "rows": ["B6", "A2", "B7", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"},