Add a flag to skip waiting for safe mode

deshipu · deshipu · commit e4baefc59394 · 2021-08-31T09:53:30.000+02:00
Sometimes we don't want the delay in the device's startup.

I used a simple flag, but now it also occurs to me that we could
instead make the wait time a define, and set it to 0 to disable it.
diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 275c03e340c3853ab1c53fc15b6df07ceb672bdc
+Subproject commit d0f1c46d7f879cd60562ee69900d619499d4d206
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
@@ -66,6 +66,9 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         reset_reason != RESET_REASON_SOFTWARE) {
         return NO_SAFE_MODE;
     }
+    #ifdef CIRCUITPY_SKIP_SAFE_MODE_WAIT
+    return NO_SAFE_MODE;
+    #endif
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));
     // Wait for a while to allow for reset.
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ safe_mode_t wait_for_safe_mode_reset(void) {`
`66`	`66`	`reset_reason != RESET_REASON_SOFTWARE) {`
`67`	`67`	`return NO_SAFE_MODE;`
`68`	`68`	`}`
	`69`	`+ #ifdef CIRCUITPY_SKIP_SAFE_MODE_WAIT`
	`70`	`+ return NO_SAFE_MODE;`
	`71`	`+ #endif`
`69`	`72`	`port_set_saved_word(SAFE_MODE_DATA_GUARD \| (MANUAL_SAFE_MODE << 8));`
`70`	`73`	`// Wait for a while to allow for reset.`
`71`	`74`