ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-10-05 22:38:06 +00:00
commit 397c822e42
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/adafruit/macropad/config.h
View file

@ -61,7 +61,7 @@
#define DEBOUNCE 5 #define DEBOUNCE 5
/* Bootmagic lite */ /* Bootmagic lite */
/* (Press the key bellow the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ /* (Press the key below the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
#define BOOTMAGIC_LITE_ROW 1 #define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 2 #define BOOTMAGIC_LITE_COLUMN 2

2
keyboards/adafruit/macropad/readme.md
View file

@ -32,7 +32,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
Enter the bootloader in 4 ways: Enter the bootloader in 4 ways:
* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up. * **Bootmagic reset**: Hold down the key just below the rotary encoder push-button on power-up.
* **Physical reset button**: Press twice the button on the side while the board is connected. * **Physical reset button**: Press twice the button on the side while the board is connected.
* **BOOT button** Hold down the rotary encoder push-button on power-up or reset. * **BOOT button** Hold down the rotary encoder push-button on power-up or reset.
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.