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

Author: tannewt

locale/en_GB.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2025-04-19 15:42+0000\n"
+"PO-Revision-Date: 2025-04-25 15:04+0000\n"
 "Last-Translator: Andi Chandler <[email protected]>\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.11.1-dev\n"
+"X-Generator: Weblate 5.12-dev\n"
 
 #: main.c
 msgid ""
@@ -117,7 +117,7 @@ msgstr "%q failure: %d"
 
 #: shared-module/audiodelays/MultiTapDelay.c
 msgid "%q in %q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q in %q must be of type %q or %q, not %q"
 
 #: py/argcheck.c shared-module/audiofilters/Filter.c
 msgid "%q in %q must be of type %q, not %q"
@@ -2630,7 +2630,7 @@ msgstr "bits must be 32 or less"
 #: shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiodelays/Reverb.c
 msgid "bits_per_sample must be 16"
-msgstr ""
+msgstr "bits_per_sample must be 16"
 
 #: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
@@ -4055,7 +4055,7 @@ msgstr "rsplit(None,n)"
 
 #: shared-bindings/audiodelays/Reverb.c
 msgid "samples_signed must be true"
-msgstr ""
+msgstr "samples_signed must be true"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c

locale/zh_Latn_pinyin.po

@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-04-10 22:01+0000\n"
+"PO-Revision-Date: 2025-04-25 15:04+0000\n"
 "Last-Translator: hexthat <[email protected]>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 5.12-dev\n"
 
 #: main.c
 msgid ""
@@ -118,7 +118,7 @@ msgstr "%q Shībài: %d"
 
 #: shared-module/audiodelays/MultiTapDelay.c
 msgid "%q in %q must be of type %q or %q, not %q"
-msgstr ""
+msgstr "%q zhōngde %q bìxū shì %q huò %q lèixíng, érbùshì %q"
 
 #: py/argcheck.c shared-module/audiofilters/Filter.c
 msgid "%q in %q must be of type %q, not %q"
@@ -2648,7 +2648,7 @@ msgstr "wèi bì xū shì 32 huò gèng shǎo"
 #: shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiodelays/Reverb.c
 msgid "bits_per_sample must be 16"
-msgstr ""
+msgstr "bits_per_sample bìxū wèi 16"
 
 #: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
@@ -4077,7 +4077,7 @@ msgstr "Rchāifēn(wú,N)"
 
 #: shared-bindings/audiodelays/Reverb.c
 msgid "samples_signed must be true"
-msgstr ""
+msgstr "samples_signed bìxū wéi zhēn"
 
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 #: ports/raspberrypi/common-hal/audiobusio/PDMIn.c

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

@@ -11,6 +11,12 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_AESIO = 0
-CIRCUITPY_JPEGIO = 0
-CIRCUITPY_SYNTHIO = 0
-CIRCUITPY_TILEPALETTEMAPPER = 0
+CIRCUITPY_CODEOP = 0
+CIRCUITPY_EPAPERDISPLAY = 0
+CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_I2CDISPLAYBUS = 0
+CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_SHARPDISPLAY = 0
+CIRCUITPY_SPITARGET = 0

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

@@ -9,6 +9,8 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_I2CTARGET = 0
 CIRCUITPY_SPITARGET = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_JPEGIO = 0

ports/atmel-samd/common-hal/pulseio/PulseIn.c

@@ -130,7 +130,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
         mp_raise_RuntimeError(MP_ERROR_TEXT("Internal resource(s) in use"));
     }
 
-    self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t));
+    self->buffer = (uint16_t *)m_malloc_without_collect(maxlen * sizeof(uint16_t));
     if (self->buffer == NULL) {
         m_malloc_fail(maxlen * sizeof(uint16_t));
     }

ports/cxd56/common-hal/pulseio/PulseIn.c

@@ -65,7 +65,7 @@ static int pulsein_interrupt_handler(int irq, FAR void *context, FAR void *arg)
 
 void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
     const mcu_pin_obj_t *pin, uint16_t maxlen, bool idle_state) {
-    self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t));
+    self->buffer = (uint16_t *)m_malloc_without_collect(maxlen * sizeof(uint16_t));
     if (self->buffer == NULL) {
         m_malloc_fail(maxlen * sizeof(uint16_t));
     }

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/_bleio/Characteristic.c

