summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-12-22 16:13:02 -0800
committerScott Shawcroft <scott@tannewt.org>2020-12-22 16:13:02 -0800
commit1fca297a2d2bfefb1cdef3ecbac05f54d15e08eb (patch)
treee9273efad20b60e5a7e2864ffc3f0fd53ed531c9 /main.c
parentd4e9eea397c887d9eceb5f4c6aba117a4dc3d03b (diff)
A couple sleep fixes
* Better messaging when code is stopped by an auto-reload. * Auto-reload works during sleeps on ESP32-S2. Ticks wake up the main task each time. * Made internal naming consistent. CamelCase Python names are NOT separated by an underscore.
Diffstat (limited to 'main.c')
-rwxr-xr-xmain.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/main.c b/main.c
index 27ed6ff11..9c4055a28 100755
--- a/main.c
+++ b/main.c
@@ -308,8 +308,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
return reload_requested;
}
- // Display a different completion message if the user has no USB attached (cannot save files)
- serial_write_compressed(translate("\nCode done running. Waiting for reload.\n"));
+ if (reload_requested && result.return_code == PYEXEC_EXCEPTION) {
+ serial_write_compressed(translate("\nCode stopped by auto-reload.\n"));
+ } else {
+ serial_write_compressed(translate("\nCode done running.\n"));
+ }
}
// Program has finished running.
@@ -407,7 +410,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
alarm_enter_deep_sleep();
// Does not return.
} else {
- serial_write_compressed(translate("Pretending to deep sleep until alarm, any key or file write.\n"));
+ serial_write_compressed(translate("Pretending to deep sleep until alarm, CTRL-C or file write.\n"));
}
}
}