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

keyboards/10bleoledhub/info.json → keyboards/10bleoledhub/keyboard.json

@@ -8,6 +8,15 @@
         "pid": "0x7C99",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true
+    },
     "bluetooth": {
         "driver": "bluefruit_le"
     },

keyboards/10bleoledhub/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
-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
-BLUETOOTH_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes

keyboards/1k/info.json → keyboards/1k/keyboard.json

@@ -8,6 +8,16 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "processor": "attiny85",
+  "bootloader": "custom",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "grave_esc": false,
+    "magic": false,
+    "space_cadet": false
+  },
   "rgblight": {
     "led_count": 1
   },

keyboards/1k/rules.mk

@@ -1,26 +1,2 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
 BOOTLOADER_SIZE = 1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# 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
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no

keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/rules.mk

@@ -1,3 +1 @@
-OLED_ENABLE     = yes
-
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0

keyboards/25keys/zinc/rules.mk

@@ -1,4 +1 @@
 DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c

keyboards/3w6/rev2/info.json → keyboards/3w6/rev1/keyboard.json

@@ -1,6 +1,14 @@
 {
     "usb": {
-        "device_version": "0.0.2"
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/3w6/rev1/rules.mk

@@ -1,19 +1,3 @@
-# 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 = 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes

keyboards/3w6/rev1/info.json → keyboards/3w6/rev2/keyboard.json

@@ -1,6 +1,14 @@
 {
     "usb": {
-        "device_version": "0.0.1"
+        "device_version": "0.0.2",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/3w6/rev2/rules.mk

@@ -1,19 +1,3 @@
-# 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 = 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes

keyboards/bastardkb/tbk/info.json → keyboards/bastardkb/tbk/keyboard.json

@@ -24,6 +24,15 @@
     "ws2812": {
         "pin": "D2"
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
         "rows": ["D7", "B5", "F7", "F6", "B6"]

keyboards/bastardkb/tbk/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 = 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/biacco42/ergo42/info.json

@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}

keyboards/boston_meetup/2019/info.json → keyboards/boston_meetup/2019/keyboard.json

@@ -1,6 +1,12 @@
 {
+    "keyboard_name": "Boston Meetup Board",
+    "manufacturer": "ishtob",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
-        "device_version": "20.1.9"
+      "vid": "0xFB30",
+      "pid": "0x26BE",
+      "device_version": "20.1.9"
     },
     "features": {
         "bootmagic": true,
@@ -45,5 +51,27 @@
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
-    "debounce": 6
+    "debounce": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
 }

keyboards/boston_meetup/info.json

@@ -1,32 +0,0 @@
-{
-  "keyboard_name": "Boston Meetup Board",
-  "manufacturer": "ishtob",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFB30",
-    "pid": "0x26BE"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3}
-      ]
-    }
-  }
-}

keyboards/boston_meetup/rules.mk

@@ -1,2 +1 @@
-
 DEFAULT_FOLDER = boston_meetup/2019

keyboards/bpiphany/hid_liber/rules.mk

@@ -1,4 +1,2 @@
-CUSTOM_MATRIX = yes         # Custom matrix file
-
-# Project specific files
+CUSTOM_MATRIX = yes
 SRC = matrix.c

keyboards/buzzard/info.json

@@ -1,5 +0,0 @@
-{
-    "split":{
-        "enabled": true
-    }
-}

keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c

