Move LED indicator config to data driven (#19800)

2023-02-17 13:14:29 +11:00
parent d784f78bd0
commit f4ba17c4a0
979 changed files with 1935 additions and 2171 deletions
--- a/keyboards/kbdfans/baguette66/soldered/config.h
+++ b/keyboards/kbdfans/baguette66/soldered/config.h
@@ -28,6 +28,3 @@
 /* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
--- a/keyboards/kbdfans/baguette66/soldered/info.json
+++ b/keyboards/kbdfans/baguette66/soldered/info.json
@@ -7,6 +7,10 @@
        "pid": "0x0107",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -7,6 +7,10 @@
        "pid": "0x7001",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -8,6 +8,10 @@
        "pid": "0x7000",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/kbdfans/bounce/pad/config.h
+++ b/keyboards/kbdfans/bounce/pad/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }
 #define MATRIX_COL_PINS { B5, B4, D0, C2 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_PIN_ON_STATE 1
+
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
--- a/keyboards/kbdfans/bounce/pad/info.json
+++ b/keyboards/kbdfans/bounce/pad/info.json
@@ -7,6 +7,9 @@
        "pid": "0x7002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "C6"
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": ["numpad_6x4"],
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0191",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B2",
+        "scroll_lock": "B1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6066",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["65_ansi"],
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW

-/* indicators */
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B5
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6067",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN B6
-
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3658",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -15,9 +15,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 5
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6061",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -28,9 +28,6 @@

 #define FORCE_NKRO

-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 1
-
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -7,6 +7,9 @@
        "pid": "0x6062",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["75_ansi"],
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
-
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
--- a/keyboards/kbdfans/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B3",
+    "num_lock": "B1",
+    "scroll_lock": "B2"
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define DIODE_DIRECTION COL2ROW

-#define LED_NUM_LOCK_PIN D0
-
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING

--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["ortho_6x4", "numpad_6x4"],
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define LED_NUM_LOCK_PIN B4
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -8,6 +8,10 @@
    	"pid": "0x0006",
    	"device_version": "0.0.1"
    },
+    "indicators": {
+    	"num_lock": "B4",
+    	"on_state": 0
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": ["ortho_6x4"],
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -20,10 +20,6 @@
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}

-#define LED_NUM_LOCK_PIN B9
-#define LED_CAPS_LOCK_PIN B10
-#define LED_PIN_ON_STATE 0
-
 #define DIODE_DIRECTION COL2ROW

 #define RGB_DI_PIN B15
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0101",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B9",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "debounce": 15,
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -23,10 +23,6 @@

 #define DIODE_DIRECTION COL2ROW

-#define LED_NUM_LOCK_PIN B9
-#define LED_CAPS_LOCK_PIN B10
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN B15

 #ifdef RGB_DI_PIN
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0101",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B9",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -21,9 +21,7 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, C6, C7, F7, F6, F5, F4, F1, E6, B7, D0, D1, D2, D3, D5 }
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_PIN_ON_STATE 0
+
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0103",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -27,10 +27,6 @@
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 1
-
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0011",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {