[ports/espressif] esp-idf v5.5 changes

Author: dbd

ports/espressif/Makefile

@@ -672,7 +672,7 @@ 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))
+	BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
 	ifneq ($(IDF_TARGET),esp32c2)
 	BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, libmesh.a libwapi.a)
 	endif
@@ -683,6 +683,12 @@ 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_i2c 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
+NEEDS_COEX = $(CIRCUITPY_BLEIO_NATIVE) + $(CIRCUITPY_WIFI)
+ifneq ($(NEEDS_COEX),0)
+	# esp_system_include_startup_funcs requires coexist as well BT regardless of wifi
+	BINARY_BLOBS += esp-idf/components/esp_coex/lib/$(IDF_TARGET)/libcoexist.a
+	ESP_IDF_COMPONENTS_LINK += esp_coex
+endif
 ifneq ($(CIRCUITPY_WIFI),0)
 	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp_security esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
 endif

ports/espressif/common-hal/alarm/pin/PinAlarm.c

@@ -360,38 +360,36 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
     if (gpio_isr_register(gpio_interrupt, NULL, 0, &gpio_interrupt_handle) != ESP_OK) {
         mp_raise_ValueError(MP_ERROR_TEXT("Can only alarm on RTC IO from deep sleep."));
     }
-    for (size_t i = 0; i < 64; i++) {
-        uint64_t mask = 1ull << i;
+    for (gpio_num_t pin = 0; pin < SOC_GPIO_PIN_COUNT; pin++) {
+        uint64_t mask = 1ULL << pin;
         bool high = (high_alarms & mask) != 0;
         bool low = (low_alarms & mask) != 0;
         bool pull = (pull_pins & mask) != 0;
         if (!(high || low)) {
             continue;
         }
-        if (rtc_gpio_is_valid_gpio(i)) {
+        if (rtc_gpio_is_valid_gpio(pin)) {
             #ifdef SOC_PM_SUPPORT_RTC_PERIPH_PD
-            rtc_gpio_deinit(i);
+            rtc_gpio_deinit(pin);
             #endif
         }
-        gpio_int_type_t interrupt_mode = GPIO_INTR_DISABLE;
-        gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-        if (high) {
-            interrupt_mode = GPIO_INTR_HIGH_LEVEL;
-            pull_mode = GPIO_PULLDOWN_ONLY;
-        }
-        if (low) {
-            interrupt_mode = GPIO_INTR_LOW_LEVEL;
-            pull_mode = GPIO_PULLUP_ONLY;
-        }
-        gpio_set_direction(i, GPIO_MODE_DEF_INPUT);
-        PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[i], PIN_FUNC_GPIO);
+        gpio_set_direction(pin, GPIO_MODE_INPUT);
         if (pull) {
-            gpio_set_pull_mode(i, pull_mode);
+            if (high) {
+                ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_PULLDOWN_ONLY));
+            } else {
+                ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_PULLUP_ONLY));
+            }
+        } else {
+            ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_FLOATING));
         }
-        never_reset_pin_number(i);
-        // Sets interrupt type and wakeup bits.
-        gpio_wakeup_enable(i, interrupt_mode);
-        gpio_intr_enable(i);
+        gpio_int_type_t intr = GPIO_INTR_DISABLE;
+        if (high) intr = GPIO_INTR_HIGH_LEVEL;
+        if (low) intr = GPIO_INTR_LOW_LEVEL;
+        never_reset_pin_number(pin);
+        gpio_wakeup_enable(pin, intr);
+        gpio_set_intr_type(pin, intr);
+        gpio_intr_enable(pin);
     }
     // Wait for any pulls to settle.
     mp_hal_delay_ms(50);

ports/espressif/common-hal/digitalio/DigitalInOut.c

@@ -11,8 +11,11 @@
 #include "hal/gpio_hal.h"
 
 static bool _pin_is_input(uint8_t pin_number) {
-    const uint32_t iomux = READ_PERI_REG(GPIO_PIN_MUX_REG[pin_number]);
-    return (iomux & FUN_IE) != 0;
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)pin_number, &config) != ESP_OK) {
+        return false;
+    }
+    return config.ie;
 }
 
 void digitalio_digitalinout_preserve_for_deep_sleep(size_t n_dios, digitalio_digitalinout_obj_t *preserve_dios[]) {
@@ -113,10 +116,12 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     digitalio_digitalinout_obj_t *self) {
-    if (GPIO_HAL_GET_HW(GPIO_PORT_0)->pin[self->pin->number].pad_driver == 1) {
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)self->pin->number, &config) != ESP_OK) {
+        // Should it fail closed or open?
         return DRIVE_MODE_OPEN_DRAIN;
     }
-    return DRIVE_MODE_PUSH_PULL;
+    return config.od ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
@@ -134,11 +139,10 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
     digitalio_digitalinout_obj_t *self) {
-    gpio_num_t gpio_num = self->pin->number;
-    if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU)) {
-        return PULL_UP;
-    } else if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD)) {
-        return PULL_DOWN;
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)self->pin->number, &config) != ESP_OK) {
+        // Should it fail closed or open?
+        return PULL_NONE;
     }
-    return PULL_NONE;
+    return config.pd ? PULL_DOWN : PULL_UP;
 }

ports/espressif/common-hal/microcontroller/Pin.c

@@ -370,9 +370,8 @@ void reset_all_pins(void) {
     gpio_deep_sleep_hold_dis();
     #endif
 
-    for (uint8_t i = 0; i < GPIO_PIN_COUNT; i++) {
-        uint32_t iomux_address = GPIO_PIN_MUX_REG[i];
-        if (iomux_address == 0 ||
+    for (gpio_num_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+        if (!GPIO_IS_VALID_GPIO(i) ||
             _never_reset(i) ||
             _skip_reset_once(i) ||
             _preserved_pin(i)) {

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

@@ -146,8 +146,8 @@ void common_hal_wifi_init(bool user_initiated) {
     common_hal_wifi_radio_obj.base.type = &wifi_radio_type;
 
     if (!wifi_ever_inited) {
-        ESP_ERROR_CHECK(esp_netif_init());
         ESP_ERROR_CHECK(esp_event_loop_create_default());
+        ESP_ERROR_CHECK(esp_netif_init());
         wifi_ever_inited = true;
     }
 
@@ -175,6 +175,7 @@ void common_hal_wifi_init(bool user_initiated) {
         &self->handler_instance_got_ip));
 
     wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
+    esp_err_t result = esp_wifi_init(&config);
     #ifdef CONFIG_ESP32_WIFI_NVS_ENABLED
     // Generally we don't use this because we store ssid and passwords ourselves in the filesystem.
     esp_err_t err = nvs_flash_init();
@@ -185,8 +186,10 @@ void common_hal_wifi_init(bool user_initiated) {
         err = nvs_flash_init();
     }
     ESP_ERROR_CHECK(err);
+    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
+    #else
+    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
     #endif
-    esp_err_t result = esp_wifi_init(&config);
     if (result == ESP_ERR_NO_MEM) {
         if (gc_alloc_possible()) {
             mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("Failed to allocate Wifi memory"));