djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6778 from tannewt/fix_s2_bootloop

Browse Source 
Guard against workflow background happening early
This commit is contained in:
Dan Halbert 2022-08-18 07:18:57 -04:00 committed by GitHub
commit 05d2013b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
supervisor/shared/web_workflow/websocket.c
View File

@ -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) {

7
supervisor/shared/workflow.c
View File

@ -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) {