@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT_66_ansi(
-  BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   RGB_TOG,           RGB_VAI,
+  LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   RGB_TOG,           RGB_VAI,
   _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,

keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c

@@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT(
-  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_UP, 
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DOWN,
+  LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   LM_TOGG,           LM_BRIU, 
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                LM_BRID,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,
-  _______,_______,_______,                BL_BRTG,BL_BRTG,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
+  _______,_______,_______,                _______,_______,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
 };
 
 

keyboards/dailycraft/claw44/rev1/info.json → keyboards/dailycraft/claw44/rev1/keyboard.json

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

keyboards/dailycraft/claw44/rev1/rules.mk

@@ -1,13 +0,0 @@
-# Build Options
-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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-
-OLED_ENABLE = no     # Add OLED displays support

keyboards/dailycraft/claw44/rules.mk

@@ -1,14 +1 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-
 DEFAULT_FOLDER = dailycraft/claw44/rev1

keyboards/dailycraft/sandbox/rev1/keyboard.json

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

keyboards/dailycraft/sandbox/rev2/info.json → keyboards/dailycraft/sandbox/rev2/keyboard.json

@@ -19,6 +19,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "oled": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/sandbox/rev2/rules.mk

@@ -1 +0,0 @@
-# File intentionally blank

keyboards/dailycraft/sandbox/rules.mk

@@ -1,15 +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
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-
 DEFAULT_FOLDER = dailycraft/sandbox/rev2

keyboards/dailycraft/wings42/info.json

@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}

keyboards/dailycraft/wings42/rev1/keyboard.json

@@ -14,10 +14,16 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "community_layouts": [
         "split_3x6_3"
     ],

keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json

@@ -14,10 +14,16 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
    "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/wings42/rev2/keyboard.json

@@ -14,11 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
-    "features": {
-      "encoder": true
-    },
     "encoder": {
         "rotary": [
             { "pin_a": "B5", "pin_b": "B4" },
@@ -27,6 +25,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true
+    },
     "layout_aliases": {
         "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
     },

keyboards/dailycraft/wings42/rules.mk

@@ -1,14 +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
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = dailycraft/wings42/rev2

keyboards/dc01/arrow/info.json

@@ -6,10 +6,17 @@
     "usb": {
         "vid": "0x8968",
         "pid": "0x1012",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/dc01/arrow/rules.mk

@@ -1,15 +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
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c

keyboards/dc01/left/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
     "debounce": 0,
     "layouts": {
         "LAYOUT_ansi": {

keyboards/dc01/left/rules.mk

@@ -1,15 +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
-AUDIO_ENABLE = no           # Audio output
-
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes

keyboards/dc01/numpad/info.json

@@ -6,10 +6,17 @@
     "usb": {
         "vid": "0x8968",
         "pid": "0x1013",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
     "community_layouts": ["numpad_5x4", "ortho_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {

keyboards/dc01/numpad/rules.mk

@@ -1,15 +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
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c

keyboards/dc01/right/info.json

@@ -6,10 +6,17 @@
     "usb": {
         "vid": "0x8968",
         "pid": "0x1011",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/dc01/right/rules.mk

@@ -1,15 +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
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c

keyboards/delikeeb/vanana/info.json

@@ -2,15 +2,6 @@
     "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0x9906",
         "pid": "0x0013"

keyboards/delikeeb/vanana/rev1/info.json → keyboards/delikeeb/vanana/rev1/keyboard.json

@@ -28,6 +28,15 @@
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/delikeeb/vanana/rev1/rules.mk

@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output

keyboards/delikeeb/vanana/rev2/info.json → keyboards/delikeeb/vanana/rev2/keyboard.json

@@ -28,6 +28,17 @@
             {"pin_a": "F0", "pin_b": "F1"}
         ]
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "audio": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/delikeeb/vanana/rev2/rules.mk

@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output

keyboards/delikeeb/waaffle/rev3/elite_c/info.json

@@ -1,4 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}

keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json

@@ -0,0 +1,14 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "encoder": true
+    }
+}

keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk

@@ -1,3 +0,0 @@
-# supported on Elite-C controllers
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable Rotary Encoder

keyboards/delikeeb/waaffle/rev3/info.json

@@ -22,14 +22,6 @@
     "ws2812": {
         "pin": "C7"
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
         "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"]

keyboards/delikeeb/waaffle/rev3/pro_micro/info.json

@@ -1,4 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
-}