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

Merge branch 'master' of github.com:adafruit/circuitpython

Browse Source
This commit is contained in:
Radomir Dopieralski 2019-03-17 14:20:25 +01:00
commit d81db3bced
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -97,4 +97,4 @@
url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git
[submodule "frozen/circuitpython-stage"] [submodule "frozen/circuitpython-stage"]
path = frozen/circuitpython-stage path = frozen/circuitpython-stage
url = https://github.com/python-ugame/circuitpython-stage url = https://github.com/python-ugame/circuitpython-stage.git

4
main.c
View File

@ -213,10 +213,11 @@ bool run_code_py(safe_mode_t safe_mode) {
serial_write_compressed(translate("WARNING: Your code filename has two extensions\n")); serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
} }
} }
// Turn off the display before the heap disappears. // Turn off the display and flush the fileystem before the heap disappears.
#if CIRCUITPY_DISPLAYIO #if CIRCUITPY_DISPLAYIO
reset_displays(); reset_displays();
#endif #endif
filesystem_flush();
stop_mp(); stop_mp();
free_memory(heap); free_memory(heap);
supervisor_move_memory(); supervisor_move_memory();
@ -375,6 +376,7 @@ int run_repl(void) {
} else { } else {
exit_code = pyexec_friendly_repl(); exit_code = pyexec_friendly_repl();
} }
filesystem_flush();
reset_port(); reset_port();
reset_board(); reset_board();
stop_mp(); stop_mp();

6
shared-module/displayio/__init__.c
View File

@ -29,10 +29,8 @@ void displayio_refresh_displays(void) {
if (mp_hal_is_interrupted()) { if (mp_hal_is_interrupted()) {
return; return;
} }
// Somehow reloads from the sdcard are being lost. So, cheat and reraise. if (reload_requested) {
// But don't re-raise if already pending. // Reload is about to happen, so don't redisplay.
if (reload_requested && MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
mp_raise_reload_exception();
return; return;
} }