Merge pull request #5880 from jepler/espressif-serial-trick-uf2

microdev1 · web-flow · commit dab35f7c72c2 · 2022-01-21T09:56:12.000+05:30
Request ROM bootloader when resetting using the 'serial trick'
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
@@ -51,6 +51,8 @@
 #include "supervisor/background_callback.h"
 #include "supervisor/memory.h"
 #include "supervisor/shared/tick.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/RunMode.h"
 #include "shared-bindings/rtc/__init__.h"
 
 #include "peripherals/rmt.h"
@@ -287,6 +289,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+    common_hal_mcu_on_next_reset(RUNMODE_BOOTLOADER);
     esp_restart();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@`
`51`	`51`	`#include "supervisor/background_callback.h"`
`52`	`52`	`#include "supervisor/memory.h"`
`53`	`53`	`#include "supervisor/shared/tick.h"`
	`54`	`+#include "shared-bindings/microcontroller/__init__.h"`
	`55`	`+#include "shared-bindings/microcontroller/RunMode.h"`
`54`	`56`	`#include "shared-bindings/rtc/__init__.h"`
`55`	`57`
`56`	`58`	`#include "peripherals/rmt.h"`
`@@ -287,6 +289,7 @@ void reset_port(void) {`
`287`	`289`	`}`
`288`	`290`
`289`	`291`	`void reset_to_bootloader(void) {`
	`292`	`+ common_hal_mcu_on_next_reset(RUNMODE_BOOTLOADER);`
`290`	`293`	`esp_restart();`
`291`	`294`	`}`
`292`	`295`