djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-03-19 21:37:09 +01:00
parent 90724dca43 22906ac95e
commit 0d8b2723c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/mimxrt10xx/common-hal/microcontroller/__init__.c
View File

@ -39,6 +39,8 @@
#include "supervisor/shared/safe_mode.h"
#include "supervisor/shared/translate.h"
#define DBL_TAP_REG SNVS->LPGPR[3]
void common_hal_mcu_delay_us(uint32_t delay) {
mp_hal_delay_us(delay);
}
@ -72,10 +74,10 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
}
// Pretend to be the first of the two reset presses needed to enter the
// bootloader. That way one reset will end in the bootloader.
SNVS->LPGPR[0] = DBL_TAP_MAGIC;
DBL_TAP_REG = DBL_TAP_MAGIC;
} else {
// Set up the default.
SNVS->LPGPR[0] = DBL_TAP_MAGIC_QUICK_BOOT;
DBL_TAP_REG = DBL_TAP_MAGIC_QUICK_BOOT;
}
if (runmode == RUNMODE_SAFE_MODE) {
safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);