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

@ -89,7 +89,7 @@ bool process_record_quantum(keyrecord_t *record) {
shutdown_user();
#endif
wait_ms(250);
#ifdef ATREUS_ASTAR
#ifdef CATERINA_BOOTLOADER
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
#endif
bootloader_jump();