drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
Drashna Jael're 2021-12-08 08:17:55 -08:00
commit af936c6ae6
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
152 changed files with 516 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/flashing.md
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