Update to ESP IDF 5.5

Author: tannewt

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

lib/protomatter

@@ -156,11 +156,13 @@ REGISTRATION_FUNCTIONS = \
 	-u __ubsan_include \
 	-u esp_system_include_startup_funcs \
 	-u esp_efuse_startup_include_func \
-	-u newlib_include_heap_impl \
-	-u newlib_include_syscalls_impl \
-	-u newlib_include_pthread_impl \
-	-u newlib_include_assert_impl \
-	-u newlib_include_init_funcs \
+	-u esp_libc_include_heap_impl \
+	-u esp_libc_include_reent_syscalls_impl \
+	-u esp_libc_include_syscalls_impl \
+	-u esp_libc_include_pthread_impl \
+	-u esp_libc_include_assert_impl \
+	-u esp_libc_include_getentropy_impl \
+	-u esp_libc_include_init_funcs \
 	-u include_esp_phy_override \
 	-u vfs_include_syscalls_impl
 
@@ -222,7 +224,6 @@ else ifeq ($(IDF_TARGET_ARCH),riscv)
 		-Trom.api.ld
 endif
 
-$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
 
 LDFLAGS += $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 
@@ -782,7 +783,7 @@ endif
 
 IDF_CMAKE_TARGETS = \
 		bootloader/bootloader.bin \
-		esp-idf/esp_system/__ldgen_output_sections.ld \
+		__ldgen_output_sections.ld \
 		$(foreach component, $(ESP_IDF_COMPONENTS_LINK), esp-idf/$(component)/lib$(component).a)
 
 PARTITION_TABLE_OFFSET = 0x8000

ports/espressif/Makefile

@@ -14,10 +14,12 @@
 
 #include "esp_sleep.h"
 #include "hal/gpio_ll.h"
+#include "driver/gpio.h"
 #include "esp_debug_helpers.h"
 
 #ifdef SOC_PM_SUPPORT_EXT0_WAKEUP
 #include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_io_reg.h"
 #endif
 
 #include "driver/rtc_io.h"

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

@@ -86,10 +86,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     adc_cali_scheme_ver_t supported_schemes;
     adc_cali_check_scheme(&supported_schemes);
-    #ifndef CONFIG_IDF_TARGET_ESP32P4
     adc_cali_scheme_ver_t calibration_scheme = 0;
     adc_cali_handle_t calibration;
-    #endif
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     adc_cali_curve_fitting_config_t config = {
         .unit_id = self->pin->adc_index,
@@ -137,11 +135,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
     int voltage;
-    #ifdef CONFIG_IDF_TARGET_ESP32P4
-    voltage = 0;
-    #else
     adc_cali_raw_to_voltage(calibration, adc_reading, &voltage);
-    #endif
 
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     if (calibration_scheme == ADC_CALI_SCHEME_VER_CURVE_FITTING) {

ports/espressif/common-hal/analogio/AnalogIn.c

@@ -56,7 +56,7 @@ typedef struct {
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
+static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status) {
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (status == ESP_NOW_SEND_SUCCESS) {
         self->send_success++;

ports/espressif/common-hal/espnow/ESPNow.c

@@ -20,6 +20,12 @@ CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM=y
 CONFIG_GPTIMER_ISR_IRAM_SAFE=y
 # end of GPTimer Configuration
 
+#
+# Touch Configuration
+#
+CONFIG_TOUCH_SUPPRESS_DEPRECATE_WARN=y
+# end of Touch Configuration
+
 # end of Driver Configurations
 
 #

ports/espressif/esp-idf

@@ -54,6 +54,8 @@ CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
 
 CIRCUITPY_PORT_SERIAL = 1
 
+CIRCUITPY_LIB_TLSF = 0
+
 # These modules are implemented in ports/<port>/common-hal:
 CIRCUITPY__EVE ?= 1
 CIRCUITPY_ALARM ?= 1

ports/espressif/esp-idf-config/sdkconfig.defaults

@@ -14,7 +14,7 @@
 
 #include "components/hal/include/hal/gpio_types.h"
 #include "components/hal/include/hal/adc_types.h"
-#include "components/hal/include/hal/touch_sensor_types.h"
+#include "components/hal/include/hal/touch_sensor_legacy_types.h"
 
 typedef struct {
     mp_obj_base_t base;