Skip to content

Commit 17adee5

Browse files
committed
Update to ESP IDF 5.5.1
1 parent 11ecd40 commit 17adee5

File tree

16 files changed

+48
-27
lines changed

16 files changed

+48
-27
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.4.1
146+
branch = circuitpython-v5.5.1
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/adafruit/esp-protocols.git

lib/tinyusb

Submodule tinyusb updated 49 files

ports/espressif/Makefile

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ INC += \
6464
-isystem esp-idf/components/esp_driver_i2s/include \
6565
-isystem esp-idf/components/esp_driver_$(IDF_TARGET)/include \
6666
-isystem esp-idf/components/esp_driver_ledc/include \
67+
-isystem esp-idf/components/esp_driver_parlio/include \
6768
-isystem esp-idf/components/esp_driver_pcnt/include \
6869
-isystem esp-idf/components/esp_driver_rmt/include \
6970
-isystem esp-idf/components/esp_driver_sdio/include \
@@ -149,20 +150,26 @@ CFLAGS += -DSTACK_CANARY_VALUE=0xa5a5a5a5
149150
REGISTRATION_FUNCTIONS = \
150151
-u ld_include_highint_hdl \
151152
-u __cxx_fatal_exception \
153+
-u __cxx_init_dummy \
154+
-u __cxa_guard_dummy \
152155
-u esp_app_desc \
153156
-u esp_timer_init_include_func \
154157
-u uart_vfs_include_dev_init \
155158
-u esp_vfs_include_console_register \
156159
-u __ubsan_include \
157160
-u esp_system_include_startup_funcs \
158161
-u esp_efuse_startup_include_func \
159-
-u newlib_include_heap_impl \
160-
-u newlib_include_syscalls_impl \
161-
-u newlib_include_pthread_impl \
162-
-u newlib_include_assert_impl \
163-
-u newlib_include_init_funcs \
162+
-u esp_libc_include_heap_impl \
163+
-u esp_libc_include_reent_syscalls_impl \
164+
-u esp_libc_include_syscalls_impl \
165+
-u esp_libc_include_pthread_impl \
166+
-u esp_libc_include_assert_impl \
167+
-u esp_libc_include_getentropy_impl \
168+
-u esp_libc_include_init_funcs \
169+
-u esp_libc_init_funcs \
164170
-u include_esp_phy_override \
165-
-u vfs_include_syscalls_impl
171+
-u vfs_include_syscalls_impl \
172+
-u esp_vfs_include_nullfs_register
166173

167174

168175
#Debugging/Optimization
@@ -222,7 +229,6 @@ else ifeq ($(IDF_TARGET_ARCH),riscv)
222229
-Trom.api.ld
223230
endif
224231

225-
$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
226232

227233
LDFLAGS += $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
228234

@@ -244,7 +250,9 @@ LDFLAGS += \
244250
ifeq ($(IDF_TARGET),esp32)
245251
LDFLAGS += \
246252
-Tesp32.rom.newlib-data.ld \
247-
-Tesp32.rom.newlib-funcs.ld \
253+
-Tesp32.rom.syscalls.ld \
254+
-Tesp32.rom.libc-funcs.ld \
255+
-Tesp32.rom.newlib-reent-funcs.ld \
248256
-Tesp32.rom.spiflash_legacy.ld
249257

250258
CHIP_COMPONENTS = \
@@ -280,7 +288,9 @@ LDFLAGS += \
280288
-Tesp32c6.rom.phy.ld \
281289
-Tesp32c6.rom.pp.ld \
282290
-Tesp32c6.rom.net80211.ld \
291+
-Tesp32c6.rom.libc.ld \
283292
-Tesp32c6.rom.newlib.ld \
293+
-Tesp32c6.rom.spiflash.ld \
284294
-Tesp32c6.rom.coexist.ld \
285295
-Tesp32c6.rom.heap.ld \
286296
-Tesp32c6.rom.systimer.ld \
@@ -312,8 +322,9 @@ CHIP_COMPONENTS = \
312322

313323
else ifeq ($(IDF_TARGET),esp32s2)
314324
LDFLAGS += \
325+
-Tesp32s2.rom.libc-funcs.ld \
315326
-Tesp32s2.rom.newlib-data.ld \
316-
-Tesp32s2.rom.newlib-funcs.ld \
327+
-Tesp32s2.rom.newlib-reent-funcs.ld \
317328
-Tesp32s2.rom.spiflash_legacy.ld
318329

319330
CHIP_COMPONENTS = \
@@ -782,7 +793,7 @@ endif
782793

783794
IDF_CMAKE_TARGETS = \
784795
bootloader/bootloader.bin \
785-
esp-idf/esp_system/__ldgen_output_sections.ld \
796+
__ldgen_output_sections.ld \
786797
$(foreach component, $(ESP_IDF_COMPONENTS_LINK), esp-idf/$(component)/lib$(component).a)
787798

788799
PARTITION_TABLE_OFFSET = 0x8000

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414

1515
#include "esp_sleep.h"
1616
#include "hal/gpio_ll.h"
17+
#include "driver/gpio.h"
1718
#include "esp_debug_helpers.h"
1819

1920
#ifdef SOC_PM_SUPPORT_EXT0_WAKEUP
2021
#include "soc/rtc_cntl_reg.h"
22+
#include "soc/rtc_io_reg.h"
2123
#endif
2224

2325
#include "driver/rtc_io.h"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
8686

8787
adc_cali_scheme_ver_t supported_schemes;
8888
adc_cali_check_scheme(&supported_schemes);
89-
#ifndef CONFIG_IDF_TARGET_ESP32P4
9089
adc_cali_scheme_ver_t calibration_scheme = 0;
9190
adc_cali_handle_t calibration;
92-
#endif
9391
#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
9492
adc_cali_curve_fitting_config_t config = {
9593
.unit_id = self->pin->adc_index,
@@ -137,11 +135,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
137135

138136
// This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
139137
int voltage;
140-
#ifdef CONFIG_IDF_TARGET_ESP32P4
141-
voltage = 0;
142-
#else
143138
adc_cali_raw_to_voltage(calibration, adc_reading, &voltage);
144-
#endif
145139

146140
#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
147141
if (calibration_scheme == ADC_CALI_SCHEME_VER_CURVE_FITTING) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef struct {
5656
// Callback triggered when a sent packet is acknowledged by the peer (or not).
5757
// Just count the number of responses and number of failures.
5858
// These are used in the send() logic.
59-
static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
59+
static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status) {
6060
espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
6161
if (status == ESP_NOW_SEND_SUCCESS) {
6262
self->send_success++;

ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "common-hal/microcontroller/Pin.h"
1919
#include "py/runtime.h"
2020

21-
#include "driver/gpio.h"
21+
#include <driver/gpio.h>
2222

2323
/*
2424
* Current pin limitations for ESP32-S2 ParallelBus:

ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "common-hal/digitalio/DigitalInOut.h"
1010

11-
#include "esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h"
11+
#include <esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h>
1212

1313
typedef struct {
1414
mp_obj_base_t base;

ports/espressif/esp-idf

Submodule esp-idf updated 7265 files

0 commit comments

Comments
 (0)