Merge remote-tracking branch 'origin/develop' into xap

keyboards/hadron/ver2/info.json → keyboards/hadron/ver2/keyboard.json

@@ -27,5 +27,13 @@
         "pin": "D4"
     },
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    }
 }

keyboards/hadron/ver2/rules.mk

@@ -1,13 +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 = 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 = yes       # Enable WS2812 RGB underlight
-OLED_ENABLE = yes

keyboards/hadron/ver3/info.json

@@ -35,5 +35,17 @@
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "audio": true,
+        "rgblight": true,
+        "haptic": true,
+        "oled": true,
+        "encoder": true
+    },
     "board": "QMK_PROTON_C"
 }

keyboards/hadron/ver3/rules.mk

@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
-ENCODER_ENABLER = yes

keyboards/halfcliff/info.json

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

keyboards/halfcliff/rules.mk

@@ -1,18 +1,2 @@
-# 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
-ENCODER_ENABLE = no
-POINTING_DEVICE_ENABLE = no
 CUSTOM_MATRIX = yes
-OLED_ENABLE = no
-
 SRC += matrix.c

keyboards/hardwareabstraction/handwire/info.json

@@ -10,7 +10,13 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "haptic": true,
+        "oled": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],

keyboards/hardwareabstraction/handwire/rules.mk

@@ -1,7 +1 @@
-LTO_ENABLE = yes
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
-
-OLED_ENABLE = yes
-
-WPM_ENABLE = yes

keyboards/hazel/bad_wings/info.json

