8 files changed, 24 insertions, 16 deletions
diff --git a/keyboards/kin80/blackpill103/config.h b/keyboards/kin80/blackpill103/config.h
index 052828fb83..4dd744162d 100644
--- a/keyboards/kin80/blackpill103/config.h
+++ b/keyboards/kin80/blackpill103/config.h
@@ -26,8 +26,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B5, B4 }
 #define MATRIX_COL_PINS { A6, A7, B0, B1, B10, B11, A0, A1, A2, A3, A4, A5 }
 
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B14
-#define LED_CAPS_LOCK_PIN B13
-#define LED_SCROLL_LOCK_PIN B15
 #define LED4_PIN A8
diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json
index 63c9650579..c1df5ed549 100644
--- a/keyboards/kin80/blackpill103/info.json
+++ b/keyboards/kin80/blackpill103/info.json
@@ -2,6 +2,12 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "indicators": {
+        "caps_lock": "B13",
+        "num_lock": "B14",
+        "scroll_lock": "B15",
+        "on_state": 0
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/kin80/blackpill401/config.h b/keyboards/kin80/blackpill401/config.h
index 2cbca43a08..f1b9307f24 100644
--- a/keyboards/kin80/blackpill401/config.h
+++ b/keyboards/kin80/blackpill401/config.h
@@ -23,8 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
 
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN C13
-#define LED_SCROLL_LOCK_PIN B3
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json
index 7d4ec1294e..8098ac1a2f 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/info.json
@@ -2,6 +2,12 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/kin80/blackpill411/config.h b/keyboards/kin80/blackpill411/config.h
index 2cbca43a08..f1b9307f24 100644
--- a/keyboards/kin80/blackpill411/config.h
+++ b/keyboards/kin80/blackpill411/config.h
@@ -23,8 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
 
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN C13
-#define LED_SCROLL_LOCK_PIN B3
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json
index 6ad9e67e04..3ad449e464 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/info.json
@@ -2,6 +2,12 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h
index 5c9369a077..c55fffe1e0 100644
--- a/keyboards/kin80/micro/config.h
+++ b/keyboards/kin80/micro/config.h
@@ -20,8 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 }
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 }
 
-#define LED_PIN_ON_STATE 0
-#define NUM_LOCK_LED_PIN D2
-#define SCROLL_LOCK_LED_PIN D3
-#define CAPS_LOCK_LED_PIN B0
 #define LED4_PIN B2
diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json
index 7818e74537..173b5eff4d 100644
--- a/keyboards/kin80/micro/info.json
+++ b/keyboards/kin80/micro/info.json
@@ -2,6 +2,12 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "D2",
+        "scroll_lock": "D3",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "lufa-dfu"
 }