1
0
Fork 0

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

This commit is contained in:
Drashna Jael're 2022-08-20 10:22:48 -07:00
commit 8f6b019dcc
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
353 changed files with 374 additions and 374 deletions

View file

@ -19,4 +19,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (Escape key) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to RESET if it is available (by default this is set to "Fn + R")
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (by default this is set to "Fn + R")

View file

@ -20,4 +20,4 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `RESET` if it is available (this can be set in vial!)
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (this can be set in vial!)