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

samd/main: Use the common execution mode of boot.py and main.py.

Browse Source 
Behaviour is:
- Do not execute main.py if boot.py failed.
- On a forced exit, do a soft reset.
This commit is contained in:
robert-hh 2022-06-05 21:55:30 +02:00 committed by Damien George
parent 45bf25a002
commit 4ef2da176f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/samd/main.c
View File

@ -51,8 +51,17 @@ void samd_main(void) {
pyexec_frozen_module("_boot.py");
// Execute user scripts.
pyexec_file_if_exists("boot.py");
pyexec_file_if_exists("main.py");
int ret = pyexec_file_if_exists("boot.py");
if (ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
}
// Do not execute main.py if boot.py failed
if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
ret = pyexec_file_if_exists("main.py");
if (ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
}
}
for (;;) {
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
@ -66,6 +75,7 @@ void samd_main(void) {
}
}
soft_reset_exit:
mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
adc_deinit_all();
pin_irq_deinit_all();