Merge branch 'adafruit:main' into waveshare_rp2350_usb

Author: DaveRichmond

.github/actions/deps/ports/espressif/action.yml

@@ -7,6 +7,7 @@ runs:
       run: |
         echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
         echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
+        echo >> $GITHUB_ENV "ESP_ROM_ELF_DIR=$GITHUB_WORKSPACE/.idf_tools"
       shell: bash
 
     - name: Get IDF commit

.gitmodules

@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.3.2
+	branch = circuitpython-v5.4.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git

lib/mbedtls_config/mbedtls_config_port.h

@@ -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 <andi@gowling.com>\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/en_GB.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 <hexthat@gmail.com>\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

locale/zh_Latn_pinyin.po

@@ -203,6 +203,9 @@ static void start_mp(safe_mode_t safe_mode) {
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
 
     mp_obj_list_init((mp_obj_list_t *)mp_sys_argv, 0);
+
+    // Always return to root
+    common_hal_os_chdir("/");
 }
 
 static void stop_mp(void) {
@@ -457,8 +460,6 @@ 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;

main.c

@@ -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/hallowing_m4_express/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/boards/uartlogger2/mpconfigboard.mk

@@ -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/atmel-samd/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));
     }