default keymap, reset sorted out for now, added serial to makefile

This commit is contained in:
Jack Humbert 2016-07-06 22:48:19 -04:00
parent c88207884b
commit a4bf46f9b1
8 changed files with 241 additions and 59 deletions

View file

@ -23,26 +23,8 @@ void matrix_init_kb(void) {
matrix_init_user();
};
void promicro_bootloader_jmp(bool program) {
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
#endif
uint16_t *const bootKeyPtr = (uint16_t *)0x0800;
// Value used by Caterina bootloader use to determine whether to run the
// sketch or the bootloader programmer.
uint16_t bootKey = program ? 0x7777 : 0;
*bootKeyPtr = bootKey;
// setup watchdog timeout
wdt_enable(WDTO_60MS);
while(1) {} // wait for watchdog timer to trigger
void shutdown_user(void) {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
}