Merge pull request adafruit#6778 from tannewt/fix_s2_bootloop

dhalbert · web-flow · commit 05d2013b4504 · 2022-08-18T07:18:57.000-04:00
Guard against workflow background happening early
diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c
@@ -78,7 +78,7 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {
 }
 
 bool websocket_connected(void) {
-    return !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
+    return _incoming_ringbuf.size > 0 && !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);
 }
 
 static bool _read_byte(uint8_t *c) {
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
@@ -48,6 +48,8 @@
 #endif
 static background_callback_t workflow_background_cb;
 
+static bool workflow_started = false;
+
 static void workflow_background(void *data) {
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_web_workflow_background();
@@ -70,6 +72,9 @@ void supervisor_workflow_reset(void) {
 }
 
 void supervisor_workflow_request_background(void) {
+    if (!workflow_started) {
+        return;
+    }
     background_callback_add_core(&workflow_background_cb);
 }
 
@@ -116,6 +121,8 @@ void supervisor_workflow_start(void) {
     #if CIRCUITPY_WEB_WORKFLOW
     supervisor_start_web_workflow();
     #endif
+
+    workflow_started = true;
 }
 
 FRESULT supervisor_workflow_mkdir_parents(FATFS *fs, char *path) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void websocket_handoff(socketpool_socket_obj_t *socket) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`bool websocket_connected(void) {`
`81`		`- return !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);`
	`81`	`+ return _incoming_ringbuf.size > 0 && !cp_serial.closed && common_hal_socketpool_socket_get_connected(&cp_serial.socket);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`static bool _read_byte(uint8_t *c) {`