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 2023-02-15 22:55:48 +01:00
commit 599ecbef05
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -925,6 +925,9 @@ int __attribute__((used)) main(void) {
common_hal_nvm_bytearray_set_bytes(&common_hal_mcu_nvm_obj,0,&value_out,1); common_hal_nvm_bytearray_set_bytes(&common_hal_mcu_nvm_obj,0,&value_out,1);
#endif #endif
// Start the debug serial
serial_early_init();
// Wait briefly to give a reset window where we'll enter safe mode after the reset. // Wait briefly to give a reset window where we'll enter safe mode after the reset.
if (safe_mode == NO_SAFE_MODE) { if (safe_mode == NO_SAFE_MODE) {
safe_mode = wait_for_safe_mode_reset(); safe_mode = wait_for_safe_mode_reset();
@ -941,9 +944,6 @@ int __attribute__((used)) main(void) {
supervisor_bluetooth_init(); supervisor_bluetooth_init();
#endif #endif
// Start the debug serial
serial_early_init();
#if !INTERNAL_FLASH_FILESYSTEM #if !INTERNAL_FLASH_FILESYSTEM
// Set up anything that might need to get done before we try to use SPI flash // Set up anything that might need to get done before we try to use SPI flash
// This is needed for some boards where flash relies on GPIO setup to work // This is needed for some boards where flash relies on GPIO setup to work