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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Hosted Weblate 2021-11-09 22:29:45 +01:00
commit a9ba611ae2
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
2 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.c Executable file → Normal file
View File

@ -254,8 +254,7 @@ STATIC void cleanup_after_vm(supervisor_allocation* heap, mp_obj_t exception) {
mp_obj_print_exception(&print, exception); mp_obj_print_exception(&print, exception);
((char *)prev_traceback_allocation->ptr)[traceback_len] = '\0'; ((char *)prev_traceback_allocation->ptr)[traceback_len] = '\0';
} }
} } else {
else {
prev_traceback_allocation = NULL; prev_traceback_allocation = NULL;
} }
} }
@ -645,10 +644,6 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
&& safe_mode == NO_SAFE_MODE && safe_mode == NO_SAFE_MODE
&& MP_STATE_VM(vfs_mount_table) != NULL; && MP_STATE_VM(vfs_mount_table) != NULL;
if (!ok_to_run) {
return;
}
static const char *const boot_py_filenames[] = STRING_LIST("boot.py", "boot.txt"); static const char *const boot_py_filenames[] = STRING_LIST("boot.py", "boot.txt");
// Do USB setup even if boot.py is not run. // Do USB setup even if boot.py is not run.
@ -661,6 +656,9 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
usb_set_defaults(); usb_set_defaults();
#endif #endif
pyexec_result_t result = {0, MP_OBJ_NULL, 0};
if (ok_to_run) {
#ifdef CIRCUITPY_BOOT_OUTPUT_FILE #ifdef CIRCUITPY_BOOT_OUTPUT_FILE
vstr_t boot_text; vstr_t boot_text;
vstr_init(&boot_text, 512); vstr_init(&boot_text, 512);
@ -670,8 +668,6 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
// Write version info // Write version info
mp_printf(&mp_plat_print, "%s\nBoard ID:%s\n", MICROPY_FULL_VERSION_INFO, CIRCUITPY_BOARD_ID); mp_printf(&mp_plat_print, "%s\nBoard ID:%s\n", MICROPY_FULL_VERSION_INFO, CIRCUITPY_BOARD_ID);
pyexec_result_t result = {0, MP_OBJ_NULL, 0};
bool found_boot = maybe_run_list(boot_py_filenames, &result); bool found_boot = maybe_run_list(boot_py_filenames, &result);
(void)found_boot; (void)found_boot;
@ -709,6 +705,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
filesystem_flush(); filesystem_flush();
} }
#endif #endif
}
#if CIRCUITPY_USB #if CIRCUITPY_USB
// Some data needs to be carried over from the USB settings in boot.py // Some data needs to be carried over from the USB settings in boot.py
@ -914,12 +911,14 @@ void gc_collect(void) {
void NORETURN nlr_jump_fail(void *val) { void NORETURN nlr_jump_fail(void *val) {
reset_into_safe_mode(MICROPY_NLR_JUMP_FAIL); reset_into_safe_mode(MICROPY_NLR_JUMP_FAIL);
while (true) {} while (true) {
}
} }
void NORETURN __fatal_error(const char *msg) { void NORETURN __fatal_error(const char *msg) {
reset_into_safe_mode(MICROPY_FATAL_ERROR); reset_into_safe_mode(MICROPY_FATAL_ERROR);
while (true) {} while (true) {
}
} }
#ifndef NDEBUG #ifndef NDEBUG

1
tools/codeformat.py
View File

@ -38,6 +38,7 @@ import subprocess
# Relative to top-level repo dir. # Relative to top-level repo dir.
PATHS = [ PATHS = [
# C # C
"main.c",
"devices/**/*.[ch]", "devices/**/*.[ch]",
"drivers/bus/*.[ch]", "drivers/bus/*.[ch]",
"extmod/*.[ch]", "extmod/*.[ch]",