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 <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\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

ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk

@@ -10,6 +10,7 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0
 CIRCUITPY_SYNTHIO = 0

ports/atmel-samd/mpconfigport.h

@@ -51,6 +51,8 @@
 // See https://github.com/micropython/micropython/pull/11353
 #define MICROPY_NLR_THUMB_USE_LONG_JUMP (1)
 
+// Don't store qstr hashes and do string compares instead.
+#define MICROPY_QSTR_BYTES_IN_HASH       (0)
 
 #endif // SAMD21
 

ports/espressif/Makefile

@@ -360,10 +360,19 @@ CFLAGS += \
 	-DCFG_TUD_TASK_QUEUE_SZ=32
 endif
 ifeq ($(CIRCUITPY_USB_DEVICE),1)
+ifeq ($(IDF_TARGET),esp32s2)
+# Make more room in internal RAM on the S2.
+CFLAGS += \
+	-DCFG_TUD_CDC_RX_BUFSIZE=128 \
+	-DCFG_TUD_CDC_TX_BUFSIZE=128 \
+	-DCFG_TUD_MSC_BUFSIZE=1024
+else
 CFLAGS += \
 	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
-	-DCFG_TUD_MSC_BUFSIZE=4096 \
+	-DCFG_TUD_MSC_BUFSIZE=4096
+endif
+CFLAGS += \
 	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
 	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
 	-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \

ports/espressif/common-hal/wifi/Radio.c

@@ -139,23 +139,44 @@ void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t
     esp_wifi_set_max_tx_power(tx_power * 4.0f);
 }
 
-mp_int_t common_hal_wifi_radio_get_listen_interval(wifi_radio_obj_t *self) {
-    wifi_config_t *config = &self->sta_config;
-    return config->sta.listen_interval;
+wifi_power_management_t common_hal_wifi_radio_get_power_management(wifi_radio_obj_t *self) {
+    wifi_ps_type_t ps;
+    esp_err_t ret = esp_wifi_get_ps(&ps);
+    if (ret == ESP_OK) {
+        switch (ps) {
+            case WIFI_PS_MIN_MODEM:
+                return POWER_MANAGEMENT_MIN;
+            case WIFI_PS_MAX_MODEM:
+                return POWER_MANAGEMENT_MAX;
+            case WIFI_PS_NONE:
+                return POWER_MANAGEMENT_NONE;
+        }
+    }
+    return POWER_MANAGEMENT_MIN;
 }
 
-void common_hal_wifi_radio_set_listen_interval(wifi_radio_obj_t *self, const mp_int_t listen_interval) {
-    wifi_config_t *config = &self->sta_config;
-    config->sta.listen_interval = listen_interval;
-    if (listen_interval == 1) {
-        esp_wifi_set_ps(WIFI_PS_MIN_MODEM);
-    } else if (listen_interval > 1) {
-        esp_wifi_set_ps(WIFI_PS_MAX_MODEM);
-    } else {
-        esp_wifi_set_ps(WIFI_PS_NONE);
-    }
 
-    esp_wifi_set_config(ESP_IF_WIFI_STA, config);
+void common_hal_wifi_radio_set_power_management(wifi_radio_obj_t *self, wifi_power_management_t power_management) {
+    switch (power_management) {
+        case POWER_MANAGEMENT_MIN:
+            esp_wifi_set_ps(WIFI_PS_MIN_MODEM);
+            break;
+        case POWER_MANAGEMENT_MAX: {
+            // listen_interval is only used in this case.
+            wifi_config_t *config = &self->sta_config;
+            // This is a typical value seen in various examples.
+            config->sta.listen_interval = 3;
+            esp_wifi_set_ps(WIFI_PS_MAX_MODEM);
+            esp_wifi_set_config(ESP_IF_WIFI_STA, config);
+        }
+        break;
+        case POWER_MANAGEMENT_NONE:
+            esp_wifi_set_ps(WIFI_PS_NONE);
+            break;
+        case POWER_MANAGEMENT_UNKNOWN:
+            // This should be prevented in shared-bindings.
+            break;
+    }
 }
 
 mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {

ports/espressif/mpconfigport.mk

@@ -40,9 +40,6 @@ CIRCUITPY_FULL_BUILD ?= 1
 # If SSL is enabled, it's mbedtls
 CIRCUITPY_SSL_MBEDTLS = 1
 
-# Wifi Power Save
-CIRCUITPY_WIFI_RADIO_SETTABLE_LISTEN_INTERVAL = 1
-
 # Never use our copy of MBEDTLS
 CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
 

ports/raspberrypi/audio_dma.c

@@ -159,9 +159,13 @@ static void audio_dma_load_next_block(audio_dma_t *dma, size_t buffer_idx) {
                 !dma_channel_is_busy(dma->channel[1])) {
                 // No data has been read, and both DMA channels have now finished, so it's safe to stop.
                 audio_dma_stop(dma);
+                dma->dma_result = AUDIO_DMA_OK;
+                return;
             }
         }
     }
+    // Enable the channel so that it can be played.
+    dma_hw->ch[dma_channel].al1_ctrl |= DMA_CH1_CTRL_TRIG_EN_BITS;
     dma->dma_result = AUDIO_DMA_OK;
 }
 
