atmel-samd: reset: reset() was always entering bootloader mode

jepler · jepler · commit fe6f5aaa70a0 · 2018-04-05T08:16:53.000-05:00
.. set the dbl_tap word to a different special value unless
RUNMODE_BOOTLOADER was selected
diff --git 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
@@ -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;
 
