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

keyboards/bpiphany/frosty_flake/20130602/20130602.c

@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(B7); // caps lock
-    writePinHigh(B7);
-    setPinOutput(C5); // num lock
-    writePinHigh(C7);
-    setPinOutput(C6); // scroll lock
-    writePinHigh(C6);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t usb_led) {
-    // user requests no further processing
-    if (!led_update_user(usb_led))
-        return true;
-
-    writePin(C5, !usb_led.num_lock);
-    writePin(B7, !usb_led.caps_lock);
-    writePin(C6, !usb_led.scroll_lock);
-
-    return true;
-}

keyboards/bpiphany/frosty_flake/20130602/keyboard.json

@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "C5",
+        "scroll_lock": "C6",
+        "on_state": 0
+    }
+}

keyboards/bpiphany/frosty_flake/20130602/rules.mk

@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 SRC += 20130602/matrix.c

keyboards/bpiphany/frosty_flake/20140521/20140521.c

@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(B7); // num lock
-    writePinHigh(B7);
-    setPinOutput(C5); // caps lock
-    writePinHigh(C7);
-    setPinOutput(C6); // scroll lock
-    writePinHigh(C6);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t usb_led) {
-    // user requests no further processing
-    if (!led_update_user(usb_led))
-        return true;
-
-    writePin(C5, !usb_led.caps_lock);
-    writePin(B7, !usb_led.num_lock);
-    writePin(C6, !usb_led.scroll_lock);
-
-    return true;
-}

keyboards/bpiphany/frosty_flake/20140521/keyboard.json

@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C5",
+        "num_lock": "B7",
+        "scroll_lock": "C6",
+        "on_state": 0
+    }
+}

keyboards/bpiphany/frosty_flake/20140521/rules.mk

@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 SRC += 20140521/matrix.c

keyboards/canary/canary60rgb/info.json

@@ -8,6 +8,19 @@
         "pid": "0x0621",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,

keyboards/canary/canary60rgb/v1/rules.mk

@@ -1,15 +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 = yes          # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-
-LTO_ENABLE = yes
+# This file intentionally left blank

keyboards/handwired/qc60/info.json

@@ -8,6 +8,15 @@
     "pid": "0x0C60",
     "device_version": "1.0.0"
   },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
   "rgblight": {
     "led_count": 1
   },
@@ -20,6 +29,7 @@
   },
   "diode_direction": "ROW2COL",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
   "processor": "atmega32u4",

keyboards/handwired/qc60/proto/rules.mk

@@ -1 +1 @@
-RGBLIGHT_ENABLE = yes
+# This file intentionally left blank

keyboards/handwired/qc60/rules.mk

@@ -1,16 +1 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = handwired/qc60/proto

keyboards/handwired/stef9998/split_5x7/info.json

@@ -8,12 +8,21 @@
     "pid": "0x6063",
     "device_version": "1.0.0"
   },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
   "matrix_pins": {
     "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"],
     "rows": ["C6", "D7", "E6", "B4", "B5"]
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0",
     "matrix_pins": {
       "right": {

keyboards/handwired/stef9998/split_5x7/rules.mk

@@ -1,16 +1 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1
+DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1

keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk

@@ -1 +1 @@
-
+# This file intentionally left blank

keyboards/ibm/model_m/mschwingen/led_wired/rules.mk

@@ -1 +1 @@
-
+# This file intentionally left blank

keyboards/mechwild/sugarglider/f401/keyboard.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f401"
+}

keyboards/mechwild/sugarglider/f401/rules.mk

@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401

keyboards/mechwild/sugarglider/f411/keyboard.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f411"
+}

keyboards/mechwild/sugarglider/f411/rules.mk

@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411

keyboards/mechwild/sugarglider/info.json

@@ -3,7 +3,6 @@
     "keyboard_name": "Sugar Glider",
     "maintainer": "kylemccreery",
     "url": "https://mechwild.com/product/sugar-glider/",
-    "bootloader": "stm32-dfu",
     "features": {
         "bootmagic": true,
         "command": false,

keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f401"
+}

keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk

@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401

keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f411"
+}

keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk

@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411

keyboards/melgeek/mojo68/info.json

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

keyboards/melgeek/mojo68/rev1/rules.mk

@@ -1,12 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+# This file intentionally left blank

keyboards/melgeek/mojo75/info.json

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

keyboards/melgeek/mojo75/rev1/rules.mk

@@ -1,13 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
+# This file intentionally left blank

keyboards/melgeek/tegic/info.json

@@ -8,6 +8,18 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

keyboards/melgeek/tegic/rev1/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-
-LTO_ENABLE = yes
-
+# This file intentionally left blank

keyboards/melgeek/z70ultra/info.json

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

keyboards/melgeek/z70ultra/rev1/rules.mk

@@ -1,13 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
+# This file intentionally left blank

keyboards/murcielago/info.json

@@ -8,6 +8,15 @@
     "pid": "0x0001",
     "device_version": "0.0.2"
   },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
   "matrix_pins": {
     "cols": ["C6", "B6", "B5", "D7", "D6", "D4"],
     "rows": ["B4", "D5", "B3", "B2", "B1", "B0"]
@@ -19,6 +28,7 @@
     ]
   },
   "split": {
+    "enabled": true,
     "soft_serial_pin": "E6",
     "encoder": {
       "right": {

keyboards/murcielago/rev1/rules.mk

@@ -1,14 +1 @@
-# 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
-SPLIT_KEYBOARD = yes        # Enable split keyboard mode
-ENCODER_ENABLE = yes
+# This file intentionally left blank

keyboards/polilla/info.json

@@ -8,6 +8,14 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"],
         "rows": ["B1", "B0", "A7", "F1", "A0"]

keyboards/polilla/rev1/rules.mk

@@ -1,12 +1 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank

keyboards/spacetime/info.json

@@ -8,12 +8,21 @@
     "pid": "0x0A0C",
     "device_version": "1.0.0"
   },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
     "rows": ["D4", "C6", "D7", "E6"]
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
   "processor": "atmega32u4",

keyboards/spacetime/rev1/rules.mk

@@ -1 +1 @@
-OLED_ENABLE = no
+# This file intentionally left blank

keyboards/spacetime/rev2/keyboard.json

@@ -0,0 +1,5 @@
+{
+    "features": {
+      "oled": true
+    }
+}

keyboards/spacetime/rev2/rules.mk

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

keyboards/spacetime/rules.mk

@@ -1,18 +1 @@
-# 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 = 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 = no
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = spacetime/rev1

keyboards/xiudi/xd004/info.json → keyboards/xiudi/xd004/v1/keyboard.json

@@ -7,6 +7,18 @@
         "pid": "0x0404",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "space_cadet": false
+    },
     "backlight": {
         "pin": "D5",
         "levels": 6

keyboards/xiudi/xd004/v1/rules.mk

@@ -1,15 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SPACE_CADET_ENABLE = no
-# Saves about 5% of space:
-LTO_ENABLE = yes