Merge branch 'adafruit:main' into main

Author: PontusO

.github/actions/upload_aws/action.yml

@@ -20,8 +20,11 @@ runs:
   steps:
     - name: Upload to S3
       if: >-
-        (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
-        (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+        (github.event_name == 'push' && github.repository_owner == 'adafruit') &&
+         (github.ref == 'refs/heads/main' ||
+          (startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
+        (github.event_name == 'release' &&
+         (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: >-
         [ -z "$AWS_ACCESS_KEY_ID" ] ||
         aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}

.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
+	branch = circuitpython-v5.3.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/espressif/esp-protocols.git

.readthedocs.yml

@@ -9,7 +9,7 @@
 version: 2
 
 build:
-    os: ubuntu-20.04
+    os: ubuntu-24.04
     tools:
         python: "3"
     jobs:

devices/ble_hci/common-hal/_bleio/Characteristic.c

@@ -50,6 +50,17 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     }
 }
 
+bool common_hal_bleio_characteristic_deinited(bleio_characteristic_obj_t *self) {
+    return self->handle == BLE_GATT_HANDLE_INVALID;
+}
+
+void common_hal_bleio_characteristic_deinit(bleio_characteristic_obj_t *self) {
+    if (common_hal_bleio_characteristic_deinited(self)) {
+        return;
+    }
+    self->handle = BLE_GATT_HANDLE_INVALID;
+}
+
 mp_obj_tuple_t *common_hal_bleio_characteristic_get_descriptors(bleio_characteristic_obj_t *self) {
     return mp_obj_new_tuple(self->descriptor_list->len, self->descriptor_list->items);
 }

docs/shared_bindings_matrix.py

@@ -65,6 +65,7 @@
 
 ADDITIONAL_MODULES = {
     "_asyncio": "MICROPY_PY_ASYNCIO",
+    "_eve": "CIRCUITPY__EVE",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
     "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
     "array": "CIRCUITPY_ARRAY",

lib/tinyusb

@@ -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: 2024-08-19 18:09+0000\n"
+"PO-Revision-Date: 2024-09-06 04:09+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.7\n"
+"X-Generator: Weblate 5.8-dev\n"
 
 #: main.c
 msgid ""
@@ -3574,7 +3574,7 @@ msgstr "míngchēng wèi dìngyì"
 
 #: py/qstr.c
 msgid "name too long"
-msgstr ""
+msgstr "míngchēng tàicháng"
 
 #: py/persistentcode.c
 msgid "native code in .mpy unsupported"

locale/zh_Latn_pinyin.po

@@ -33,3 +33,9 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24 1
 #define IGNORE_PIN_PA25 1
+
+// Pins not used by pins.c or SPI flash.
+#define IGNORE_PIN_PA00 1
+#define IGNORE_PIN_PA01 1
+#define IGNORE_PIN_PA03 1
+#define IGNORE_PIN_PA30 1

ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.h

@@ -28,6 +28,20 @@
 #define DEFAULT_UART_BUS_RX (&pin_PB17)
 #define DEFAULT_UART_BUS_TX (&pin_PB16)
 
+// Used for 32 kHZ crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Not connected
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PB00     1
+#define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB06     1
+#define IGNORE_PIN_PB07     1
+#define IGNORE_PIN_PB30     1
+#define IGNORE_PIN_PB31     1

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h

@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_RAINBOWIO = 0

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

@@ -10,7 +10,7 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
-CIRCUITPY__EVE = 1
+CIRCUITPY__EVE = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SYNTHIO = 0

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

@@ -32,6 +32,19 @@
 #define DEFAULT_UART_BUS_RX (&pin_PA23)
 #define DEFAULT_UART_BUS_TX (&pin_PA22)
 
+// Used for 32 kHz crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Not connected
+#define IGNORE_PIN_PA07     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PB00     1
+#define IGNORE_PIN_PB01     1
+#define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB05     1
+#define IGNORE_PIN_PB23     1

ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h

@@ -12,5 +12,6 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_BLEIO_HCI = 0
 
 CIRCUITPY_BITBANG_APA102 = 1

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

@@ -12,6 +12,9 @@ CROSS_COMPILE = riscv32-esp-elf-
 else ifeq ($(IDF_TARGET),esp32c3)
 IDF_TARGET_ARCH = riscv
 CROSS_COMPILE = riscv32-esp-elf-
+else ifeq ($(IDF_TARGET),esp32p4)
+IDF_TARGET_ARCH = riscv
+CROSS_COMPILE = riscv32-esp-elf-
 else ifeq ($(IDF_TARGET),esp32c6)
 IDF_TARGET_ARCH = riscv
 CROSS_COMPILE = riscv32-esp-elf-
@@ -155,7 +158,6 @@ CFLAGS += -DSTACK_CANARY_VALUE=0xa5a5a5a5
 # one must provide `-u` arguments to state the symbols are missing. This would
 # normally happen implicitly by another function calling to these.
 REGISTRATION_FUNCTIONS = \
-	-u newlib_include_pthread_impl \
 	-u ld_include_highint_hdl \
 	-u __cxx_fatal_exception \
 	-u esp_app_desc \
@@ -169,8 +171,10 @@ REGISTRATION_FUNCTIONS = \
 	-u newlib_include_syscalls_impl \
 	-u newlib_include_pthread_impl \
 	-u newlib_include_assert_impl \
-	-u newlib_include_getentropy_impl \
-	-u newlib_include_init_funcs
+	-u newlib_include_init_funcs \
+	-u include_esp_phy_override \
+	-u vfs_include_syscalls_impl
+
 
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
@@ -214,7 +218,13 @@ ifeq ($(IDF_TARGET_ARCH),xtensa)
 
 CFLAGS += -mlongcalls -isystem esp-idf/components/xtensa/deprecated_include/ -Wno-error=cpp
 else ifeq ($(IDF_TARGET_ARCH),riscv)
+
+ifeq ($(IDF_TARGET),esp32p4)
+CFLAGS += -march=rv32imafc_zicsr_zifencei_xesppie -mabi=ilp32f
+else
 CFLAGS += -march=rv32imac_zicsr_zifencei
+endif
+
 LDFLAGS += \
 	-Lesp-idf/components/riscv/ld \
 	-Trom.api.ld
@@ -284,6 +294,16 @@ LDFLAGS += \
 	-Tesp32c6.rom.wdt.ld
 
 
+CHIP_COMPONENTS = \
+	esp_driver_tsens
+
+else ifeq ($(IDF_TARGET),esp32p4)
+LDFLAGS += \
+	-Tesp32p4.rom.newlib.ld \
+	-Tesp32p4.rom.systimer.ld \
+	-Tesp32p4.rom.wdt.ld
+
+
 CHIP_COMPONENTS = \
 	esp_driver_tsens
 
@@ -311,7 +331,6 @@ CHIP_COMPONENTS = \
 else ifeq ($(IDF_TARGET),esp32s3)
 LDFLAGS += \
 	-Tesp32s3.rom.newlib.ld \
-	-Tesp32s3.rom.newlib-time.ld \
 	-Tesp32s3.rom.version.ld \
 	-Tesp32s3.rom.systimer.ld \
 	-Tesp32s3.rom.wdt.ld
@@ -338,6 +357,8 @@ else ifeq ($(IDF_TARGET),esp32c3)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C3
 else ifeq ($(IDF_TARGET),esp32c6)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C6
+else ifeq ($(IDF_TARGET),esp32p4)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32P4
 else ifeq ($(IDF_TARGET),esp32h2)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32H2
 else ifeq ($(IDF_TARGET),esp32s2)
@@ -578,7 +599,10 @@ update-board-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
 	python tools/update_sdkconfig.py --board=$(BOARD) --debug=$(DEBUG)
 
 BINARY_WIFI_BLOBS = libcore.a libespnow.a libnet80211.a libpp.a libsmartconfig.a
-BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a
+
+ifneq ($(IDF_TARGET),esp32p4)
+	BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a
+endif
 ifneq ($(CIRCUITPY_WIFI),0)
 	BINARY_BLOBS += esp-idf/components/esp_coex/lib/$(IDF_TARGET)/libcoexist.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
 	ifneq ($(IDF_TARGET),esp32c2)
@@ -590,9 +614,9 @@ ifeq ($(IDF_TARGET),esp32)
 BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a
 endif
 
-ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_phy esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
+ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
 ifneq ($(CIRCUITPY_WIFI),0)
-	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant
+	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
 endif
 ifneq ($(CIRCUITPY_BLEIO),0)
 	BLE_IMPL_esp32 := esp32
@@ -603,7 +627,7 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 	BLE_IMPL_esp32h2 := libble
 	BLE_IMPL = $(BLE_IMPL_$(IDF_TARGET))
 
-	ESP_IDF_COMPONENTS_LINK += bt
+	ESP_IDF_COMPONENTS_LINK += bt esp_phy
 	ifeq ($(BLE_IMPL),esp32)
 		# BLE will hang the ESP32 and trigger an interrupt watchdog without this undefined symbol at
 		# link because a weak version of the interrupt that BLE uses will be linked incorrectly.
@@ -665,6 +689,8 @@ else ifeq ($(IDF_TARGET),esp32c3)
 BOOTLOADER_OFFSET = 0x0
 else ifeq ($(IDF_TARGET),esp32c6)
 BOOTLOADER_OFFSET = 0x0
+else ifeq ($(IDF_TARGET),esp32p4)
+BOOTLOADER_OFFSET = 0x2000
 else ifeq ($(IDF_TARGET),esp32s3)
 BOOTLOADER_OFFSET = 0x0
 else ifeq ($(IDF_TARGET),esp32s2)

ports/espressif/Makefile

@@ -14,6 +14,7 @@ Support Status:
     ESP32-C2, "alpha"
     ESP32-C3, "beta"
     ESP32-C6, "alpha"
+    ESP32-P4, "alpha"
     ESP32-S2, "stable"
     ESP32-S3, "stable"
 

ports/espressif/README.rst

@@ -13,8 +13,7 @@
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 2) {
         // Turn on NeoPixel and I2C power by default.
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
 

ports/espressif/boards/adafruit_feather_esp32_v2/board.c

@@ -12,8 +12,7 @@
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 20) {
         // Turn on I2C power by default.
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
 

ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/board.c

@@ -103,8 +103,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 7) {
         // Turn on TFT and I2C
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
     return false;

ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c

@@ -103,8 +103,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
         // Turn on TFT and I2C
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
     return false;

ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c

@@ -103,8 +103,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 7) {
         // Turn on TFT and I2C
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
     return false;

ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c

@@ -103,8 +103,7 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
         // Turn on TFT and I2C
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
     return false;

ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c

@@ -12,8 +12,7 @@
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 2) {
         // Turn on NeoPixel and I2C power by default.
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(pin_number, true);
+        config_pin_as_output_with_level(pin_number, true);
         return true;
     }
 

ports/espressif/boards/adafruit_itsybitsy_esp32/board.c

@@ -12,8 +12,14 @@
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 13) {
         // Set D13 LED to input when not in use
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_INPUT);
-        gpio_set_pull_mode(pin_number, GPIO_PULLDOWN_ONLY);
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_INPUT,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
         return true;
     }
 

ports/espressif/boards/arduino_nano_esp32s3/board.c

@@ -12,8 +12,14 @@
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 13) {
         // Set D13 LED to input when not in use
-        gpio_set_direction(pin_number, GPIO_MODE_DEF_INPUT);
-        gpio_set_pull_mode(pin_number, GPIO_PULLDOWN_ONLY);
+        gpio_config_t cfg = {
+            .pin_bit_mask = BIT64(pin_number),
+            .mode = GPIO_MODE_INPUT,
+            .pull_up_en = false,
+            .pull_down_en = true,
+            .intr_type = GPIO_INTR_DISABLE,
+        };
+        gpio_config(&cfg);
         return true;
     }