15 files changed, 30 insertions, 108 deletions
diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
index dd197f2338..282b98a978 100644
--- a/keyboards/kapcave/arya/config.h
+++ b/keyboards/kapcave/arya/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B0, B5, B4, B2, C13, F1, F0, A14}
-#define MATRIX_ROW_PINS { B8, A13, B1, A15, B9, B10, B11, A0, A8 }
-#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/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index 54a1513f90..1bd9c188dd 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4152",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B5", "B4", "B2", "C13", "F1", "F0", "A14"],
+        "rows": ["B8", "A13", "B1", "A15", "B9", "B10", "B11", "A0", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "B13", "resolution": 2},
@@ -38,7 +43,7 @@
                 {"x":15.75, "y":0.1},
                 {"x":16.75, "y":0.1},
 
-                {"x":0.2, "y":1.0},
+                {"x":0.2, "y":1},
                 {"x":1.35, "y":1.1, "w":1.5},
                 {"x":2.85, "y":1.1},
                 {"x":3.85, "y":1.1},
@@ -54,7 +59,7 @@
                 {"x":15.45, "y":1.1},
                 {"x":16.45, "y":1.1, "w":1.5},
 
-                {"x":0, "y":2.0},
+                {"x":0, "y":2},
                 {"x":1.15, "y":2.1, "w":1.75},
                 {"x":2.9, "y":2.1},
                 {"x":3.9, "y":2.1},
diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h
index 30a5aa6db2..dfeb9c44d1 100755
--- a/keyboards/kapcave/gskt00/config.h
+++ b/keyboards/kapcave/gskt00/config.h
@@ -16,14 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 }
-#define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kapcave/gskt00/gskt00.c b/keyboards/kapcave/gskt00/gskt00.c
deleted file mode 100755
index c2c2d823f9..0000000000
--- a/keyboards/kapcave/gskt00/gskt00.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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 "gskt00.h"
-
diff --git a/keyboards/kapcave/gskt00/gskt00.h b/keyboards/kapcave/gskt00/gskt00.h
index d0ac51acd7..120e021ce3 100755
--- a/keyboards/kapcave/gskt00/gskt00.h
+++ b/keyboards/kapcave/gskt00/gskt00.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     k30, k40, k50,           k60,                     k00, k10,      k20 \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
     { k40, k41, k42, k43, k44, k45, k46, k47 }, \
diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json
index 94b0159176..a66772ef93 100644
--- a/keyboards/kapcave/gskt00/info.json
+++ b/keyboards/kapcave/gskt00/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6061",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"],
+    "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [3, 6]
   },
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 58fd5aff24..e5da848720 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -72,13 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #endif
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, B0, D3 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index f64fdc2a65..0f851cba86 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -8,6 +8,11 @@
       "pid": "0x5036",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"],
+      "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
       "matrix": [3, 6]
     },
diff --git a/keyboards/kapcave/paladin64/paladin64.c b/keyboards/kapcave/paladin64/paladin64.c
deleted file mode 100755
index 88dd1fdff2..0000000000
--- a/keyboards/kapcave/paladin64/paladin64.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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 "paladin64.h"
-
diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h
deleted file mode 100644
index 9676459af2..0000000000
--- a/keyboards/kapcave/paladinpad/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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/>.
-*/
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kapcave/paladinpad/paladinpad.c b/keyboards/kapcave/paladinpad/paladinpad.c
deleted file mode 100644
index 063e49c872..0000000000
--- a/keyboards/kapcave/paladinpad/paladinpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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 "paladinpad.h"
diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
index 959d80429c..4fcbe6d698 100644
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ b/keyboards/kapcave/paladinpad/rev1/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 }
-#define MATRIX_COL_PINS { D4, D5, D3, B7 }
-
 #define RGB_DI_PIN D0
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json
index 90ac25f360..5568345bd3 100644
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D5", "D3", "B7"],
+        "rows": ["C7", "B6", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h
index 3c769a530a..8229921777 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 }
-#define MATRIX_COL_PINS { F7, F5, D3, B7 }
-
 #define AUDIO_PIN C6
 
 #define RGB_DI_PIN D0
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json
index e557e4d307..f8d1864f8e 100644
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F5", "D3", "B7"],
+        "rows": ["F4", "F6", "D7", "B4", "D6"]
+    },
+    "diode_direction": "COL2ROW"
 }