6 files changed, 16 insertions, 33 deletions
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index bc3241eb93..ee3574ac9c 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -16,17 +16,9 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-/* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 66
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index d179a751d8..40e02c9515 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -7,6 +7,17 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk
index 2972c82a31..c9c55ceed1 100644
--- a/keyboards/kbdfans/baguette66/rgb/rules.mk
+++ b/keyboards/kbdfans/baguette66/rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/baguette66/soldered/config.h b/keyboards/kbdfans/baguette66/soldered/config.h
index 7a226de04b..707393a197 100644
--- a/keyboards/kbdfans/baguette66/soldered/config.h
+++ b/keyboards/kbdfans/baguette66/soldered/config.h
@@ -16,12 +16,5 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-/* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/baguette66/soldered/info.json b/keyboards/kbdfans/baguette66/soldered/info.json
index 29492bb959..f24123f258 100644
--- a/keyboards/kbdfans/baguette66/soldered/info.json
+++ b/keyboards/kbdfans/baguette66/soldered/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0107",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7",
         "on_state": 0
diff --git a/keyboards/kbdfans/baguette66/soldered/soldered.c b/keyboards/kbdfans/baguette66/soldered/soldered.c
deleted file mode 100644
index f2848c1b32..0000000000
--- a/keyboards/kbdfans/baguette66/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"