steven-y-e
/
qmk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use built-in function to do bootloader reset

anne_pro
Michiel Visser 2019-06-24 23:24:24 +02:00
parent 0a035bab1a
commit 7a3d43acf1
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
keyboards/anne_pro/anne_pro.c
View File

@ -64,14 +64,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
uartStartSend(&UARTD3, 6, "\x09\x04\x05\x01\x00\x00"); uartStartSend(&UARTD3, 6, "\x09\x04\x05\x01\x00\x00");
} }
return false; return false;
case AP_RST:
/* Reset the keyboard, enter DFU when ESC is pressed */
__disable_irq();
SCB->VTOR = 0x08000000;
NVIC_SystemReset();
/* This should not be reached */
while(1);
return false;
default: default:
/* Handle other keycodes normally */ /* Handle other keycodes normally */
return true; return true;
@ -97,3 +89,13 @@ void keyboard_post_init_kb(void) {
matrix_init_user(); matrix_init_user();
} }
/* Instead of doing some magic to get to the bootloader, just press ESC and reset */
void bootloader_jump(void) {
/* Disable interrupts as changing the vector table can mess them up */
__disable_irq();
/* Move the vector table back to the bootloader */
SCB->VTOR = 0x08000000;
/* Reset the system into the bootloader */
NVIC_SystemReset();
}

3
keyboards/anne_pro/anne_pro.h
View File

@ -22,8 +22,7 @@ enum anne_pro_keycodes {
APL_RGB = SAFE_RANGE, APL_RGB = SAFE_RANGE,
APL_RAT, APL_RAT,
APL_BRT, APL_BRT,
APL_MOD, APL_MOD
AP_RST
}; };
/* The fully-featured LAYOUT() that has every single key available in the matrix. */ /* The fully-featured LAYOUT() that has every single key available in the matrix. */

2
keyboards/anne_pro/keymaps/default/keymap.c
View File

@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, XXXXXXX, _______, _______, _______, _______ _______, _______, _______, XXXXXXX, _______, _______, _______, _______
), ),
[2] = LAYOUT( [2] = LAYOUT(
AP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,