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

Fix deep sleep masking, cleanup

This commit is contained in:
Lucian Copeland 2021-06-20 17:20:47 -04:00
parent 626e4e9748
commit 372ddfd562
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.c
View File

@ -352,28 +352,26 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
if (reload_requested) { if (reload_requested) {
next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD; next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
} }
else if (result.return_code == 0) { //TODO mask out PYEXEC_DEEP_SLEEP? else if (result.return_code == 0) {
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; skip_wait = true;
//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) { // Deep sleep cannot be skipped
// TODO: in what scenario is this acceptable // TODO: settings in deep sleep should persist, using a new sleep memory API
if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR
&& !(result.return_code & PYEXEC_DEEP_SLEEP)) {
skip_repl = true; skip_repl = true;
skip_wait = true; skip_wait = true;
//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; skip_wait = true;
//goto done;
} }
if (reload_requested && result.return_code == PYEXEC_EXCEPTION) { if (reload_requested && result.return_code == PYEXEC_EXCEPTION) {
@ -421,7 +419,6 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
#if CIRCUITPY_ALARM #if CIRCUITPY_ALARM
bool fake_sleeping = false; bool fake_sleeping = false;
#endif #endif
// bool skip_repl = false;
while (!skip_wait) { while (!skip_wait) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;