Merge pull request adafruit#9786 from bill88t/main

jepler · web-flow · commit db84e815787e · 2024-11-04T15:16:00.000-06:00
diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c
@@ -264,6 +264,7 @@ void common_hal_storage_erase_filesystem(bool extended) {
     supervisor_flash_set_extended(extended);
     #endif
     (void)filesystem_init(false, true);  // Force a re-format. Ignore failure.
+    common_hal_mcu_on_next_reset(RUNMODE_NORMAL);
     common_hal_mcu_reset();
     // We won't actually get here, since we're resetting.
 }

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,7 @@ void common_hal_storage_erase_filesystem(bool extended) {`
`264`	`264`	`supervisor_flash_set_extended(extended);`
`265`	`265`	`#endif`
`266`	`266`	`(void)filesystem_init(false, true); // Force a re-format. Ignore failure.`
	`267`	`+ common_hal_mcu_on_next_reset(RUNMODE_NORMAL);`
`267`	`268`	`common_hal_mcu_reset();`
`268`	`269`	`// We won't actually get here, since we're resetting.`
`269`	`270`	`}`