diff options
| author | Joshua Colbeck <Skrymir@users.noreply.github.com> | 2016-07-20 21:56:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 21:56:44 -0500 |
| commit | 03840a8c4d6b8083b8e4e23ae083608769406735 (patch) | |
| tree | f1554c3234079e1bc17f57b0769774c1e82ce878 | |
| parent | 68ceffe53e299fb504bdd4733b1555a8558b472b (diff) | |
| parent | 9ecf9073b96799e52a1f1c0d35b57177382902ce (diff) | |
| download | qmk_firmware-03840a8c4d6b8083b8e4e23ae083608769406735.tar.gz qmk_firmware-03840a8c4d6b8083b8e4e23ae083608769406735.zip | |
Merge pull request #3 from jackhumbert/master
pulling in remote changes
| -rw-r--r-- | quantum/quantum.c | 24 | ||||
| -rw-r--r-- | quantum/quantum.h | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index d5b9753b76..bc2da510f2 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -15,6 +15,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } +void reset_keyboard(void) { + clear_keyboard(); +#ifdef AUDIO_ENABLE + stop_all_notes(); + shutdown_user(); +#endif + wait_ms(250); +#ifdef CATERINA_BOOTLOADER + *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific +#endif + bootloader_jump(); +} + // Shift / paren setup #ifndef LSPO_KEY @@ -83,16 +96,7 @@ bool process_record_quantum(keyrecord_t *record) { switch(keycode) { case RESET: if (record->event.pressed) { - clear_keyboard(); - #ifdef AUDIO_ENABLE - stop_all_notes(); - shutdown_user(); - #endif - wait_ms(250); - #ifdef CATERINA_BOOTLOADER - *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific - #endif - bootloader_jump(); + reset_keyboard(); } return false; break; diff --git a/quantum/quantum.h b/quantum/quantum.h index 3a0b742028..7ebfb24e30 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -77,6 +77,8 @@ bool process_action_kb(keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_user(uint16_t keycode, keyrecord_t *record); +void reset_keyboard(void); + void startup_user(void); void shutdown_user(void); |