@@ -18,7 +18,10 @@
   "features": {
     "bootmagic": true,
     "deferred_exec": true,
-    "nkro": false
+    "nkro": false,
+    "pointing_device": true,
+    "tri_layer": true,
+    "caps_word": true
   },
   "community_layouts": ["split_3x5_3"],
   "layouts": {

keyboards/hazel/bad_wings/rules.mk

@@ -1,10 +1,6 @@
-TRI_LAYER_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-
 SRC += matrix.c
 
 SPI_DRIVER_REQUIRED = yes
 CUSTOM_MATRIX = lite
 
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-POINTING_DEVICE_ENABLE  = yes

keyboards/hhkb/jp/info.json

@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
   "layouts": {
     "LAYOUT_jp": {
       "layout": [

keyboards/hhkb/jp/rules.mk

@@ -1,14 +1,7 @@
 # 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
 CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
-NKRO_ENABLE = no            # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # project specific files
 SRC = matrix.c

keyboards/hhkb/yang/info.json

@@ -16,6 +16,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
   "debounce": 0,
   "community_layouts": ["60_hhkb"],
   "layouts": {

keyboards/hhkb/yang/rules.mk

@@ -1,16 +1,6 @@
 # MCU frequency
 F_CPU = 8000000
 
-# 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 = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # USB Nkey Rollover
-
 # Custom matrix file for the HHKB
 CUSTOM_MATRIX = lite
 SRC += matrix.c

keyboards/hillside/46/0_1/info.json

@@ -16,6 +16,9 @@
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "encoder": true,
         "extrakey": true,

keyboards/hillside/46/0_1/rules.mk

@@ -1,5 +1,3 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
 # If you add a haptic board,
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 

keyboards/hillside/48/0_1/info.json

@@ -16,6 +16,9 @@
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "encoder": true,
         "extrakey": true,

keyboards/hillside/48/0_1/rules.mk

@@ -1,5 +1,3 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
 # If you add a haptic board,
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 

keyboards/hillside/52/0_1/info.json

@@ -16,6 +16,9 @@
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "encoder": true,
         "extrakey": true,

keyboards/hillside/52/0_1/rules.mk

@@ -1,5 +1,3 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
 # If you add a haptic board,
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 

keyboards/hineybush/hbcp/info.json

@@ -36,6 +36,16 @@
     },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/hineybush/hbcp/rules.mk

@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no      # 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 SRC += matrix.c

keyboards/horrortroll/handwired_k552/info.json

@@ -48,6 +48,15 @@
             "backing_size": 2048
         }
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true,
+        "wpm": true
+    },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {

keyboards/horrortroll/handwired_k552/rules.mk

@@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO
 BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-
-# Build Options
-#   change yes to no to disable
-#
-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 keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes

keyboards/horrortroll/lemon40/info.json

@@ -32,6 +32,18 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/horrortroll/lemon40/rules.mk

@@ -1,21 +1 @@
 SRC += lib/bongocat.c
-
-# Build Options
-#   change yes to no to disable
-#
-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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes

keyboards/hotdox/info.json

@@ -12,6 +12,15 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "backlight": true,
+        "unicode": true
+    },
     "tapping": {
       "toggle": 1
     },

keyboards/hotdox/rules.mk

@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
-UNICODE_ENABLE          = yes # Unicode
-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          = no  # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE        = yes # Enable keyboard backlight functionality
-SWAP_HANDS_ENABLE       = no  # Disable Onehand
-RGBLIGHT_ENABLE         = no
 
 # project specific files
 SRC =  matrix.c     \

keyboards/hs60/v1/info.json

@@ -68,6 +68,14 @@
   },
   "processor": "atmega32u4",
   "bootloader": "qmk-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "rgb_matrix": true,
+    "raw": true
+  },
   "community_layouts": ["60_ansi", "60_iso"],
   "layouts": {
     "LAYOUT_60_iso": {

keyboards/hs60/v1/rules.mk

@@ -3,20 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RAW_ENABLE = yes
-
 # Experimental features for zealcmd please do no enable
 #RAW_ENABLE = yes
 #USE_KEYMAPS_IN_EEPROM = yes

keyboards/hs60/v2/ansi/info.json

@@ -15,6 +15,12 @@
   "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
   "board": "QMK_PROTON_C",
   "community_layouts": ["60_ansi"],
   "layouts": {

keyboards/hs60/v2/ansi/rules.mk

@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # 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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files

keyboards/hs60/v2/hhkb/info.json

@@ -15,6 +15,12 @@
   "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
   "board": "QMK_PROTON_C",
   "layouts": {
     "LAYOUT_60_hhkb": {

keyboards/hs60/v2/hhkb/rules.mk

@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # 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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files

keyboards/hs60/v2/iso/info.json

@@ -15,6 +15,12 @@
   "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
   "board": "QMK_PROTON_C",
   "community_layouts": ["60_iso"],
   "layouts": {

keyboards/hs60/v2/iso/rules.mk

@@ -3,18 +3,6 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # 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
-AUDIO_ENABLE = no                  # Audio output
-
 CIE1931_CURVE = yes
 
 # project specific files

keyboards/tada68/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/tada68/info.json → keyboards/tada68/keyboard.json

@@ -8,6 +8,20 @@
         "pid": "0x0001",
         "device_version": "0.0.3"
     },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
         "rows": ["D0", "D1", "F6", "F7", "D5"]

keyboards/tada68/keymaps/rgb/config.h

@@ -1,4 +1,4 @@
-#include "../../config.h"
+#pragma once
 
 /* WS2812B RGB Underglow LED */
 #define WS2812_DI_PIN F5   // See readme.md for wiring your led's

keyboards/tada68/keymaps/rgb/rules.mk

@@ -1,18 +1 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-

keyboards/tada68/rules.mk

@@ -1,15 +1,2 @@
 # This board uses the older unsafe 6k version of lufa-ms
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/takashicompany/compacx/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2021 takashicompany
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/takashicompany/compacx/info.json → keyboards/takashicompany/compacx/keyboard.json

@@ -8,6 +8,23 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,

keyboards/takashicompany/compacx/rules.mk

@@ -1,14 +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 = 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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes

keyboards/takashicompany/spreadwriter/info.json → keyboards/takashicompany/spreadwriter/keyboard.json

@@ -6,11 +6,11 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "command": false,
-        "console": false,
+        "encoder": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],

keyboards/takashicompany/spreadwriter/rules.mk

@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes

keyboards/takashiski/hecomi/alpha/config.h

@@ -1,47 +0,0 @@
-/*
-Copyright 2018 takashiski
-
-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
-
-//#define USE_I2C
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/*
-#define USE_I2C
-#define MASTER_LEFT
-#define EEHANDS
-*/

keyboards/takashiski/hecomi/alpha/info.json → keyboards/takashiski/hecomi/alpha/keyboard.json

@@ -8,6 +8,21 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
     "rows": ["C6", "D7", "E6", "B4", "B5"]

keyboards/takashiski/hecomi/alpha/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 = 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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/telophase/info.json → keyboards/telophase/keyboard.json

@@ -8,6 +8,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x12"],

keyboards/telophase/rules.mk

@@ -1,18 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-
-# project specific files
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
 

keyboards/tkc/portico/info.json → keyboards/tkc/portico/keyboard.json

@@ -8,6 +8,13 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

keyboards/tkc/portico/rules.mk

@@ -1,22 +1,8 @@
-# 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 = no            # Console for debug
-COMMAND_ENABLE = yes           # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = no
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC += keyboards/wilba_tech/wt_main.c \
        keyboards/wilba_tech/wt_rgb_backlight.c \
        quantum/color.c \
        drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes

keyboards/tkc/portico75/info.json → keyboards/tkc/portico75/keyboard.json

@@ -8,6 +8,15 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

keyboards/tkc/portico75/keymaps/via/rules.mk

@@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
        drivers/led/issi/is31fl3741.c
 
 I2C_DRIVER_REQUIRED = yes
+CIE1931_CURVE = yes

keyboards/tkc/portico75/rules.mk

@@ -1,15 +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 = no            # Console for debug
-COMMAND_ENABLE = yes           # Commands for debug and configuration
-NKRO_ENABLE = yes              # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-CIE1931_CURVE = yes
-ENCODER_ENABLE = yes

keyboards/tkw/grandiceps/info.json

@@ -4,7 +4,19 @@
     "maintainer": "vattern",
     "usb": {
         "vid": "0xFEED",
-        "pid": "0x7812"
+        "pid": "0x7812",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
     },
     "ws2812": {
         "pin": "B1",

keyboards/tkw/grandiceps/rules.mk

@@ -1,20 +1,3 @@
-# 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 = 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
-ENCODER_ENABLE = yes        # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
 SERIAL_DRIVER = usart
-OLED_ENABLE = yes
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1

keyboards/tkw/stoutgat/v1/info.json → keyboards/tkw/stoutgat/v1/keyboard.json

@@ -8,6 +8,13 @@
         "pid": "0x7811",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
         "rows": ["D1", "D0", "A0", "A1", "A2"]

keyboards/tkw/stoutgat/v1/rules.mk

@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# 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 = 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
-ENCODER_ENABLE  = yes

keyboards/tkw/stoutgat/v2/info.json

@@ -8,6 +8,14 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "ws2812": {
         "pin": "B1",
         "driver": "pwm"

keyboards/tkw/stoutgat/v2/rules.mk

@@ -1,18 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-MOUSEKEY_ENABLE = yes       # 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
-ENCODER_ENABLE = yes        # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-
 DEFAULT_FOLDER = tkw/stoutgat/v2/f411

keyboards/tokyokeyboard/alix40/info.json → keyboards/tokyokeyboard/alix40/keyboard.json

@@ -8,6 +8,14 @@
         "pid": "0x4134",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
         "rows": ["D7", "C6", "C7", "B5"]

keyboards/tokyokeyboard/alix40/rules.mk

@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-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 = 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
-BLUETOOTH_ENABLE = yes

keyboards/tominabox1/littlefoot_lx/rev1/info.json → keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json

@@ -8,6 +8,12 @@
         "pid": "0x6C78",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
         "rows": ["D5", "F4", "D3", "F1", "F0"]

keyboards/tominabox1/littlefoot_lx/rev1/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/tominabox1/littlefoot_lx/rev2/info.json → keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json

@@ -8,6 +8,12 @@
         "pid": "0x6C78",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
         "rows": ["D5", "F4", "D3", "F1", "F0"]

keyboards/tominabox1/littlefoot_lx/rev2/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/tominabox1/underscore33/rev1/config.h

@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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
-
-/* 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/tominabox1/underscore33/rev1/info.json → keyboards/tominabox1/underscore33/rev1/keyboard.json

@@ -8,6 +8,18 @@
     "pid": "0x3301",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
     "rows": ["F5", "F6", "C6", "D0"]

keyboards/tominabox1/underscore33/rev1/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 = 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 keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/tominabox1/underscore33/rev2/config.h

@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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
-
-/* 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/tominabox1/underscore33/rev2/info.json → keyboards/tominabox1/underscore33/rev2/keyboard.json

@@ -8,6 +8,18 @@
     "pid": "0x3302",
     "device_version": "0.0.2"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "rgblight": {
     "led_count": 12,
     "animations": {

keyboards/tominabox1/underscore33/rev2/rules.mk

@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-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 keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-

keyboards/torn/info.json → keyboards/torn/keyboard.json

@@ -9,6 +9,14 @@
     "device_version": "0.0.1",
     "max_power": 100
   },
+  "features": {
+    "bootmagic": false,
+    "encoder": true,
+    "extrakey": false,
+    "mousekey": false,
+    "oled": true,
+    "wpm": true
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "B2", "pin_b": "B1"}

keyboards/torn/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 = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable rotary encoder
-OLED_ENABLE = yes
-WPM_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c \

keyboards/touchpad/config.h

@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 6
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/touchpad/info.json → keyboards/touchpad/keyboard.json

@@ -8,6 +8,19 @@
         "pid": "0x0DB8",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/touchpad/rules.mk

@@ -1,15 +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 = yes         # 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.
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c

keyboards/ungodly/launch_pad/info.json → keyboards/ungodly/launch_pad/keyboard.json

@@ -8,6 +8,22 @@
     "pid": "0x4C50",
     "device_version": "99.9.9"
   },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "midi": true,
+    "mousekey": false,
+    "nkro": true,
+    "oled": true,
+    "rgb_matrix": true,
+    "magic": false,
+    "grave_esc": false,
+    "space_cadet": false
+  },
   "rgb_matrix": {
     "animations": {
       "gradient_left_right": true,

keyboards/ungodly/launch_pad/rules.mk

@@ -1,22 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-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 keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-MIDI_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-GRAVE_ESC_ENABLE = no
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes

keyboards/unicomp/classic_ultracl_post_2013/info.json

@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {

keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json → keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json

@@ -3,6 +3,13 @@
     "manufacturer": "Unicomp/Purdea Andrei",
     "maintainer": "purdeaandrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",

keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk

@@ -1,17 +1 @@
-# 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 = 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
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid

keyboards/unicomp/classic_ultracl_pre_2013/info.json

@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {

keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json → keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json

@@ -3,6 +3,13 @@
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
     "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",

keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk

@@ -1,17 +1 @@
-# 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 = 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
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid

keyboards/unicomp/pc122/info.json

@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {

keyboards/unicomp/pc122/overnumpad_1xb/info.json → keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json

@@ -3,6 +3,13 @@
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
     "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",

keyboards/unicomp/pc122/overnumpad_1xb/rules.mk

@@ -1,17 +1 @@
-# 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 = 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
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid

keyboards/unicomp/spacesaver_m_post_2013/info.json

@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {

keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json → keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json

@@ -3,6 +3,13 @@
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
     "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "indicators": {
         "caps_lock": "C12"
     },

keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk

@@ -1,17 +1 @@
-# 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 = 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
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid

keyboards/unicomp/spacesaver_m_pre_2013/info.json

@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {

keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json → keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json

@@ -3,6 +3,13 @@
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
     "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "indicators": {
         "caps_lock": "C12"
     },

keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk

@@ -1,17 +1 @@
-# 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 = 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
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid

keyboards/unison/v04/info.json → keyboards/unison/v04/keyboard.json

@@ -8,6 +8,17 @@
         "pid": "0x176A",
         "device_version": "0.4.0"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
         "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]