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

Fix waitskip behavior

This commit is contained in:
Lucian Copeland 2021-06-20 16:57:20 -04:00
parent cf9741bd3a
commit 2c30312dd4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -281,6 +281,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
result.exception_line = 0; result.exception_line = 0;
bool skip_repl; bool skip_repl;
bool skip_wait = false;
bool found_main = false; bool found_main = false;
uint8_t next_code_options = 0; uint8_t next_code_options = 0;
// Collects stickiness bits that apply in the current situation. // Collects stickiness bits that apply in the current situation.
@ -355,18 +356,23 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS; next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) { if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) {
skip_repl = true; skip_repl = true;
skip_wait = true;
//goto done; //goto done;
} }
} }
else { else {
next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR; next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR;
if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR) { if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR) {
// TODO: in what scenario is this acceptable
skip_repl = true; skip_repl = true;
skip_wait = true;
//goto done; //goto done;
} }
} }
if (result.return_code & PYEXEC_FORCED_EXIT) { if (result.return_code & PYEXEC_FORCED_EXIT) {
// TODO: what scenario does this describe?
skip_repl = reload_requested; skip_repl = reload_requested;
skip_wait = true;
//goto done; //goto done;
} }
@ -416,7 +422,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
bool fake_sleeping = false; bool fake_sleeping = false;
#endif #endif
// bool skip_repl = false; // bool skip_repl = false;
while (true) { while (!skip_wait) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
// If a reload was requested by the supervisor or autoreload, return // If a reload was requested by the supervisor or autoreload, return