qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-30 05:50:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2026-03-28 02:31:45 +00:00
parent c14d93dc40 3d0ccbb1d5
commit 1299040d6a
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/chibios/bootloaders/kiibohd.c
+18 -1
View File
@@ -30,4 +30,21 @@ __attribute__((weak)) void bootloader_jump(void) {
// request reset
SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
}
__attribute__((weak)) void mcu_reset(void) {}
__attribute__((weak)) void mcu_reset(void) {
/* Ensure all outstanding memory operations complete */
__DSB();
__ISB();
/* Request system reset (preserve PRIGROUP) */
uint32_t aircr = SCB->AIRCR;
aircr &= ~SCB_AIRCR_VECTKEY_Msk;
aircr |= SCB_AIRCR_VECTKEY_WRITEMAGIC;
aircr |= SCB_AIRCR_SYSRESETREQ_Msk;
SCB->AIRCR = aircr;
/* Wait for reset to occur */
while (true) {
__NOP();
}
}