mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-22 19:40:29 +08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
fea65c9856
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -17,7 +17,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -17,7 +17,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -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 {
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
|
||||
/* THIS FILE WAS GENERATED!
|
||||
*
|
||||
* This file was generated by qmk json2c. You may or may not want to
|
||||
* edit it directly.
|
||||
*/
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
|
||||
[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
|
||||
[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
|
||||
};
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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).
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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])*
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -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).
|
|
@ -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 {
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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 {
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
|
|||
|
||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (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
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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
|
||||
|
||||
/* define if matrix has ghost (lacks anti-ghosting diodes) */
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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
|
||||
|
||||
/* define if matrix has ghost (lacks anti-ghosting diodes) */
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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
|
||||
|
||||
/* define if matrix has ghost (lacks anti-ghosting diodes) */
|
||||
|
|
|
@ -320,7 +320,7 @@ bool music_mask_kb(uint16_t keycode) {
|
|||
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
|
||||
case QK_MOD_TAP ... QK_MOD_TAP_MAX:
|
||||
case AU_ON ... MUV_DE:
|
||||
case RESET:
|
||||
case QK_BOOT:
|
||||
case EEP_RST:
|
||||
return false;
|
||||
default:
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -127,7 +127,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
|
||||
switch (keycode) {
|
||||
case RESET:
|
||||
case QK_BOOT:
|
||||
if (record->event.pressed) {
|
||||
set_bitc_LED(LED_DIM);
|
||||
rgblight_disable_noeeprom();
|
||||
|
|
|
@ -322,7 +322,7 @@ bool music_mask_kb(uint16_t keycode) {
|
|||
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
|
||||
case QK_MOD_TAP ... QK_MOD_TAP_MAX:
|
||||
case AU_ON ... MUV_DE:
|
||||
case RESET:
|
||||
case QK_BOOT:
|
||||
case EEP_RST:
|
||||
return false;
|
||||
default:
|
||||
|
|
|
@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
|
||||
),
|
||||
[1] = LAYOUT_all(
|
||||
RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
|
||||
QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
|
||||
KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
|
||||
KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
|
|
|
@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
|
||||
),
|
||||
[1] = LAYOUT_all(
|
||||
RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
|
||||
QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
|
||||
KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
|
||||
KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -288,7 +288,7 @@ lookup_table_t lookup_table[334] =
|
|||
{"KC_LT", KC_LT},
|
||||
{"KC_GT", KC_GT},
|
||||
{"KC_QUES", KC_QUES},
|
||||
{"RESET", RESET},
|
||||
{"RESET", QK_BOOT},
|
||||
{"DEBUG", DEBUG},
|
||||
{"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
|
||||
{"KC_GESC", KC_GESC},
|
||||
|
|
|
@ -25,6 +25,6 @@ qmk compile -kb soda/cherish -km via
|
|||
Enter the bootloader in 2 ways:
|
||||
|
||||
* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] 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).
|
||||
|
|
|
@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* 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 */
|
||||
|
@ -39,7 +39,7 @@ along with this program. If not, see <http://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
|
||||
|
||||
/* Setting up 400KHz I2C Clock for a 48MHz system clock */
|
||||
|
|
|
@ -182,7 +182,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
|
||||
switch (keycode) {
|
||||
case RESET:
|
||||
case QK_BOOT:
|
||||
if (record->event.pressed) {
|
||||
system76_ec_unlock();
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ along with this program. If not, see <http://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 */
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* 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
|
||||
|
||||
/* key matrix size */
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* 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
|
||||
|
||||
/* key matrix size */
|
||||
|
|
|
@ -79,7 +79,7 @@ void matrix_scan_kb(void)
|
|||
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
||||
// Test code that turns on the switch led for the key that is pressed
|
||||
// set_backlight_by_keymap(record->event.key.col, record->event.key.row);
|
||||
if (keycode == RESET) {
|
||||
if (keycode == QK_BOOT) {
|
||||
reset_keyboard_kb();
|
||||
} else {
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue