diff options
| author | QMK Bot <hello@qmk.fm> | 2022-10-05 22:38:06 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-10-05 22:38:06 +0000 |
| commit | 397c822e42256d6385110d49ba9c8bc08ff85249 (patch) | |
| tree | 6b0d863e57411aa8e0139e3a455a3a787003a53b /keyboards | |
| parent | 18a9fdb9dca280ac567727899ef73f8302c630c5 (diff) | |
| parent | 2f559c03136764ac29c0586896c3f06e82bcc683 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/adafruit/macropad/config.h | 2 | ||||
| -rw-r--r-- | keyboards/adafruit/macropad/readme.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h index 568020eec8..99f4477990 100644 --- a/keyboards/adafruit/macropad/config.h +++ b/keyboards/adafruit/macropad/config.h @@ -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 diff --git a/keyboards/adafruit/macropad/readme.md b/keyboards/adafruit/macropad/readme.md index 09c8657902..019883f953 100644 --- a/keyboards/adafruit/macropad/readme.md +++ b/keyboards/adafruit/macropad/readme.md @@ -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. |