12 files changed, 41 insertions, 44 deletions
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 7dad99db7a..2f9473e391 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -21,12 +21,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C1
-#define LED_SCROLL_LOCK_PIN C4
-#define LED_COMPOSE_PIN C3
-#define LED_PIN_ON_STATE 0
-
 #define IGNORE_MOD_TAP_INTERRUPT
 
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index e31d3490a0..9619fe05b6 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -6,6 +6,13 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "indicators": {
+        "caps_lock": "C1",
+        "num_lock": "C5",
+        "scroll_lock": "C4",
+        "compose": "C3",
+        "on_state": 0
+    },
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "debounce": 20
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 76d3ff31ae..8553ed4912 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -43,10 +43,4 @@
 // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
 #define USB_MAX_POWER_CONSUMPTION 100
 
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN A14
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN A5
-#define LED_COMPOSE_PIN E26
-
 #define EEPROM_SIZE 4096
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index fca353504f..8224abbe98 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -6,6 +6,13 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "A14",
+        "scroll_lock": "A5",
+        "compose": "E26",
+        "on_state": 0
+    },
     "processor": "MK66FX1M0",
     "bootloader": "halfkay",
     "debounce": 20
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 7050eadd41..7d7ea630fc 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -77,9 +77,3 @@
 
 // in clock cycles
 #define GPIO_INPUT_PIN_DELAY 0
-
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN LINE_PIN26
-#define LED_CAPS_LOCK_PIN LINE_PIN12
-#define LED_SCROLL_LOCK_PIN LINE_PIN25
-#define LED_COMPOSE_PIN LINE_PIN24
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 70ee14bad3..716275ad3a 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -6,5 +6,12 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "LINE_PIN12",
+        "num_lock": "LINE_PIN26",
+        "scroll_lock": "LINE_PIN25",
+        "compose": "LINE_PIN24",
+        "on_state": 0
+    },
     "debounce": 20
 }
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 537cb399d8..d36555ce4a 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -78,17 +78,3 @@
 
 // in clock cycles
 #define GPIO_INPUT_PIN_DELAY 0
-
-// The default "1" results in LEDs being on when they should be off and
-// the other way around.
-#define LED_PIN_ON_STATE 0
-
-// Discussion about which Teensy LC pins can be used for driving staus LEDs:
-//   https://github.com/kinx-project/kint/issues/55
-// Discussion about using Neopixel LEDs:
-//   https://github.com/kinx-project/kint/issues/32
-// Available pins can be seen in:
-//   /lib/chibios-contrib/os/hal/boards/PJRC_TEENSY_LC/board.h
-#define LED_CAPS_LOCK_PIN LINE_PIN12
-#define LED_SCROLL_LOCK_PIN LINE_PIN25
-#define LED_COMPOSE_PIN LINE_PIN24
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index d05b01ec09..7309fc778f 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -6,6 +6,12 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "LINE_PIN12",
+        "scroll_lock": "LINE_PIN25",
+        "compose": "LINE_PIN24",
+        "on_state": 0
+    },
     "processor": "MKL26Z64",
     "bootloader": "halfkay",
     "debounce": 20
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index 399d10e81d..c6798eb951 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -20,9 +20,3 @@
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-#define LED_NUM_LOCK_PIN D4
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_COMPOSE_PIN D7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 7a48682684..1cbb042b83 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -6,6 +6,13 @@
         "pid": "0x6060",
         "device_version": "0.0.3"
     },
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D4",
+        "scroll_lock": "C6",
+        "compose": "D7",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 01108b8e89..0e1e6bcbee 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -22,12 +22,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_NUM_LOCK_PIN F2
-#define LED_CAPS_LOCK_PIN F3
-#define LED_SCROLL_LOCK_PIN F1
-#define LED_COMPOSE_PIN F0
-#define LED_PIN_ON_STATE 0
-
 /* don't know if this should be defined at the board or top level. Assuming board 
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index ba14567443..37f05a49f4 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -6,6 +6,13 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "indicators": {
+        "caps_lock": "F3",
+        "num_lock": "F2",
+        "scroll_lock": "F1",
+        "compose": "F0",
+        "on_state": 0
+    },
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }