~ruther/qmk_firmware

397c822e42256d6385110d49ba9c8bc08ff85249 — QMK Bot 2 years ago 18a9fdb + 2f559c0
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 2 insertions(+), 2 deletions(-)

M keyboards/adafruit/macropad/config.h
M keyboards/adafruit/macropad/readme.md
M keyboards/adafruit/macropad/config.h => keyboards/adafruit/macropad/config.h +1 -1
@@ 61,7 61,7 @@
#define DEBOUNCE 5

/* 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_COLUMN 2


M keyboards/adafruit/macropad/readme.md => keyboards/adafruit/macropad/readme.md +1 -1
@@ 32,7 32,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to

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.
* **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.