diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-04-05 10:39:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 10:39:51 -0700 |
| commit | 8f3bf5faf630918d1c42b76c8a10c450724e3370 (patch) | |
| tree | 63b37c4bf57ea264fa44e15b287aa920c4ae2f82 | |
| parent | 59394972181688c95b3d0c55654fa095b458ed10 (diff) | |
| parent | 92853e611db7e60073631b8f117ccec32106fa6a (diff) | |
Merge pull request #741 from jepler/samd-reset-modes
Samd reset modes
| -rw-r--r-- | ports/atmel-samd/common-hal/microcontroller/__init__.c | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/reset.h | 1 | ||||
| -rw-r--r-- | shared-bindings/microcontroller/RunMode.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c index 614fac870..5839ed513 100644 --- a/ports/atmel-samd/common-hal/microcontroller/__init__.c +++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c @@ -55,7 +55,7 @@ extern uint32_t _ezero; void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { // Set up the defaults. - _bootloader_dbl_tap = DBL_TAP_MAGIC; + _bootloader_dbl_tap = DBL_TAP_MAGIC_QUICK_BOOT; _ezero = CIRCUITPY_CANARY_WORD; if (runmode == RUNMODE_BOOTLOADER) { diff --git a/ports/atmel-samd/reset.h b/ports/atmel-samd/reset.h index ea955c655..b589d2611 100644 --- a/ports/atmel-samd/reset.h +++ b/ports/atmel-samd/reset.h @@ -31,6 +31,7 @@ // Copied from inc/uf2.h in https://github.com/Microsoft/uf2-samd21 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set +#define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef extern uint32_t _bootloader_dbl_tap; diff --git a/shared-bindings/microcontroller/RunMode.c b/shared-bindings/microcontroller/RunMode.c index b27a3c090..7c3f84fca 100644 --- a/shared-bindings/microcontroller/RunMode.c +++ b/shared-bindings/microcontroller/RunMode.c @@ -76,7 +76,7 @@ STATIC void mcu_runmode_print(const mp_print_t *print, mp_obj_t self_in, mp_prin runmode = MP_QSTR_SAFE_MODE; } else if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&mcu_runmode_bootloader_obj)) { - runmode = MP_QSTR_SAFE_MODE; + runmode = MP_QSTR_BOOTLOADER; } mp_printf(print, "%q.%q.%q", MP_QSTR_microcontroller, MP_QSTR_RunMode, runmode); |