Merge remote-tracking branch 'upstream/develop' into dev_board

keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/scylla/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/scylla/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/skeletyl/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/skeletyl/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/tbkmini/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/tbkmini/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart

keyboards/crkbd/rules.mk

@@ -1,8 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-
 DEFAULT_FOLDER = crkbd/rev1
-
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes

keyboards/handwired/meck_tkl/blackpill_f401/info.json

@@ -1,12 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
-        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "development_board": "blackpill_f401"
-}

keyboards/handwired/meck_tkl/info.json → keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json

@@ -6,7 +6,10 @@
     "usb": {
         "vid": "0x474B",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "features": {
         "bootmagic": true,
@@ -15,6 +18,24 @@
         "console": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

keyboards/handwired/meck_tkl/blackpill_f401/rules.mk

@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/meck_tkl/config.h

@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE

keyboards/handwired/novem/info.json → keyboards/handwired/novem/keyboard.json

@@ -15,6 +15,11 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/novem/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       	# Mouse keys
-EXTRAKEY_ENABLE = no       	# Audio control and System control
-CONSOLE_ENABLE = no        	# Console for debug
-COMMAND_ENABLE = no        	# Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       	# Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        	# Enable keyboard RGB underglow
-AUDIO_ENABLE = no           	# Audio output

keyboards/handwired/onekey/blackpill_f401/info.json → keyboards/handwired/onekey/blackpill_f401/keyboard.json

@@ -1,6 +1,11 @@
 {
     "keyboard_name": "Onekey Blackpill STM32F401",
     "development_board": "blackpill_f401",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]

keyboards/handwired/onekey/blackpill_f401/rules.mk

@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json → keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json

@@ -2,6 +2,11 @@
     "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
     "development_board": "blackpill_f401",
     "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]

keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk

@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/onekey/blackpill_f411/info.json → keyboards/handwired/onekey/blackpill_f411/keyboard.json

@@ -1,6 +1,11 @@
 {
     "keyboard_name": "Onekey Blackpill STM32F411",
     "development_board": "blackpill_f411",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]

keyboards/handwired/onekey/blackpill_f411/rules.mk

@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json → keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json

@@ -2,6 +2,11 @@
     "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
     "development_board": "blackpill_f411",
     "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]

keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk

@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/onekey/bluepill_f103c6/info.json → keyboards/handwired/onekey/bluepill_f103c6/keyboard.json

@@ -15,5 +15,8 @@
     "apa102": {
         "data_pin": "A1",
         "clock_pin": "A2"
+    },
+    "build": {
+        "lto": true
     }
 }

keyboards/handwired/onekey/bluepill_f103c6/rules.mk

@@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 
-# LTO is required to fit the firmware into the available 24K of flash
-LTO_ENABLE = yes
-
 # EEPROM emulation not supported yet (need to implement a proper firmware size
 # check first, otherwise the chance of the EEPROM backing store overwriting
 # some part of the firmware code is really high).

keyboards/handwired/onekey/kb2040/info.json → keyboards/handwired/onekey/kb2040/keyboard.json

@@ -8,5 +8,8 @@
     "ws2812": {
         "pin": "GP17",
         "driver": "vendor"
+    },
+    "features": {
+        "oled": true
     }
 }

keyboards/handwired/onekey/kb2040/rules.mk

@@ -1 +0,0 @@
-OLED_ENABLE = yes

keyboards/handwired/orbweaver/info.json → keyboards/handwired/orbweaver/keyboard.json

@@ -10,7 +10,8 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgb_matrix": true
     },
     "rgb_matrix": {
         "center_point": [40, 30],

keyboards/handwired/orbweaver/rules.mk

@@ -1,2 +0,0 @@
-# Add support for 3731 RGB matrix controller
-RGB_MATRIX_ENABLE = yes

keyboards/handwired/ortho_brass/info.json → keyboards/handwired/ortho_brass/keyboard.json

@@ -15,6 +15,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
     "community_layouts": ["ortho_4x12"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"

keyboards/handwired/ortho_brass/rules.mk

@@ -1,11 +1 @@
-# Build Options
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable RGB underlight.
-
 RGBLIGHT_SUPPORTED = no

keyboards/handwired/osborne1/info.json → keyboards/handwired/osborne1/keyboard.json

@@ -10,7 +10,8 @@
         "console": true,
         "extrakey": false,
         "mousekey": false,
-        "nkro": false
+        "nkro": false,
+        "bluetooth": true
     },
     "bluetooth": {
         "driver": "bluefruit_le"

keyboards/handwired/osborne1/rules.mk

@@ -1 +0,0 @@
-BLUETOOTH_ENABLE = yes

keyboards/handwired/owlet60/info.json → keyboards/handwired/owlet60/keyboard.json

@@ -32,6 +32,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "debounce": 9,
     "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {

keyboards/handwired/owlet60/rules.mk

@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no	        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-OLED_ENABLE = no
 
 SRC += matrix.c

keyboards/handwired/pill60/blackpill_f401/info.json → keyboards/handwired/pill60/blackpill_f401/keyboard.json

@@ -1,4 +1,9 @@
 {
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
         "rows": ["B4", "B3", "A15", "B13", "B5"]

keyboards/handwired/pill60/blackpill_f401/rules.mk

@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP       = yes

keyboards/handwired/pill60/blackpill_f411/info.json → keyboards/handwired/pill60/blackpill_f411/keyboard.json

@@ -1,4 +1,9 @@
 {
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
         "rows": ["B4", "B3", "A15", "B13", "B5"]

keyboards/handwired/pill60/blackpill_f411/rules.mk

@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes

keyboards/handwired/postageboard/mini/info.json → keyboards/handwired/postageboard/mini/keyboard.json

@@ -8,5 +8,12 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
 }

keyboards/handwired/postageboard/mini/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/handwired/postageboard/r1/info.json → keyboards/handwired/postageboard/r1/keyboard.json

@@ -8,5 +8,12 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
 }

keyboards/handwired/postageboard/r1/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/handwired/prkl30/feather/info.json → keyboards/handwired/prkl30/feather/keyboard.json

@@ -1,4 +1,14 @@
 {
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,

keyboards/handwired/prkl30/feather/rules.mk

@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-ENCODER_ENABLE = yes
-MOUSEKEY_ENABLE  = no       # Mouse keys
-EXTRAKEY_ENABLE  = no       # Audio control and System control
-CONSOLE_ENABLE  = yes       # Console for debug
-COMMAND_ENABLE  = yes       # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no
-AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-BLUETOOTH_ENABLE = yes

keyboards/handwired/promethium/info.json → keyboards/handwired/promethium/keyboard.json

@@ -16,6 +16,18 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "ps2_mouse": true,
+    "ps2": true,
+    "bluetooth": true
+  },
+  "build": {
+    "lto": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/handwired/promethium/rules.mk

@@ -1,28 +1,11 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
 
 WS2812_DRIVER_REQUIRED = yes
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += rgbsps.c
 SRC += matrix.c
-
-LTO_ENABLE = yes

keyboards/handwired/pterodactyl/info.json → keyboards/handwired/pterodactyl/keyboard.json

@@ -10,6 +10,15 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "nkro": true,
+    "unicode": true,
+    "bluetooth": true
+  },
   "debounce": 0,
   "tapping": {
     "toggle": 1