Move LED indicator config to data driven (#19800)

10 files changed, 26 insertions, 23 deletions

diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index cb8a0687f8..f668bd88ed 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -61,7 +61,3 @@
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index 92ee67be74..e93c3b77b8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Adelais En Ciel",
     "usb": {
         "pid": "0xAEC1"
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 6a50274f58..9611ed6744 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -96,8 +96,3 @@
 #define ENCODER_RESOLUTION 4
 
 #define TAP_CODE_DELAY 10
-
-
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 8af90a2c55..556c8bf7e5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Adelais En Ciel Rev2",
     "usb": {
         "pid": "0xAEC2"
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 92fa229523..faf032647f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -119,7 +119,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
 #endif
-
-#define LED_NUM_LOCK_PIN A0
-#define LED_CAPS_LOCK_PIN C14
-#define LED_SCROLL_LOCK_PIN C15
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 2f963ec895..d49fd7970a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Adelais En Ciel Rev3",
     "usb": {
         "pid": "0xAEC3"
+    },
+    "indicators": {
+        "caps_lock": "C14",
+        "num_lock": "A0",
+        "scroll_lock": "C15"
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index ef69fd27d1..90a5cf6575 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -41,7 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index 68e7b3d144..3835f71f94 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -1,3 +1,8 @@
 {
-    "keyboard_name": "Adelais"
+    "keyboard_name": "Adelais",
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index c44559c3ca..abd17c2b2f 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -31,11 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 1
-
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index d827607b81..0103bf09b6 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Adelais AVR",
     "usb": {
         "pid": "0xAD04"
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D7",
+        "scroll_lock": "F7"
     }
 }