Merge remote-tracking branch 'origin/main'

weblate · weblate · commit 03335daf2902 · 2023-08-07T16:52:23.000+02:00
diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c
@@ -63,7 +63,7 @@ void common_hal_mcu_enable_interrupts(void) {
 }
 
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
-    if (runmode == RUNMODE_BOOTLOADER) {
+    if ((runmode == RUNMODE_BOOTLOADER) || (runmode == RUNMODE_UF2)) {
         if (!bootloader_available()) {
             mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present"));
         }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void common_hal_mcu_enable_interrupts(void) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {`
`66`		`- if (runmode == RUNMODE_BOOTLOADER) {`
	`66`	`+ if ((runmode == RUNMODE_BOOTLOADER) \|\| (runmode == RUNMODE_UF2)) {`
`67`	`67`	`if (!bootloader_available()) {`
`68`	`68`	`mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present"));`
`69`	`69`	`}`