Merge remote-tracking branch 'adafruit/main' into synthio_fixedpoint_fix

Author: gamblor21

.gitmodules

@@ -173,7 +173,7 @@
 [submodule "ports/raspberrypi/sdk"]
 	path = ports/raspberrypi/sdk
 	url = https://github.com/adafruit/pico-sdk.git
-	branch = force_inline_critical_section
+	branch = force_inline_critical_section_2.1.1
 [submodule "data/nvm.toml"]
 	path = data/nvm.toml
 	url = https://github.com/adafruit/nvm.toml.git

extmod/vfs_fat.c

@@ -38,6 +38,7 @@
 
 // CIRCUITPY-CHANGE: extra includes
 #include <string.h>
+#include "py/gc.h"
 #include "py/obj.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
@@ -342,7 +343,10 @@ static mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
         FRESULT res = f_stat(&self->fatfs, path, &fno);
         if (res != FR_OK) {
             // CIRCUITPY-CHANGE
-            mp_raise_OSError_fresult(res);
+            if (gc_alloc_possible()) {
+                mp_raise_OSError_fresult(res);
+            }
+            return mp_const_none;
         }
     }
 

locale/sv.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-04-21 18:19+0000\n"
+"PO-Revision-Date: 2025-04-23 08:01+0000\n"
 "Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -2642,7 +2642,7 @@ msgstr "bits måste vara 32 eller färre"
 #: shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiodelays/Reverb.c
 msgid "bits_per_sample must be 16"
-msgstr ""
+msgstr "bits_per_sample måste vara 16"
 
 #: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
@@ -4071,7 +4071,7 @@ msgstr "rsplit(None,n)"
 
 #: shared-bindings/audiodelays/Reverb.c
 msgid "samples_signed must be true"
-msgstr ""
+msgstr "samples_signed måste vara sann"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
@@ -4080,7 +4080,7 @@ msgstr "samplingsfrekvens utanför räckvidden"
 
 #: py/modmicropython.c
 msgid "schedule queue full"
-msgstr "schemakön full"
+msgstr "schemakö full"
 
 #: py/builtinimport.c
 msgid "script compilation not supported"

main.c

@@ -457,14 +457,19 @@ static bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *s
         usb_setup_with_vm();
         #endif
 
+        // Always return to root before trying to run files.
+        common_hal_os_chdir("/");
         // Check if a different run file has been allocated
         if (next_code_configuration != NULL) {
             next_code_configuration->options &= ~SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
             next_code_options = next_code_configuration->options;
             if (next_code_configuration->filename[0] != '\0') {
+                if (next_code_configuration->working_directory != NULL) {
+                    common_hal_os_chdir(next_code_configuration->working_directory);
+                }
                 // This is where the user's python code is actually executed:
                 const char *const filenames[] = { next_code_configuration->filename };
-                found_main = maybe_run_list(filenames, MP_ARRAY_SIZE(filenames));
+                found_main = maybe_run_list(filenames, 1);
                 if (!found_main) {
                     serial_write(next_code_configuration->filename);
                     serial_write_compressed(MP_ERROR_TEXT(" not found.\n"));
@@ -1105,9 +1110,6 @@ int __attribute__((used)) main(void) {
             }
             simulate_reset = false;
 
-            // Always return to root before trying to run files.
-            common_hal_os_chdir("/");
-
             if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
                 // If code.py did a fake deep sleep, pretend that we
                 // are running code.py for the first time after a hard

ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk

@@ -10,4 +10,5 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_JPEGIO = 0

ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk

@@ -10,6 +10,7 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, S25FL064L"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_PS2IO = 1
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0

ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk

@@ -9,7 +9,9 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ, W25Q16JVxM"
 LONGINT_IMPL = MPZ
-CIRCUITPY_SYNTHIO = 0
+
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0
+CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_TILEPALETTEMAPPER = 0

ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk

@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_CODEOP = 0

ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk

@@ -14,9 +14,10 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_CANIO = 1
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_SYNTHIO = 0
 
 CIRCUITPY_LTO_PARTITION = one
 

ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk

@@ -10,9 +10,10 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_SYNTHIO = 0
-CIRCUITPY_JPEGIO = 0
-CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_TERMINALIO_VT100 = 0
 CIRCUITPY_TILEPALETTEMAPPER = 0