13 files changed, 38 insertions, 69 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 e557e4d307..c1df5ed549 100644
--- a/keyboards/kin80/blackpill103/info.json
+++ b/keyboards/kin80/blackpill103/info.json
@@ -1,5 +1,13 @@
 {
     "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/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk
index 019b1130d9..a92b099328 100644
--- a/keyboards/kin80/blackpill103/rules.mk
+++ b/keyboards/kin80/blackpill103/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
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 b377cdff00..8098ac1a2f 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/info.json
@@ -1,5 +1,14 @@
 {
     "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/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk
index 1fec226e9b..1071cf62ee 100644
--- a/keyboards/kin80/blackpill401/rules.mk
+++ b/keyboards/kin80/blackpill401/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
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 b377cdff00..3ad449e464 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/info.json
@@ -1,5 +1,14 @@
 {
     "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/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk
index cd1657335d..1071cf62ee 100644
--- a/keyboards/kin80/blackpill411/rules.mk
+++ b/keyboards/kin80/blackpill411/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kin80/config.h b/keyboards/kin80/config.h
deleted file mode 100644
index a836bacf75..0000000000
--- a/keyboards/kin80/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 DmNosachev
-
-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/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_COLS 12 
-#define MATRIX_ROWS 7
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 90ac25f360..173b5eff4d 100644
--- a/keyboards/kin80/micro/info.json
+++ b/keyboards/kin80/micro/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "D2",
+        "scroll_lock": "D3",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-dfu"
 }
diff --git a/keyboards/kin80/micro/rules.mk b/keyboards/kin80/micro/rules.mk
index def852a531..e69de29bb2 100644
--- a/keyboards/kin80/micro/rules.mk
+++ b/keyboards/kin80/micro/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = lufa-dfu
-\ No newline at end of file