9 files changed, 15 insertions, 67 deletions
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 680ae93a7b..15550775e2 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c b/keyboards/kbdfans/bounce/75/hotswap/hotswap.c
deleted file mode 100644
index 702a9b096d..0000000000
--- a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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 "hotswap.h"
-\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index fd47cfdd7f..4adafc1e09 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -7,6 +7,11 @@
         "pid": "0x7001",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "on_state": 0
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 3e8cea1f74..7448ffef3d 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index e4ee498ee7..aff015ce0f 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7000",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "on_state": 0
diff --git a/keyboards/kbdfans/bounce/75/soldered/soldered.c b/keyboards/kbdfans/bounce/75/soldered/soldered.c
deleted file mode 100644
index a24bc9a36c..0000000000
--- a/keyboards/kbdfans/bounce/75/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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 "soldered.h"
-\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h
index 84271aed5f..0aae477dc1 100644
--- a/keyboards/kbdfans/bounce/pad/config.h
+++ b/keyboards/kbdfans/bounce/pad/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }
-#define MATRIX_COL_PINS { B5, B4, D0, C2 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json
index 894bd0ed70..8e0105c073 100644
--- a/keyboards/kbdfans/bounce/pad/info.json
+++ b/keyboards/kbdfans/bounce/pad/info.json
@@ -7,6 +7,11 @@
         "pid": "0x7002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D0", "C2"],
+        "rows": ["C7", "B7", "B6", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "num_lock": "C6"
     },
diff --git a/keyboards/kbdfans/bounce/pad/pad.c b/keyboards/kbdfans/bounce/pad/pad.c
deleted file mode 100644
index 18c18838ca..0000000000
--- a/keyboards/kbdfans/bounce/pad/pad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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 "pad.h"
-\ No newline at end of file