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

This commit is contained in:
Drashna Jael're
2021-12-08 08:17:55 -08:00
152 changed files with 516 additions and 667 deletions

View File

@ -290,7 +290,7 @@ Compatible flashers:
Flashing sequence:
1. Enter the bootloader using any of the following methods:
* Tap the `RESET` keycode (this may only enter the MCU into a "secure" bootloader mode; see https://github.com/qmk/qmk_firmware/issues/6112)
* Tap the `RESET` keycode
* Press the `RESET` button on the PCB
2. Wait for the OS to detect the device
3. Flash a .bin file