8 files changed, 15 insertions, 68 deletions
diff --git a/keyboards/ydkb/chili/chili.c b/keyboards/ydkb/chili/chili.c
deleted file mode 100644
index f629a6d60a..0000000000
--- a/keyboards/ydkb/chili/chili.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * 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 "chili.h"
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index a3fcde472f..305f37ad19 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-*/
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6, B0, D5, D3, D2, D1, D0 }
-/* Column pin configuration
- */
-#define MATRIX_COL_PINS { D4, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Underlight configuration
  */
 #define RGB_DI_PIN B3
diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index 1ef666e69f..2516744ef0 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/ydkb/grape/grape.c b/keyboards/ydkb/grape/grape.c
deleted file mode 100644
index c0d33b064b..0000000000
--- a/keyboards/ydkb/grape/grape.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 somepin
- *
- * 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 "grape.h"
diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h
index bc86dc02e5..4ec059e4b5 100644
--- a/keyboards/ydkb/just60/config.h
+++ b/keyboards/ydkb/just60/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E2, C7, B3, B2, B1 }
-#define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 }
-#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/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json
index 618f0d8eac..bea9152e0b 100644
--- a/keyboards/ydkb/just60/info.json
+++ b/keyboards/ydkb/just60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1960",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"],
+        "rows": ["E2", "C7", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "E2",
         "esc_output": "D6"
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index 94c922931b..d47f6e3992 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, C6, C7, D7, B4 }
-#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index d8f1439a3f..7b15598735 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3", "D5"],
+    "rows": ["B5", "C6", "C7", "D7", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D4",
     "on_state": 0