Merge 29ea5c728d into c8ceda461a

keyboards/mechkeys/mechmini/v1/info.json → keyboards/mechkeys/mechmini/v1/keyboard.json

@@ -8,6 +8,14 @@
         "pid": "0xCA40",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
         "rows": ["B0", "B1", "B2", "B3"]

keyboards/mechkeys/mechmini/v1/rules.mk

@@ -1,10 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes

keyboards/mechkeys/mechmini/v2/info.json → keyboards/mechkeys/mechmini/v2/keyboard.json

@@ -8,6 +8,14 @@
     "pid": "0xCA40",
     "device_version": "0.0.2"
   },
+  "features": {
+    "bootmagic": true,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "backlight": true,
+    "rgblight": true
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
     "rows": ["D0", "D1", "D2", "D3"]

keyboards/mechkeys/mechmini/v2/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 = 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 = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes

keyboards/mechstudio/ud_40_ortho/info.json

@@ -8,6 +8,12 @@
     "pid": "0x0002",
     "device_version": "0.0.2"
   },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
   "matrix_pins": {
     "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"],
     "rows": ["C2", "B4", "B5", "B6"]

keyboards/mechstudio/ud_40_ortho/rules.mk

@@ -1,16 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no

keyboards/mechwild/bbs/info.json → keyboards/mechwild/bbs/keyboard.json

@@ -7,7 +7,19 @@
         "vid": "0x6D77",
         "pid": "0x170E",
         "device_version": "0.0.1",
-        "force_nkro": true
+        "force_nkro": true,
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "dip_switch": true,
+        # Necessary for stenography functionality
+        "steno": true,
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["B0", "A7", "A6", "A5", "A4", "A3"],

keyboards/mechwild/bbs/rules.mk

@@ -1,17 +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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes     # Dip Switch Enabled
-
-# Necessary for stenography functionality
-STENO_ENABLE = yes          # Enable stenography endpoint
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-KEYBOARD_SHARED_EP = yes    # Needed to free up an endpoint in blackpill

keyboards/mechwild/bde/info.json

@@ -8,16 +8,6 @@
     "build": {
         "lto": true
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "debug": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "nkro": true
-    },
     "development_board": "promicro",
     "rgblight": {
         "sleep": true,

keyboards/mechwild/bde/lefty/keyboard.json

@@ -4,6 +4,13 @@
         "pid": "0x1701",
         "device_version": "2.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "rows": ["D1", "D7", "D3"],
         "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"]

keyboards/mechwild/bde/rev2/info.json → keyboards/mechwild/bde/rev2/keyboard.json

@@ -4,6 +4,15 @@
         "pid": "0x170A",
         "device_version": "1.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3"}

keyboards/mechwild/bde/rev2/rules.mk

@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen

keyboards/mechwild/bde/righty/keyboard.json

@@ -4,6 +4,13 @@
         "pid": "0x1702",
         "device_version": "2.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "rows": ["D1", "D7", "D3"],
         "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"]

keyboards/mechwild/mokulua/mirrored/info.json → keyboards/mechwild/mokulua/mirrored/keyboard.json

@@ -8,6 +8,14 @@
         "pid": "0x170C",
         "device_version": "1.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]

keyboards/mechwild/mokulua/mirrored/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        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen

keyboards/mechwild/mokulua/standard/info.json → keyboards/mechwild/mokulua/standard/keyboard.json

@@ -8,6 +8,14 @@
         "pid": "0x170B",
         "device_version": "1.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
@@ -22,7 +30,7 @@
         "tap_keycode_delay": 10
     },
     "split": {
-        "enabled": true
+        "enabled": true,
         "soft_serial_pin": "D3",
         "transport": {
             "sync": {

keyboards/mechwild/mokulua/standard/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        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen

keyboards/mechwild/puckbuddy/info.json

@@ -8,6 +8,18 @@
         "pid": "0x170F",
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true,
+        "dip_switch": true,
+        "pointing_device": true,
+        # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+        "dynamic_tapping_term": true
+    },
     "matrix_pins": {
         "cols": ["B10", "A8", "B4", "B5"],
         "rows": ["B12", "B13", "B14", "B15"]

keyboards/mechwild/puckbuddy/rules.mk

@@ -1,20 +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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Encoder Enabled
-OLED_ENABLE = yes           # OLED Enabled
-DIP_SWITCH_ENABLE = yes     # Dip Switch Enabled
-
-POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
-POINTING_DEVICE_DRIVER = cirque_pinnacle_spi    # Pointing Device Driver
-
-DYNAMIC_TAPPING_TERM_ENABLE = yes               # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi

keyboards/mechwild/sugarglider/f401/keyboard.json

@@ -1,3 +1,19 @@
 {
-    "development_board": "blackpill_f401"
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+        "dynamic_tapping_term": true
+    }
 }

keyboards/mechwild/sugarglider/f411/keyboard.json

@@ -1,3 +1,19 @@
 {
-    "development_board": "blackpill_f411"
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+        "dynamic_tapping_term": true
+    }
 }

keyboards/mechwild/sugarglider/info.json

@@ -3,23 +3,16 @@
     "keyboard_name": "Sugar Glider",
     "maintainer": "kylemccreery",
     "url": "https://mechwild.com/product/sugar-glider/",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true,
-        "rgblight": true,
-        "dip_switch": true,
-        "steno": true
-    },
     "usb": {
         "vid": "0x6D77",
         "pid": "0x1710",
         "device_version": "0.2.0",
-        "force_nkro": true
+        "force_nkro": true,
+        # Necessary for stenography functionality
+        # Needed to free up an endpoint in blackpill
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "diode_direction": "COL2ROW",
     "dynamic_keymap": {

keyboards/mechwild/sugarglider/rules.mk

@@ -1,12 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-OLED_ENABLE = yes                   # OLED Enabled
-
 # Cirque touchpad settings
-POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi    # Pointing Device Driver
-DYNAMIC_TAPPING_TERM_ENABLE = yes               # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
 
 # Custom matrix setup
 CUSTOM_MATRIX = lite
@@ -16,6 +9,3 @@ SRC += mcp23018.c matrix.c
 I2C_DRIVER_REQUIRED = yes
 
 DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
-
-# Necessary for stenography functionality
-KEYBOARD_SHARED_EP = yes    # Needed to free up an endpoint in blackpill

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

@@ -1,3 +1,20 @@
 {
-    "development_board": "blackpill_f401"
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+        "dynamic_tapping_term": true,
+        "wide_oled": true
+    }
 }

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

@@ -1,3 +1,20 @@
 {
-    "development_board": "blackpill_f411"
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+        "dynamic_tapping_term": true,
+        "wide_oled": true
+    }
 }

keyboards/mechwild/sugarglider/wide_oled/rules.mk

@@ -1,6 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-WIDE_OLED_ENABLE = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
+DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401

keyboards/merge/uma/info.json → keyboards/merge/uma/keyboard.json

@@ -8,6 +8,18 @@
         "pid": "0x3232",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
         "rows": ["B0", "B1", "B2", "B3", "B7"]

keyboards/merge/uma/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 = no         # 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
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes

keyboards/mexsistor/ludmila/info.json

@@ -8,6 +8,13 @@
         "pid": "0x6BF6",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"}

keyboards/mexsistor/ludmila/rules.mk

@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite
 SRC = matrix.c
-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