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

data/mappings/info_rules.hjson

@@ -23,6 +23,7 @@
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
+    "HAPTIC_DRIVER": {"info_key": "haptic.driver"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
     "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
@@ -43,7 +44,7 @@
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
     "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
     "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
-    "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+    "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"},
     "WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"},
     "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 

data/schemas/keyboard.jsonschema

@@ -387,6 +387,15 @@
                 }
             }
         },
+        "haptic": {
+            "type": "object",
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["drv2605l", "solenoid"]
+                }
+            }
+        },
         "leader_key": {
             "type": "object",
             "properties": {
@@ -885,7 +894,7 @@
                     }
                 },
                 "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "wait_for": {"type": "boolean"}
+                "wait_for_enumeration": {"type": "boolean"}
             }
         },
         "qmk": {

docs/config_options.md

@@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab
   * Allows replacing the standard matrix scanning routine with a custom one.
 * `DEBOUNCE_TYPE`
   * Allows replacing the standard key debouncing routine with an alternative or custom one.
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * Forces the keyboard to wait for a USB connection to be established before it starts up
 * `NO_USB_STARTUP_CHECK`
   * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.

docs/ja/config_options.md

@@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * 標準マトリックス走査ルーチンを独自のものに置き換えることができます。
 * `DEBOUNCE_TYPE`
   * 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます
 * `NO_USB_STARTUP_CHECK`
   * キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。

docs/pr_checklist.md

@@ -148,6 +148,13 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
   - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards that require it.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
 
+Wireless-capable boards:
+- Given license abuse from vendors, QMK does not accept any vendor PRs for wireless- or Bluetooth-capable keyboards without wireless and/or Bluetooth code
+    - Historically, vendors have done this in bad faith in order to attain downstream VIA compatibility with no intention of releasing wireless sources
+    - QMK's license, the GPL2+, requires full source disclosure for any distributed binary -- including full sources for any keyboard shipped by vendors containing QMK and/or firmware-side VIA code
+    - If a vendor's wireless-capable keyboard PR submission is lacking wireless capability, then the PR will be left on-hold and unmergeable until wireless bindings are provided
+    - If a vendor's wireless-capable keyboard is merged into QMK before it's known that the board is wireless, then all existing and future PRs from the same vendor will be put on hold until wireless bindings for the offending keyboard are provided
+
 Also, specific to ChibiOS:
 - **strong** preference to using existing ChibiOS board definitions.
     - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family

docs/reference_info_json.md

@@ -833,7 +833,7 @@ Configures the [Stenography](feature_stenography.md) feature.
     * `suspend_wakeup_delay`
         * The amount of time to wait after sending a wakeup packet, in milliseconds.
         * Default: `0` (disabled)
-    * `wait_for`
+    * `wait_for_enumeration`
         * Force the keyboard to wait for USB enumeration before starting up.
         * Default: `false`
 

keyboards/ai03/lunar_ii/keyboard.json

@@ -22,6 +22,9 @@
             "resync": true
         }
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",

keyboards/ai03/lunar_ii/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid

