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

keyboards/ai/readme.md

@@ -31,4 +31,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
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/aidansmithdotdev/fine40/readme.md

@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/at_at/660m/config.h

@@ -17,7 +17,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* LSE clock */

keyboards/boardrun/bizarre/readme.md

@@ -18,6 +18,6 @@ Flashing example for this keyboard:
 
  make boardrun/bizarre:default:flash
 
-The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/boardrun/classic/readme.md

@@ -18,6 +18,6 @@ Flashing example for this keyboard:
 
  make boardrun/classic:default:flash
 
-The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/cannonkeys/malicious_ergo/readme.md

@@ -13,6 +13,6 @@ 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**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/cannonkeys/nearfield/readme.md

@@ -26,6 +26,6 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the top left 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/cannonkeys/satisfaction75/config.h

@@ -17,7 +17,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* LSE clock */

keyboards/capsunlocked/cu75/cu75.c

@@ -91,7 +91,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
  if (click_toggle && record->event.pressed){
  click(click_hz, click_time);
  }
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  } else {
  }

keyboards/carbo65/config.h

@@ -32,7 +32,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */

keyboards/emery65/config.h

@@ -32,7 +32,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */

keyboards/feker/ik75/readme.md

@@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/fjlabs/avalon/readme.md

@@ -16,4 +16,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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/foostan/cornelius/readme.md

@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
  make foostan/cornelius:default:flash
 
-The board reset into bootloader mode via either the reset button (on the back of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board reset into bootloader mode via either the reset button (on the back of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/hand88/config.h

@@ -32,7 +32,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */

keyboards/handwired/cyberstar/config.h

@@ -32,7 +32,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* RGB Light */

keyboards/handwired/dactyl/readme.md

@@ -21,7 +21,7 @@ To flash the firmware:
  - Load the .hex file into it.
 
  - Put the Teensy in firmware-loading mode:
- * If your current layout has a RESET key, press it.
+ * If your current layout has a `QK_BOOT` key, press it.
  * If you lack a RESET key, press the reset button on the Teensy board itself.
 
  - Click the button in the Teensy app to download the firmware.
@@ -35,5 +35,5 @@ To flash with ´teensy-loader-cli´:
  - If you like, you can do both at once: `make handwired/dactyl:<keymapname>:teensy`
 
  - Put the Teensy in firmware-loading mode:
- * If your current layout has a RESET key, press it.
+ * If your current layout has a `QK_BOOT` key, press it.
  * If you lack a RESET key, press the reset button on the Teensy board itself.

keyboards/idobao/id80/v1/readme.md

@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/idobao/id80/v2/readme.md

@@ -38,4 +38,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the 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 *(default is [Fn]+[Esc])*
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available *(default is [Fn]+[Esc])*

keyboards/jacky_studio/s7_elephant/readme.md

@@ -15,6 +15,6 @@ Make example for this keyboard (after setting up your build environment):
  make jacky_studio/s7_elephant/rev1:default # 2018 run
  make jacky_studio/s7_elephant/rev2:default # 2019 run
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/jacky_studio/s7_elephant/rev1/readme.md

@@ -12,6 +12,6 @@ Make example for this keyboard (after setting up your build environment):
 
  make s7_elephant/rev1:default
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/kegen/gboy/readme.md

@@ -25,4 +25,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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/lazydesigners/bolt/readme.md

@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
  make lazydesigners/bolt:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/cassette8/readme.md

@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
  make lazydesigners/cassette8:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/dimple/readme.md

@@ -21,6 +21,6 @@ Make example for this keyboard (after setting up your build environment):
  make lazydesigners/dimple/staggered/rev2:default
  make lazydesigners/dimple/ortho:default
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/dimpleplus/readme.md

@@ -14,6 +14,6 @@ Flashing example for this keyboard:
 
  make lazydesigners/dimpleplus:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/the40/readme.md

@@ -21,6 +21,6 @@ Flashing example for this keyboard:
 
  make lazydesigners/the40:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/the50/readme.md

@@ -12,6 +12,6 @@ Make example for this keyboard (after setting up your build environment):
 
  make lazydesigners/the50:default:dfu
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lazydesigners/the60/rev2/readme.md

@@ -16,6 +16,6 @@
 
   make lazydesigners/the60/rev2:default:flash
 
- **Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+ **Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
  See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c

@@ -6,7 +6,7 @@
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  } else {
  }

keyboards/lfkeyboards/lfk78/lfk78.c

@@ -127,7 +127,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
  clicking_notes(click_hz, click_time);
  }
 
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  }
 

keyboards/lfkeyboards/lfk87/lfk87.c

@@ -109,7 +109,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
  if (click_toggle && record->event.pressed){
  click(click_hz, click_time);
  }
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  } else {
  }

keyboards/lfkeyboards/mini1800/mini1800.c

@@ -115,7 +115,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
  if (click_toggle && record->event.pressed){
  click(click_hz, click_time);
  }
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  } else {
  }

keyboards/lfkeyboards/smk65/revb/revb.c

@@ -74,7 +74,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
  if (click_toggle && record->event.pressed){
  click(click_hz, click_time);
  }
- if (keycode == RESET) {
+ if (keycode == QK_BOOT) {
  reset_keyboard_kb();
  } else {
  }

keyboards/loki65/config.h

@@ -32,7 +32,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */

keyboards/mechlovin/zed65/readme.md

@@ -22,4 +22,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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/mechlovin/zed65/retro66/readme.md

@@ -24,4 +24,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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available