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

Merge pull request #4708 from hierophect/supervisor-run-reason

Browse Source 
Remove overwrite of run_reason in main
This commit is contained in:
Lucian Copeland 2021-05-05 19:18:16 -04:00 committed by GitHub
commit 22feda1066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -334,17 +334,19 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
bool fake_sleeping = false;
while (true) {
RUN_BACKGROUND_TASKS;
// If a reload was requested by the supervisor or autoreload, return
if (reload_requested) {
#if CIRCUITPY_ALARM
if (fake_sleeping) {
board_init();
}
#endif
supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
reload_requested = false;
return true;
}
// If interrupted by keyboard, return
if (serial_connected() && serial_bytes_available()) {
#if CIRCUITPY_ALARM
if (fake_sleeping) {
@ -371,6 +373,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
}
#endif
// If messages haven't been printed yet, print them
if (!printed_press_any_key && serial_connected()) {
if (!serial_connected_at_start) {
print_code_py_status_message(safe_mode);
@ -597,6 +600,7 @@ int __attribute__((used)) main(void) {
for (;;) {
if (!skip_repl) {
exit_code = run_repl();
supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
}
if (exit_code == PYEXEC_FORCED_EXIT) {
if (!first_run) {

4
supervisor/shared/autoreload.c
View File

@ -30,6 +30,8 @@
#include "py/reload.h"
#include "supervisor/shared/tick.h"
#include "shared-bindings/supervisor/Runtime.h"
static volatile uint32_t autoreload_delay_ms = 0;
static bool autoreload_enabled = false;
static bool autoreload_suspended = false;
@ -44,6 +46,7 @@ inline void autoreload_tick() {
!autoreload_suspended && !reload_requested) {
mp_raise_reload_exception();
reload_requested = true;
supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
supervisor_disable_tick();
}
autoreload_delay_ms--;
@ -91,4 +94,5 @@ void autoreload_now() {
}
mp_raise_reload_exception();
reload_requested = true;
supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
}