gitbot
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from jackhumbert/master 

pulling in remote changes
pull/1115/head
Joshua Colbeck 2016-07-20 21:56:44 -05:00 committed by GitHub
parent 68ceffe53e 9ecf9073b9
commit 03840a8c4d
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
quantum/quantum.c
View File

@ -15,6 +15,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; 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 // Shift / paren setup
#ifndef LSPO_KEY #ifndef LSPO_KEY
@ -83,16 +96,7 @@ bool process_record_quantum(keyrecord_t *record) {
switch(keycode) { switch(keycode) {
case RESET: case RESET:
if (record->event.pressed) { if (record->event.pressed) {
clear_keyboard(); reset_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();
} }
return false; return false;
break; break;

2
quantum/quantum.h
View File

@ -77,6 +77,8 @@ bool process_action_kb(keyrecord_t *record);
bool process_record_kb(uint16_t keycode, keyrecord_t *record); bool process_record_kb(uint16_t keycode, keyrecord_t *record);
bool process_record_user(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 startup_user(void);
void shutdown_user(void); void shutdown_user(void);