6 files changed, 12 insertions, 50 deletions
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"
 }