keyboards/bastardkb/charybdis/3x5/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/bastardkb/charybdis/3x6/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/bastardkb/charybdis/4x6/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["B15", "A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/bastardkb/scylla/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["B15", "A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/bastardkb/skeletyl/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/bastardkb/tbkmini/blackpill/info.json

@@ -24,7 +24,5 @@
         "rows": ["A2", "B8", "A8", "B9"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/boston_meetup/2019/keyboard.json

@@ -17,6 +17,9 @@
         "haptic": true,
         "oled": true
     },
+    "haptic": {
+        "driver": "drv2605l"
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

keyboards/boston_meetup/2019/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l

keyboards/bt66tech/bt66tech60/keyboard.json

@@ -55,8 +55,7 @@
         "pin": "B15",
         "driver": "spi"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {

keyboards/cannonkeys/ortho48/keyboard.json

@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {

keyboards/cannonkeys/ortho60/keyboard.json

@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {

keyboards/cannonkeys/ortho75/keyboard.json

@@ -54,8 +54,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_5x15"],
   "layouts": {
     "LAYOUT_ortho_5x15": {

keyboards/cannonkeys/practice60/keyboard.json

@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["60_ansi"],
   "layouts": {
     "LAYOUT_60_ansi": {

keyboards/cannonkeys/practice65/keyboard.json

@@ -48,9 +48,8 @@
         "pin": "B15",
         "driver": "spi"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-   "layouts": {
+    "development_board": "bluepill",
+    "layouts": {
         "LAYOUT_default": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},

keyboards/cantor/keyboard.json

@@ -2,7 +2,6 @@
     "manufacturer": "Diego Palacios",
     "keyboard_name": "cantor",
     "maintainer": "diepala",
-    "bootloader": "stm32-dfu",
     "features": {
         "bootmagic": true,
         "command": false,
@@ -11,8 +10,7 @@
         "mousekey": true,
         "nkro": true
     },
-    "processor": "STM32F401",
-    "board": "BLACKPILL_STM32_F401",
+    "development_board": "blackpill_f401",
     "url": "https://github.com/diepala/cantor",
     "usb": {
         "device_version": "1.0.0",

keyboards/ckeys/thedora/keyboard.json

@@ -29,9 +29,7 @@
       {"pin_a": "B13", "pin_b": "B15"}
     ]
   },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
+  "development_board": "proton_c",
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/converter/hp_46010a/keyboard.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEED",
     "pid": "0x6060",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "wait_for_enumeration": true
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",

keyboards/converter/hp_46010a/rules.mk

@@ -1,4 +1,3 @@
-WAIT_FOR_USB = yes
 CUSTOM_MATRIX = yes
 
 SRC = matrix.c

keyboards/converter/siemens_tastatur/keyboard.json

@@ -8,8 +8,7 @@
         "pid": "0x4353",
         "device_version": "0.0.1"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "features": {
         "bootmagic": false,
         "mousekey": true,

keyboards/dcpedit/redherring/keyboard.json

@@ -31,6 +31,9 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "url": "https://github.com/dcpedit/redherring",
     "usb": {
         "device_version": "1.0.0",

keyboards/dcpedit/redherring/rules.mk

@@ -1,2 +1 @@
 F_CPU = 16000000
-HAPTIC_DRIVER = solenoid

keyboards/epomaker/tide65/rules.mk

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

keyboards/ez_maker/directpins/proton_c/keyboard.json

@@ -2,9 +2,7 @@
     "manufacturer": "Zach White",
     "keyboard_name": "DirectPins Proton C",
     "maintainer": "skullydazed",
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "bootmagic": true,
         "extrakey": true,

keyboards/geekboards/macropad_v2/config.h

@@ -21,5 +21,3 @@
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_PWM_DMA_CHANNEL 3
-
-#define WAIT_FOR_USB

keyboards/geekboards/macropad_v2/keyboard.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x0483",
     "pid": "0xA372",
-    "device_version": "0.0.2"
+    "device_version": "0.0.2",
+    "wait_for_enumeration": true
   },
   "qmk": {
     "tap_keycode_delay": 10

keyboards/hadron/ver3/keyboard.json

@@ -15,6 +15,9 @@
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "haptic": {
+        "driver": "drv2605l"
+    },
     "rgblight": {
         "led_count": 10,
         "animations": {

keyboards/hadron/ver3/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l

keyboards/handwired/d48/keyboard.json

@@ -42,8 +42,7 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "bootmagic": false,
         "mousekey": false,
@@ -56,7 +55,6 @@
         "oled": true,
         "unicode": true
     },
-    "board": "QMK_PROTON_C",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json

@@ -10,14 +10,12 @@
             "matrix": [7, 0]
         }
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
     "features": {
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
         "console": true,
         "command": true
-    },
-    "board": "BLACKPILL_STM32_F411"
+    }
 }

keyboards/handwired/dygma/raise/info.json

@@ -24,14 +24,12 @@
         "led_flush_limit": 100,
         "sleep": true
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
     "features": {
         "bootmagic": false,
         "mousekey": true,
         "extrakey": true,
         "rgb_matrix": true
     },
-    "board": "BLACKPILL_STM32_F411",
     "debounce": 0
 }

keyboards/handwired/ergocheap/keyboard.json

@@ -25,8 +25,7 @@
         "rows": ["B5", "B6", "B7", "B9", "B8"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/floorboard/keyboard.json

@@ -21,9 +21,7 @@
         "rows": ["A2", "A1", "A0", "B8"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {

keyboards/handwired/macroboard/f401/keyboard.json

@@ -12,14 +12,12 @@
     "ws2812": {
         "driver": "pwm"
     },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f401",
     "features": {
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
         "nkro": true,
         "rgblight": true
-    },
-    "board": "BLACKPILL_STM32_F401"
+    }
 }

keyboards/handwired/macroboard/f411/keyboard.json

@@ -12,8 +12,7 @@
     "ws2812": {
         "driver": "pwm"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
     "features": {
         "bootmagic": true,
         "mousekey": true,
@@ -21,6 +20,5 @@
         "nkro": true,
         "rgblight": true,
         "audio": true
-    },
-    "board": "BLACKPILL_STM32_F411"
+    }
 }

keyboards/handwired/pill60/blackpill_f401/keyboard.json

@@ -9,7 +9,5 @@
         "rows": ["B4", "B3", "A15", "B13", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
+    "development_board": "blackpill_f401"
 }

keyboards/handwired/pill60/blackpill_f411/keyboard.json

@@ -9,7 +9,5 @@
         "rows": ["B4", "B3", "A15", "B13", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/handwired/pill60/bluepill/keyboard.json

@@ -4,6 +4,5 @@
         "rows": ["B4", "B3", "A15", "B13", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }

keyboards/handwired/riblee_f401/keyboard.json

@@ -23,8 +23,7 @@
         "pin": "A0",
         "levels": 5
     },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f401",
     "features": {
         "bootmagic": true,
         "mousekey": true,
@@ -32,7 +31,6 @@
         "nkro": true,
         "backlight": true
     },
-    "board": "BLACKPILL_STM32_F401",
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {

keyboards/handwired/riblee_f411/keyboard.json

@@ -19,15 +19,13 @@
         "rows": ["A6", "A5", "A4", "A3", "A2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
     "features": {
         "bootmagic": false,
         "mousekey": true,
         "extrakey": true,
         "nkro": true
     },
-    "board": "BLACKPILL_STM32_F411",
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {

keyboards/handwired/selene/keyboard.json

@@ -28,9 +28,7 @@
     "rows": ["B10", "B9", "B15", "B14", "B13", "B8"]
   },
   "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
+  "development_board": "proton_c",
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/handwired/sick_pad/keyboard.json

@@ -21,9 +21,7 @@
         "rows": ["B0", "B1", "B2", "B3", "B4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {

keyboards/handwired/sono1/stm32f103/keyboard.json

@@ -13,6 +13,5 @@
         "kana": "A2",
         "on_state": 0
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }

keyboards/handwired/split65/stm32/keyboard.json

@@ -9,8 +9,7 @@
         "enabled": true,
         "soft_serial_pin": "A9"
     },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "bootmagic": false,
         "mousekey": false,
@@ -18,7 +17,6 @@
         "audio": true,
         "oled": true
     },
-    "board": "QMK_PROTON_C",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/splittest/bluepill/keyboard.json

@@ -4,8 +4,7 @@
         "rows": ["B10"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "features": {
         "bootmagic": false,
         "mousekey": false,

keyboards/handwired/symmetric70_proto/proton_c/info.json

@@ -1,6 +1,4 @@
 {
     "keyboard_name": "Symmetric70 prototype proton-c",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
+    "development_board": "proton_c"
 }

keyboards/handwired/t111/keyboard.json

@@ -21,8 +21,7 @@
         "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json

@@ -21,8 +21,7 @@
             {"pin_a": "A7", "pin_b": "A8"}
         ]
     },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "console": true
     }

keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json

@@ -24,10 +24,10 @@
             {"pin_a": "A13", "pin_b": "A14"}
         ]
     },
+    "development_board": "blackpill_f411",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "features": {
         "console": true
-    },
-    "board": "BLACKPILL_STM32_F411"
+    }
 }

keyboards/handwired/twig/twig50/keyboard.json

@@ -26,9 +26,7 @@
       "rows": ["B7", "B6", "B5", "B4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "debounce": 8,
     "layouts": {
         "LAYOUT_diag_4x14": {

keyboards/handwired/uthol/rev3/keyboard.json

@@ -40,8 +40,7 @@
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
         ]
     },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f401",
     "features": {
         "bootmagic": true,
         "nkro": true,
@@ -50,6 +49,5 @@
         "extrakey": true,
         "encoder": true,
         "rgblight": true
-    },
-    "board": "BLACKPILL_STM32_F401"
+    }
 }

keyboards/handwired/wulkan/keyboard.json

@@ -14,15 +14,13 @@
       "rows": ["B8", "A0", "A1", "A2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
         "nkro": true
     },
-    "board": "QMK_PROTON_C",
     "community_layouts": ["ortho_4x12"],
     "layout_aliases": {
       "LAYOUT": "LAYOUT_ortho_4x12"

keyboards/hardwareabstraction/handwire/keyboard.json

@@ -15,6 +15,9 @@
         "oled": true,
         "wpm": true
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "build": {
         "lto": true
     },

keyboards/hardwareabstraction/handwire/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid

keyboards/hs60/v1/rules.mk

@@ -1,4 +1,4 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes

keyboards/hs60/v2/ansi/rules.mk

@@ -1,13 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes

keyboards/hs60/v2/hhkb/rules.mk

@@ -1,13 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes

keyboards/hs60/v2/iso/rules.mk

@@ -1,13 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes

keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json

@@ -15,7 +15,5 @@
         "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }

keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json

@@ -7,6 +7,5 @@
         "rows": ["C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }

keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json

@@ -11,6 +11,9 @@
              "keyboard": true
         }
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",

keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid

keyboards/kagizaraya/scythe/rules.mk

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

keyboards/keebwerk/mega/ansi/rules.mk

@@ -1,13 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3733.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes

keyboards/keychron/c2_pro/ansi/rgb/rules.mk

@@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c

keyboards/keychron/c2_pro/ansi/white/rules.mk

@@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c

keyboards/keychron/q11/iso_encoder/rules.mk

@@ -1,4 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SERIAL_DRIVER = usart

keyboards/keychron/q12/iso_encoder/rules.mk

@@ -1,5 +1,4 @@
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-VPATH ?= keyboards/keychron/common
 SRC += matrix.c

keyboards/keychron/q4/ansi/info.json

@@ -1,7 +1,6 @@
 {
     "usb": {
-        "pid": "0x0140",
-        "device_version": "1.0.6"
+        "pid": "0x0140"
     },
     "rgb_matrix": {
         "layout": [

keyboards/keychron/q4/ansi/v1/keyboard.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "1.0.6"
+    }
+}

keyboards/keychron/q4/ansi/v1/rules.mk

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

keyboards/keychron/q4/ansi/v2/keyboard.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}

keyboards/keychron/q4/ansi/v2/rules.mk

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