Merge pull request #7468 from DavePutz/issue_6975

Fixes for microcontroller.on_next_reset() on NRF
This commit is contained in:
Dan Halbert 2023-01-19 19:03:46 -05:00 committed by GitHub
commit f826904995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -82,10 +82,10 @@ void common_hal_mcu_enable_interrupts() {
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
enum { DFU_MAGIC_UF2_RESET = 0x57 };
if (runmode == RUNMODE_BOOTLOADER) {
NRF_POWER->GPREGRET = DFU_MAGIC_UF2_RESET;
if (runmode == RUNMODE_BOOTLOADER || runmode == RUNMODE_UF2) {
sd_power_gpregret_set(0,DFU_MAGIC_UF2_RESET);
} else {
NRF_POWER->GPREGRET = 0;
sd_power_gpregret_set(0,0);
}
if (runmode == RUNMODE_SAFE_MODE) {
safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);