@@ -78,7 +78,7 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     // If max_length is 0, then no storage is allocated.
     if (max_length > 0) {
         if (gc_alloc_possible()) {
-            self->current_value = m_malloc(max_length);
+            self->current_value = m_malloc_without_collect(max_length);
         } else {
             self->current_value = port_malloc(max_length, false);
             if (self->current_value == NULL) {

ports/espressif/common-hal/_bleio/CharacteristicBuffer.c

@@ -54,7 +54,7 @@ void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffe
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
     size_t buffer_size) {
-    uint8_t *buffer = m_malloc(buffer_size);
+    uint8_t *buffer = m_malloc_without_collect(buffer_size);
     _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL, false);
 }
 

ports/espressif/common-hal/_bleio/PacketBuffer.c

@@ -240,17 +240,17 @@ void common_hal_bleio_packet_buffer_construct(
     uint32_t *incoming_buffer = NULL;
     if (incoming) {
         incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size);
-        incoming_buffer = m_malloc(incoming_buffer_size);
+        incoming_buffer = m_malloc_without_collect(incoming_buffer_size);
     }
 
     uint32_t *outgoing1 = NULL;
     uint32_t *outgoing2 = NULL;
     if (outgoing) {
-        outgoing1 = m_malloc(max_packet_size);
+        outgoing1 = m_malloc_without_collect(max_packet_size);
         // Only allocate the second buffer if we are doing writes with responses.
         // Without responses, we just write as quickly as we can.
         if (outgoing == CHAR_PROP_WRITE || outgoing == CHAR_PROP_INDICATE) {
-            outgoing2 = m_malloc(max_packet_size);
+            outgoing2 = m_malloc_without_collect(max_packet_size);
         }
     }
     _common_hal_bleio_packet_buffer_construct(self, characteristic,

ports/espressif/common-hal/_bleio/ble_events.c

@@ -64,7 +64,7 @@ void ble_event_add_handler(ble_gap_event_fn *func, void *param) {
     }
 
     // Add a new handler to the front of the list
-    ble_event_handler_entry_t *handler = m_new(ble_event_handler_entry_t, 1);
+    ble_event_handler_entry_t *handler = m_new_obj(ble_event_handler_entry_t);
     ble_event_add_handler_entry(handler, func, param);
 }
 

ports/espressif/common-hal/audioio/AudioOut.c

@@ -42,7 +42,7 @@ static bool audioout_convert_u8s_u8m(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_u8s_u8m(*out_buffer, (uint8_t *)in_buffer, in_buffer_size / 2);
@@ -58,7 +58,7 @@ static bool audioout_convert_u8m_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size * 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size * 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size * 2);
         buffer_changed = true;
     }
     audiosample_convert_u8m_u8s(*out_buffer, (uint8_t *)in_buffer, in_buffer_size);
@@ -74,7 +74,7 @@ static bool audioout_convert_s8m_u8m(
 
     bool buffer_changed = false;
     if (in_buffer_size > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size);
+        *out_buffer = m_malloc_without_collect(in_buffer_size);
         buffer_changed = true;
     }
     audiosample_convert_s8m_u8m(*out_buffer, (int8_t *)in_buffer, in_buffer_size);
@@ -90,7 +90,7 @@ static bool audioout_convert_s8s_u8m(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_s8s_u8m(*out_buffer, (int8_t *)in_buffer, in_buffer_size / 2);
@@ -106,7 +106,7 @@ static bool audioout_convert_s8m_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size * 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size * 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size * 2);
         buffer_changed = true;
     }
     audiosample_convert_s8m_u8s(*out_buffer, (int8_t *)in_buffer, in_buffer_size);
@@ -122,7 +122,7 @@ static bool audioout_convert_s8s_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size);
+        *out_buffer = m_malloc_without_collect(in_buffer_size);
         buffer_changed = true;
     }
     audiosample_convert_s8s_u8s(*out_buffer, (int8_t *)in_buffer, in_buffer_size);
@@ -138,7 +138,7 @@ static bool audioout_convert_u16m_u8m(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_u16m_u8m(*out_buffer, (uint16_t *)in_buffer, in_buffer_size / 2);
@@ -154,7 +154,7 @@ static bool audioout_convert_u16m_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size);
+        *out_buffer = m_malloc_without_collect(in_buffer_size);
         buffer_changed = true;
     }
     audiosample_convert_u16m_u8s(*out_buffer, (uint16_t *)in_buffer, in_buffer_size / 2);
@@ -186,7 +186,7 @@ static bool audioout_convert_u16s_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_u16s_u8s(*out_buffer, (uint16_t *)in_buffer, in_buffer_size / 4);
@@ -202,7 +202,7 @@ static bool audioout_convert_s16m_u8m(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_s16m_u8m(*out_buffer, (int16_t *)in_buffer, in_buffer_size / 2);
@@ -218,7 +218,7 @@ static bool audioout_convert_s16m_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size);
+        *out_buffer = m_malloc_without_collect(in_buffer_size);
         buffer_changed = true;
     }
     audiosample_convert_s16m_u8s(*out_buffer, (int16_t *)in_buffer, in_buffer_size / 2);
