Merge branch 'adafruit:main' into main

Author: mariopesch

.devcontainer/cortex-m-toolchain.sh

@@ -17,7 +17,7 @@ wget -qO gcc-arm-none-eabi.tar.xz \
   https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"

docs/environment.rst

@@ -53,8 +53,10 @@ Details of the toml language subset
 CircuitPython behavior
 ----------------------
 
-CircuitPython will also read the environment to configure its behavior. Other
-keys are ignored by CircuitPython. Here are the keys it uses:
+CircuitPython will also read the environment to configure its behavior. Some keys are read at
+startup once and others are read on reload (ctrl-D in the REPL). If a reload doesn't change things,
+then try a reset (a power cycle or pressing the reset button). Other keys are ignored by CircuitPython.
+Here are the keys it uses:
 
 Core CircuitPython keys
 ^^^^^^^^^^^^^^^^^^^^^^^

locale/es.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2025-06-09 12:01+0000\n"
-"Last-Translator: MAE <[email protected]>\n"
+"PO-Revision-Date: 2025-07-17 04:01+0000\n"
+"Last-Translator: Jean Serrano <[email protected]>\n"
 "Language-Team: \n"
 "Language: es\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.12-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: main.c
 msgid ""
@@ -614,8 +614,10 @@ msgid "Array values should be single bytes."
 msgstr "Valores del array deben ser bytes individuales."
 
 #: ports/atmel-samd/common-hal/spitarget/SPITarget.c
+#, fuzzy
 msgid "Async SPI transfer in progress on this bus, keep awaiting."
 msgstr ""
+"Transferencia SPI asíncrona en curso en este canal, manténgase esperando."
 
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
@@ -819,7 +821,7 @@ msgstr "No se puede grabar en un archivo"
 
 #: shared-module/storage/__init__.c
 msgid "Cannot remount path when visible via USB."
-msgstr ""
+msgstr "No se puede volver a montar path mientras es visible a través de USB."
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Cannot set value when direction is input."
@@ -876,7 +878,7 @@ msgstr "Las matrices de coordenadas tienen diferentes tamaños"
 
 #: ports/espressif/common-hal/rclcpy/Publisher.c
 msgid "Could not publish to ROS topic"
-msgstr ""
+msgstr "No se pudo publicar al tema ROS"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
@@ -893,7 +895,7 @@ msgstr "No se pudo encontrar el decodificador"
 #: ports/espressif/common-hal/rclcpy/__init__.c
 #, c-format
 msgid "Critical ROS failure during soft reboot, reset required: %d"
-msgstr ""
+msgstr "Fallo ROS critico durante reinicio suave, se requiere reiniciar: %d"
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
@@ -1062,8 +1064,9 @@ msgid "Failed to create continuous channels: not found"
 msgstr "Error al crear canales continuos: no encontrado"
 
 #: ports/espressif/common-hal/audioio/AudioOut.c
+#, fuzzy
 msgid "Failed to enable continuous"
-msgstr ""
+msgstr "Fallo habilitando continous"
 
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
@@ -1339,7 +1342,7 @@ msgstr "Dirección MAC inválida"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "Invalid ROS domain ID"
-msgstr ""
+msgstr "ID de dominio ROS invalido"
 
 #: ports/espressif/common-hal/espidf/__init__.c py/moderrno.c
 msgid "Invalid argument"
@@ -1434,7 +1437,7 @@ msgstr "Seguridad MITM no compatible"
 #: ports/stm/common-hal/sdioio/SDCard.c
 #, c-format
 msgid "MMC/SDIO Clock Error %x"
-msgstr ""
+msgstr "Error de Reloj MMC/SDIO %x"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
@@ -1800,8 +1803,10 @@ msgid "PWM slice channel A already in use"
 msgstr "Segmento del PWM canal A ya esta en uso"
 
 #: shared-bindings/spitarget/SPITarget.c
+#, fuzzy
 msgid "Packet buffers for an SPI transfer must have the same length."
 msgstr ""
+"Búferes de paquetes para transferencia SPI deben de ser de igual longitud"
 
 #: shared-module/jpegio/JpegDecoder.c
 msgid "Parameter error"
@@ -1908,8 +1913,9 @@ msgid "Program too long"
 msgstr "El programa es demasiado grande"
 
 #: shared-bindings/rclcpy/Publisher.c
+#, fuzzy
 msgid "Publishers can only be created from a parent node"
-msgstr ""
+msgstr "Publicadores solo pueden ser creados desde un nodo padre"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -1933,23 +1939,23 @@ msgstr "Error de inicialización de RNG"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS failed to initialize. Is agent connected?"
-msgstr ""
+msgstr "Fallo al inicializar ROS, El agente esta conectado?"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS internal setup failure"
-msgstr ""
+msgstr "Fallo interno de instalación ROS"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS memory allocator failure"
-msgstr ""
+msgstr "Fallo de asignación de memoria ROS"
 
 #: ports/espressif/common-hal/rclcpy/Node.c
 msgid "ROS node failed to initialize"
-msgstr ""
+msgstr "Fallo al inicializar nodo ROS"
 
 #: ports/espressif/common-hal/rclcpy/Publisher.c
 msgid "ROS topic failed to initialize"
-msgstr ""
+msgstr "Fallo al inicializar Tema ROS"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
@@ -2165,8 +2171,9 @@ msgid "Tile width must exactly divide bitmap width"
 msgstr "Ancho del Tile debe dividir exactamente el ancho de mapa de bits"
 
 #: shared-module/tilepalettemapper/TilePaletteMapper.c
+#, fuzzy
 msgid "TilePaletteMapper may only be bound to a TileGrid once"