@@ -227,15 +231,31 @@ audio_dma_result audio_dma_setup_playback(
         max_buffer_length /= dma->sample_spacing;
     }
 
+    #ifdef PICO_RP2350
     dma->buffer[0] = (uint8_t *)port_realloc(dma->buffer[0], max_buffer_length, true);
+    #else
+    dma->buffer[0] = (uint8_t *)m_realloc(dma->buffer[0],
+        #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+        dma->buffer_length[0], // Old size
+        #endif
+        max_buffer_length);
+    #endif
     dma->buffer_length[0] = max_buffer_length;
 
     if (dma->buffer[0] == NULL) {
         return AUDIO_DMA_MEMORY_ERROR;
     }
 
     if (!single_buffer) {
+        #ifdef PICO_RP2350
         dma->buffer[1] = (uint8_t *)port_realloc(dma->buffer[1], max_buffer_length, true);
+        #else
+        dma->buffer[1] = (uint8_t *)m_realloc(dma->buffer[1],
+            #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+            dma->buffer_length[1], // Old size
+            #endif
+            max_buffer_length);
+        #endif
         dma->buffer_length[1] = max_buffer_length;
 
         if (dma->buffer[1] == NULL) {
@@ -429,11 +449,27 @@ void audio_dma_init(audio_dma_t *dma) {
 }
 
 void audio_dma_deinit(audio_dma_t *dma) {
+    #ifdef PICO_RP2350
     port_free(dma->buffer[0]);
+    #else
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+    m_free(dma->buffer[0], dma->buffer_length[0]);
+    #else
+    m_free(dma->buffer[0]);
+    #endif
+    #endif
     dma->buffer[0] = NULL;
     dma->buffer_length[0] = 0;
 
+    #ifdef PICO_RP2350
     port_free(dma->buffer[1]);
+    #else
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+    m_free(dma->buffer[1], dma->buffer_length[1]);
+    #else
+    m_free(dma->buffer[1]);
+    #endif
+    #endif
     dma->buffer[1] = NULL;
     dma->buffer_length[1] = 0;
 }
@@ -462,18 +498,26 @@ static void dma_callback_fun(void *arg) {
 
     // Load the blocks for the requested channels.
     uint32_t channel = 0;
+    size_t filled_count = 0;
     while (channels_to_load_mask) {
         if (channels_to_load_mask & 1) {
             if (dma->channel[0] == channel) {
                 audio_dma_load_next_block(dma, 0);
+                filled_count++;
             }
             if (dma->channel[1] == channel) {
                 audio_dma_load_next_block(dma, 1);
+                filled_count++;
             }
         }
         channels_to_load_mask >>= 1;
         channel++;
     }
+    // If we had to fill both buffers, then we missed the trigger from the other
+    // buffer. So restart the DMA.
+    if (filled_count == 2) {
+        dma_channel_start(dma->channel[0]);
+    }
 }
 
 void __not_in_flash_func(isr_dma_0)(void) {
@@ -491,6 +535,8 @@ void __not_in_flash_func(isr_dma_0)(void) {
             audio_dma_t *dma = MP_STATE_PORT(playing_audio)[i];
             // Record all channels whose DMA has completed; they need loading.
             dma->channels_to_load_mask |= mask;
+            // Disable the channel so that we don't play it without filling it.
+            dma_hw->ch[i].al1_ctrl &= ~DMA_CH0_CTRL_TRIG_EN_BITS;
             background_callback_add(&dma->callback, dma_callback_fun, (void *)dma);
         }
         if (MP_STATE_PORT(background_pio_read)[i] != NULL) {

ports/raspberrypi/audio_dma.h

@@ -20,7 +20,7 @@ typedef enum {
 
 typedef struct {
     mp_obj_t sample;
-    uint8_t *buffer[2]; // Allocated through port_malloc so they are dma-able
+    uint8_t *buffer[2]; // Allocated through port_malloc on RP2350 so they are dma-able
     size_t buffer_length[2];
     uint32_t channels_to_load_mask;
     uint32_t output_register_address;