@@ -250,7 +250,7 @@ static bool audioout_convert_s16s_u8s(
 
     bool buffer_changed = false;
     if (in_buffer_size / 2 > *out_buffer_size) {
-        *out_buffer = m_malloc(in_buffer_size / 2);
+        *out_buffer = m_malloc_without_collect(in_buffer_size / 2);
         buffer_changed = true;
     }
     audiosample_convert_s16s_u8s(*out_buffer, (int16_t *)in_buffer, in_buffer_size / 4);

ports/espressif/common-hal/nvm/ByteArray.c

@@ -46,7 +46,7 @@ static esp_err_t get_bytes(nvs_handle_t handle, uint8_t **buf_out) {
         *buf_out = NULL;
         return result;
     }
-    buf = m_malloc(size); // this SHOULD be the same as
+    buf = m_malloc_without_collect(size); // this SHOULD be the same as
     if (result == ESP_OK) {
         result = nvs_get_blob(handle, "data", buf, &size);
     } else {

ports/espressif/common-hal/pulseio/PulseIn.c

@@ -74,14 +74,14 @@ static bool _done_callback(rmt_channel_handle_t rx_chan,
 
 void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu_pin_obj_t *pin,
     uint16_t maxlen, bool idle_state) {
-    self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t));
+    self->buffer = (uint16_t *)m_malloc_without_collect(maxlen * sizeof(uint16_t));
     if (self->buffer == NULL) {
         m_malloc_fail(maxlen * sizeof(uint16_t));
     }
     // We add one to the maxlen version to ensure that two symbols at lease are
     // captured because we may skip the first portion of a symbol.
     self->raw_symbols_size = MIN(64, maxlen / 2 + 1) * sizeof(rmt_symbol_word_t);
-    self->raw_symbols = (rmt_symbol_word_t *)m_malloc(self->raw_symbols_size);
+    self->raw_symbols = (rmt_symbol_word_t *)m_malloc_without_collect(self->raw_symbols_size);
     if (self->raw_symbols == NULL) {
         m_free(self->buffer);
         m_malloc_fail(self->raw_symbols_size);

ports/espressif/mpconfigport.h

@@ -22,6 +22,9 @@
 #define MICROPY_NLR_SETJMP                  (1)
 #define CIRCUITPY_DEFAULT_STACK_SIZE        0x6000
 
+// PSRAM can require more stack space for GC.
+#define MICROPY_ALLOC_GC_STACK_SIZE         (128)
+
 // Nearly all boards have this because it is used to enter the ROM bootloader.
 #ifndef CIRCUITPY_BOOT_BUTTON
   #if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)

ports/mimxrt10xx/common-hal/audiobusio/__init__.c

@@ -309,7 +309,7 @@ void port_i2s_initialize(i2s_t *self, int instance, sai_transceiver_t *config) {
         mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_I2SOut);
     }
     for (size_t i = 0; i < MP_ARRAY_SIZE(self->buffers); i++) {
-        self->buffers[i] = m_malloc(AUDIO_BUFFER_FRAME_COUNT * sizeof(uint32_t));
+        self->buffers[i] = m_malloc_without_collect(AUDIO_BUFFER_FRAME_COUNT * sizeof(uint32_t));
     }
     self->peripheral = peripheral;
     SAI_Init(self->peripheral);

ports/mimxrt10xx/common-hal/canio/CAN.c

@@ -228,7 +228,7 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, const mcu_pin_obj_t *
     self->silent = silent;
     self->baudrate = baudrate;
 
-    self->data = m_new_obj(mimxrt10xx_flexcan_data_t);
+    self->data = m_malloc_without_collect(sizeof(mimxrt10xx_flexcan_data_t));
     self->data->base = flexcan_bases[instance]; // 'flexcan_bases' start indexing from 1. (The first element is NULL)
     self->data->tx_state = 0;
 

ports/mimxrt10xx/common-hal/canio/Listener.c

@@ -123,7 +123,13 @@ mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
     // allows the CPU to serve the next FIFO entry
     FLEXCAN_ClearMbStatusFlags(self->can->data->base, (uint32_t)kFLEXCAN_RxFifoFrameAvlFlag);
 
-    canio_message_obj_t *message = m_new_obj(canio_message_obj_t);
+    const mp_obj_type_t *type;
+    if (rx_frame.type == kFLEXCAN_FrameTypeRemote) {
+        type = &canio_remote_transmission_request_type;
+    } else {
+        type = &canio_message_type;
+    }
+    canio_message_obj_t *message = mp_obj_malloc(canio_message_obj_t, type);
     memset(message, 0, sizeof(canio_message_obj_t));
 
     if (rx_frame.format == kFLEXCAN_FrameFormatExtend) {
@@ -134,11 +140,6 @@ mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
         message->id = rx_frame.id >> 18; // standard ids are left-aligned
     }
 
-    if (rx_frame.type == kFLEXCAN_FrameTypeRemote) {
-        message->base.type = &canio_remote_transmission_request_type;
-    } else {
-        message->base.type = &canio_message_type;
-    }
 
     message->size = rx_frame.length;
 

ports/nordic/common-hal/_bleio/Adapter.c

@@ -524,7 +524,7 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
     }
     self->scan_results = shared_module_bleio_new_scanresults(buffer_size, prefixes, prefix_length, minimum_rssi);
     size_t max_packet_size = extended ? BLE_GAP_SCAN_BUFFER_EXTENDED_MAX_SUPPORTED : BLE_GAP_SCAN_BUFFER_MAX;
-    uint8_t *raw_data = m_malloc(sizeof(ble_data_t) + max_packet_size);
+    uint8_t *raw_data = m_malloc_without_collect(sizeof(ble_data_t) + max_packet_size);
     ble_data_t *sd_data = (ble_data_t *)raw_data;
     self->scan_results->common_hal_data = sd_data;
     sd_data->len = max_packet_size;