-msgstr ""
+msgstr "Tilepalettemapper sólo puede vincularse una vez a un TileGrid"
 
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Time is in the past."

locale/nl.po

@@ -6,8 +6,8 @@ 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-06-30 16:01+0000\n"
-"Last-Translator: MAE <[email protected]>\n"
+"PO-Revision-Date: 2025-07-13 16:01+0000\n"
+"Last-Translator: Mirthe Winter <[email protected]>\n"
 "Language-Team: none\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr ""
 
 #: py/obj.c
 msgid "  File \"%q\""
-msgstr "  Bestand"
+msgstr "  Bestand \"%q\""
 
 #: py/obj.c
 msgid "  File \"%q\", line %d"
@@ -631,8 +631,8 @@ msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
 msgstr ""
-"Auto-herlaad staat aan. Sla bestanden simpelweg op over USB om uit te voeren "
-"of start REPL om uit te schakelen.\n"
+"Auto-herlaad staat aan. Sla bestanden simpelweg via USB op om ze uit te "
+"voeren of start REPL om ze uit te schakelen.\n"
 
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "Baudrate not supported by peripheral"
@@ -1845,7 +1845,7 @@ msgstr "Prefix buffer moet op de heap zijn"
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
 msgstr ""
-"Druk een willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
+"Druk op een willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
 "herstarten.\n"
 
 #: main.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-05-31 20:05+0000\n"
+"PO-Revision-Date: 2025-07-15 00:01+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.12-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: main.c
 msgid ""
@@ -870,7 +870,7 @@ msgstr "zuòbiāo shùzǔ lèixíng jùyǒu bùtóng de dàxiǎo"
 
 #: ports/espressif/common-hal/rclcpy/Publisher.c
 msgid "Could not publish to ROS topic"
-msgstr ""
+msgstr "wúfǎ fābù dào ROS zhǔtí"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
@@ -887,7 +887,7 @@ msgstr "wúfǎ fēnpèi jiěmǎ qì"
 #: ports/espressif/common-hal/rclcpy/__init__.c
 #, c-format
 msgid "Critical ROS failure during soft reboot, reset required: %d"
-msgstr ""
+msgstr "ruǎn chóngqǐ qījiān fāshēng guānjiàn de ROS gùzhàng, xūyàozhòngzhì: %d"
 
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "DAC Channel Init Error"
@@ -1331,7 +1331,7 @@ msgstr "wú xiào de MAC dì zhǐ"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "Invalid ROS domain ID"
-msgstr ""
+msgstr "wúxiàode ROS yù ID"
 
 #: ports/espressif/common-hal/espidf/__init__.c py/moderrno.c
 msgid "Invalid argument"
@@ -1898,7 +1898,7 @@ msgstr "chéng xù tài cháng"
 
 #: shared-bindings/rclcpy/Publisher.c
 msgid "Publishers can only be created from a parent node"
-msgstr ""
+msgstr "chūbǎnshāng zhǐ néngcóng fù jiédiǎn chuàngjiàn"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Pull not used when direction is output."
@@ -1922,23 +1922,23 @@ msgstr "RNG chūshǐhuà cuòwù"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS failed to initialize. Is agent connected?"
-msgstr ""
+msgstr "ROS chūshǐhuàshībài. dàilǐ yǐ liánjiē ma?"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS internal setup failure"
-msgstr ""
+msgstr "ROS nèibù shèzhì shībài"
 
 #: ports/espressif/common-hal/rclcpy/__init__.c
 msgid "ROS memory allocator failure"
-msgstr ""
+msgstr "ROS nèicún fēnpèiqì shībài"
 
 #: ports/espressif/common-hal/rclcpy/Node.c
 msgid "ROS node failed to initialize"
-msgstr ""
+msgstr "ROS jiédiǎn chūshǐhuà shībài"
 
 #: ports/espressif/common-hal/rclcpy/Publisher.c
 msgid "ROS topic failed to initialize"
-msgstr ""
+msgstr "ROS zhǔtí chūshǐhuà shībài"
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c

ports/espressif/Makefile

@@ -571,27 +571,23 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
 
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
-####### No 2MB UF2 boards, so always no OTA, not UF2
+# ..... No 2MB UF2 boards, so always no OTA, not UF2
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
 	ifeq ($(UF2_BOOTLOADER), 1)
-############### TODO: For right now, use no-ota only for ESP32-S3. Eventually it will be for ESP32-S2 as well.
-		ifeq ($(IDF_TARGET),esp32s3)
-			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
-		else
-			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
-		endif
+#.............  ESP32-S2 and ESP32-S3 do not have an extra ota partition for OTA update.
+		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
 	else
-############### Non-UF2 4MB: C3, C6, etc.
+# ............. Non-UF2 4MB: C3, C6, etc.
 		ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
-######################  Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
+# ....................  Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
 			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults
 		else
 			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 		endif
 	endif
 else
-####### All the rest are >4MB flash
+# ..... All the rest are >4MB flash
 	ifeq ($(UF2_BOOTLOADER), 1)
 		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 	else

ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk

@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0

ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk

@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0

ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk

@@ -9,6 +9,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP_PSRAM_SIZE = 2MB
+CIRCUITPY_ESP_PSRAM_MODE = qio
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+# Specialized board.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 CIRCUITPY_PS2IO = 0
@@ -21,7 +26,3 @@ CIRCUITPY_FRAMEBUFFERIO = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-
-CIRCUITPY_ESP_PSRAM_SIZE = 2MB
-CIRCUITPY_ESP_PSRAM_MODE = qio
-CIRCUITPY_ESP_PSRAM_FREQ = 80m

ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk

@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0