Skip to content

Commit 8c428a3

Browse files
tannewttannewt
authored
Merge pull request #3492 from hierophect/esp32-update-idf
ESP32S2: move to official IDF submodule
2 parents 945f7f2 + 0d7552b commit 8c428a3

File tree

39 files changed

+85
-79
lines changed

39 files changed

+85
-79
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@
144144
[submodule "frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center"]
145145
path = frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
146146
url = https://github.com/adafruit/Adafruit_CircuitPython_BLE_Apple_Notification_Center
147-
[submodule "ports/esp32s2/esp-idf"]
148-
path = ports/esp32s2/esp-idf
149-
url = https://github.com/tannewt/esp-idf.git
150147
[submodule "frozen/Adafruit_CircuitPython_RFM9x"]
151148
path = frozen/Adafruit_CircuitPython_RFM9x
152149
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM9x.git
153150
[submodule "frozen/Adafruit_CircuitPython_RFM69"]
154151
path = frozen/Adafruit_CircuitPython_RFM69
155152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153+
[submodule "ports/esp32s2/esp-idf"]
154+
path = ports/esp32s2/esp-idf
155+
url = https://github.com/hierophect/esp-idf.git

‎ports/esp32s2/Makefile

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,36 @@ INC += -I./peripherals
7373
INC += -I../../lib/mp-readline
7474
INC += -I../../lib/tinyusb/src
7575
INC += -I../../supervisor/shared/usb
76-
INC += -Iesp-idf/components/freertos/include/freertos
77-
INC += -Iesp-idf/components/freertos/xtensa/include
78-
INC += -Iesp-idf/components/esp32s2/include
79-
INC += -Iesp-idf/components/xtensa/esp32s2/include
80-
INC += -Iesp-idf/components/esp_common/include
81-
INC += -Iesp-idf/components/esp_event/include
82-
INC += -Iesp-idf/components/esp_netif/include
83-
INC += -Iesp-idf/components/esp_ringbuf/include
84-
INC += -Iesp-idf/components/esp_rom/include
85-
INC += -Iesp-idf/components/esp_wifi/include
86-
INC += -Iesp-idf/components/xtensa/include
87-
INC += -Iesp-idf/components/esp_timer/include
88-
INC += -Iesp-idf/components/mbedtls/mbedtls/include
89-
INC += -Iesp-idf/components/mbedtls/port/include/
90-
INC += -Iesp-idf/components/newlib/platform_include
91-
INC += -Iesp-idf/components/lwip/lwip/src/include
92-
INC += -Iesp-idf/components/lwip/port/esp32/include
93-
INC += -Iesp-idf/components/lwip/include/apps/sntp
94-
INC += -Iesp-idf/components/soc/include
95-
INC += -Iesp-idf/components/soc/src/esp32s2/include
96-
INC += -Iesp-idf/components/soc/soc/include
97-
INC += -Iesp-idf/components/soc/soc/esp32s2/include
98-
INC += -Iesp-idf/components/heap/include
99-
INC += -Iesp-idf/components/esp_system/include
76+
77+
INC += -isystem esp-idf
78+
INC += -isystem esp-idf/components/driver/include
79+
INC += -isystem esp-idf/components/freertos/include/freertos
80+
INC += -isystem esp-idf/components/freertos/xtensa/include
81+
INC += -isystem esp-idf/components/esp32s2/include
82+
INC += -isystem esp-idf/components/xtensa/esp32s2/include
83+
INC += -isystem esp-idf/components/esp_common/include
84+
INC += -isystem esp-idf/components/esp_event/include
85+
INC += -isystem esp-idf/components/esp_netif/include
86+
INC += -isystem esp-idf/components/esp_ringbuf/include
87+
INC += -isystem esp-idf/components/esp_rom/include
88+
INC += -isystem esp-idf/components/esp_wifi/include
89+
INC += -isystem esp-idf/components/xtensa/include
90+
INC += -isystem esp-idf/components/esp_timer/include
91+
INC += -isystem esp-idf/components/mbedtls/mbedtls/include
92+
INC += -isystem esp-idf/components/mbedtls/port/include/
93+
INC += -isystem esp-idf/components/newlib/platform_include
94+
INC += -isystem esp-idf/components/lwip/lwip/src/include
95+
INC += -isystem esp-idf/components/lwip/port/esp32/include
96+
INC += -isystem esp-idf/components/lwip/include/apps/sntp
97+
INC += -isystem esp-idf/components/hal/include
98+
INC += -isystem esp-idf/components/hal/esp32s2/include
99+
INC += -isystem esp-idf/components/log/include/
100+
INC += -isystem esp-idf/components/soc/include
101+
INC += -isystem esp-idf/components/soc/src/esp32s2/include
102+
INC += -isystem esp-idf/components/soc/soc/include
103+
INC += -isystem esp-idf/components/soc/soc/esp32s2/include
104+
INC += -isystem esp-idf/components/heap/include
105+
INC += -isystem esp-idf/components/esp_system/include
100106
INC += -I$(BUILD)/esp-idf/config
101107

102108
CFLAGS += -DHAVE_CONFIG_H \

‎ports/esp32s2/bindings/espidf/__init__.c

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

3030
#include "bindings/espidf/__init__.h"
3131

32-
#include "esp-idf/components/heap/include/esp_heap_caps.h"
32+
#include "components/heap/include/esp_heap_caps.h"
3333

3434
//| """Direct access to a few ESP-IDF details. This module *should not* include any functionality
3535
//| that could be implemented by other frameworks. It should only include ESP-IDF specific

‎ports/esp32s2/common-hal/busio/I2C.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "py/mperrno.h"
2929
#include "py/runtime.h"
3030

31-
#include "driver/i2c.h"
31+
#include "components/driver/include/driver/i2c.h"
3232

3333
#include "shared-bindings/microcontroller/__init__.h"
3434
#include "shared-bindings/microcontroller/Pin.h"

‎ports/esp32s2/common-hal/busio/I2C.h

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

3030
#include "common-hal/microcontroller/Pin.h"
3131

32-
#include "esp-idf/components/soc/include/hal/i2c_types.h"
32+
#include "components/soc/include/hal/i2c_types.h"
3333
#include "FreeRTOS.h"
3434
#include "freertos/semphr.h"
3535
#include "py/obj.h"

‎ports/esp32s2/common-hal/busio/SPI.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
266266
self->bits = bits;
267267
self->target_frequency = baudrate;
268268
self->hal_context.timing_conf = &self->timing_conf;
269-
esp_err_t result = spi_hal_get_clock_conf(&self->hal_context,
269+
esp_err_t result = spi_hal_cal_clock_conf(&self->hal_context,
270270
self->target_frequency,
271271
128 /* duty_cycle */,
272272
self->connected_through_gpio,

‎ports/esp32s2/common-hal/busio/SPI.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
#include "common-hal/microcontroller/Pin.h"
3131

32-
#include "esp-idf/components/driver/include/driver/spi_common_internal.h"
33-
#include "esp-idf/components/soc/include/hal/spi_hal.h"
34-
#include "esp-idf/components/soc/include/hal/spi_types.h"
32+
#include "components/driver/include/driver/spi_common_internal.h"
33+
#include "components/soc/include/hal/spi_hal.h"
34+
#include "components/soc/include/hal/spi_types.h"
3535
#include "py/obj.h"
3636

3737
typedef struct {

‎ports/esp32s2/common-hal/busio/UART.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "shared-bindings/microcontroller/__init__.h"
2828
#include "shared-bindings/busio/UART.h"
2929

30-
#include "driver/uart.h"
30+
#include "components/driver/include/driver/uart.h"
3131

3232
#include "mpconfigport.h"
3333
#include "lib/utils/interrupt_char.h"

‎ports/esp32s2/common-hal/busio/UART.h

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

3030
#include "common-hal/microcontroller/Pin.h"
3131

32-
#include "esp-idf/components/soc/include/hal/uart_types.h"
32+
#include "components/soc/include/hal/uart_types.h"
3333
#include "py/obj.h"
3434

3535
typedef struct {

‎ports/esp32s2/common-hal/digitalio/DigitalInOut.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "py/runtime.h"
2929
#include "supervisor/shared/translate.h"
3030

31-
#include "driver/gpio.h"
31+
#include "components/driver/include/driver/gpio.h"
3232

33-
#include "esp-idf/components/soc/include/hal/gpio_hal.h"
33+
#include "components/soc/include/hal/gpio_hal.h"
3434

3535
void common_hal_digitalio_digitalinout_never_reset(
3636
digitalio_digitalinout_obj_t *self) {

‎ports/esp32s2/common-hal/microcontroller/Pin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
#include "py/mphal.h"
3333

34-
#include "esp-idf/components/driver/include/driver/gpio.h"
35-
#include "esp-idf/components/soc/include/hal/gpio_hal.h"
34+
#include "components/driver/include/driver/gpio.h"
35+
#include "components/soc/include/hal/gpio_hal.h"
3636

3737
#ifdef MICROPY_HW_NEOPIXEL
3838
bool neopixel_in_use;

‎ports/esp32s2/common-hal/microcontroller/Processor.c

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

3535
#include "soc/efuse_reg.h"
3636

37-
#include "esp-idf/components/driver/esp32s2/include/driver/temp_sensor.h"
37+
#include "components/driver/esp32s2/include/driver/temp_sensor.h"
3838

3939
float common_hal_mcu_processor_get_temperature(void) {
4040
float tsens_out;

‎ports/esp32s2/common-hal/neopixel_write/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
#include "py/mphal.h"
4444
#include "py/runtime.h"
4545
#include "shared-bindings/neopixel_write/__init__.h"
46-
#include "driver/rmt.h"
47-
#include "rmt.h"
46+
#include "components/driver/include/driver/rmt.h"
47+
#include "peripherals/rmt.h"
4848

4949
#define WS2812_T0H_NS (350)
5050
#define WS2812_T0L_NS (1000)

‎ports/esp32s2/common-hal/pulseio/PulseIn.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "common-hal/microcontroller/Pin.h"
3131

3232
#include "py/obj.h"
33-
#include "driver/rmt.h"
34-
#include "rmt.h"
33+
#include "components/driver/include/driver/rmt.h"
34+
#include "peripherals/rmt.h"
3535

3636
typedef struct {
3737
mp_obj_base_t base;

‎ports/esp32s2/common-hal/pulseio/PulseOut.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PULSEIO_PULSEOUT_H
2929

3030
#include "common-hal/microcontroller/Pin.h"
31-
#include "driver/rmt.h"
32-
#include "rmt.h"
31+
#include "components/driver/include/driver/rmt.h"
32+
#include "peripherals/rmt.h"
3333

3434
#include "py/obj.h"
3535

‎ports/esp32s2/common-hal/pwmio/PWMOut.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "common-hal/pwmio/PWMOut.h"
2929
#include "shared-bindings/pwmio/PWMOut.h"
3030
#include "py/runtime.h"
31-
#include "driver/ledc.h"
31+
#include "components/driver/include/driver/ledc.h"
3232

3333
#define INDEX_EMPTY 0xFF
3434

‎ports/esp32s2/common-hal/pwmio/PWMOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PWMIO_PWMOUT_H
2929

3030
#include "common-hal/microcontroller/Pin.h"
31-
#include "driver/ledc.h"
31+
#include "components/driver/include/driver/ledc.h"
3232

3333
typedef struct {
3434
mp_obj_base_t base;

‎ports/esp32s2/common-hal/rtc/RTC.c

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

2929
#include "py/obj.h"
3030
#include "py/runtime.h"
31-
#include "soc/rtc_periph.h"
31+
#include "components/soc/soc/include/soc/rtc_periph.h"
3232
#include "shared-bindings/rtc/RTC.h"
3333

3434
void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {

‎ports/esp32s2/common-hal/socketpool/Socket.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include "common-hal/socketpool/SocketPool.h"
3333
#include "common-hal/ssl/SSLContext.h"
3434

35-
#include "esp-idf/components/esp-tls/esp_tls.h"
35+
#include "components/esp-tls/esp_tls.h"
36+
#include "components/log/include/esp_log.h"
3637

3738
typedef struct {
3839
mp_obj_base_t base;

‎ports/esp32s2/common-hal/socketpool/SocketPool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "py/runtime.h"
3030
#include "shared-bindings/wifi/__init__.h"
3131

32-
#include "esp-idf/components/lwip/lwip/src/include/lwip/netdb.h"
32+
#include "components/lwip/lwip/src/include/lwip/netdb.h"
3333

3434
#include "bindings/espidf/__init__.h"
3535

‎ports/esp32s2/common-hal/ssl/SSLContext.h

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

3030
#include "py/obj.h"
3131

32-
#include "esp-idf/components/esp-tls/esp_tls.h"
32+
#include "components/esp-tls/esp_tls.h"
3333

3434
typedef struct {
3535
mp_obj_base_t base;

‎ports/esp32s2/common-hal/ssl/__init__.c

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

2727
#include "shared-bindings/ssl/SSLContext.h"
2828

29-
#include "esp-idf/components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h"
29+
#include "components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h"
3030

3131
void common_hal_ssl_create_default_context(ssl_sslcontext_obj_t* self) {
3232
memset(&self->ssl_config, 0, sizeof(esp_tls_cfg_t));

‎ports/esp32s2/common-hal/wifi/Network.h

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

3030
#include "py/obj.h"
3131

32-
#include "esp-idf/components/esp_wifi/include/esp_wifi_types.h"
32+
#include "components/esp_wifi/include/esp_wifi_types.h"
3333

3434
typedef struct {
3535
mp_obj_base_t base;

‎ports/esp32s2/common-hal/wifi/Radio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "shared-bindings/wifi/ScannedNetworks.h"
3636
#include "shared-module/ipaddress/__init__.h"
3737

38-
#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
39-
#include "esp-idf/components/lwip/include/apps/ping/ping_sock.h"
38+
#include "components/esp_wifi/include/esp_wifi.h"
39+
#include "components/lwip/include/apps/ping/ping_sock.h"
4040

4141
static void start_station(wifi_radio_obj_t *self) {
4242
if (self->sta_mode) {

‎ports/esp32s2/common-hal/wifi/Radio.h

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

3030
#include "py/obj.h"
3131

32-
#include "esp-idf/components/esp_event/include/esp_event.h"
32+
#include "components/esp_event/include/esp_event.h"
3333

3434
#include "shared-bindings/wifi/ScannedNetworks.h"
3535

‎ports/esp32s2/common-hal/wifi/ScannedNetworks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "shared-bindings/wifi/Radio.h"
3838
#include "shared-bindings/wifi/ScannedNetworks.h"
3939

40-
#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
40+
#include "components/esp_wifi/include/esp_wifi.h"
4141

4242
static void wifi_scannednetworks_done(wifi_scannednetworks_obj_t *self) {
4343
self->done = true;

‎ports/esp32s2/common-hal/wifi/ScannedNetworks.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
#include "FreeRTOS.h"
3636
#include "freertos/event_groups.h"
3737

38-
#include "esp-idf/components/esp_wifi/include/esp_wifi_types.h"
38+
#include "components/esp_wifi/include/esp_wifi_types.h"
39+
#include "components/log/include/esp_log.h"
3940

4041
typedef struct {
4142
mp_obj_base_t base;

‎ports/esp32s2/common-hal/wifi/__init__.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
3131

3232
#include "py/runtime.h"
3333

34-
#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
34+
#include "components/esp_wifi/include/esp_wifi.h"
3535

36-
#include "esp-idf/components/heap/include/esp_heap_caps.h"
36+
#include "components/heap/include/esp_heap_caps.h"
3737

3838
wifi_radio_obj_t common_hal_wifi_radio_obj;
3939

40-
#include "esp_log.h"
40+
#include "components/log/include/esp_log.h"
41+
4142
static const char* TAG = "wifi";
4243

4344
static void event_handler(void* arg, esp_event_base_t event_base,

‎ports/esp32s2/esp-idf

Submodule esp-idf updated 526 files

‎ports/esp32s2/mphalport.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "py/mpstate.h"
3232
#include "py/gc.h"
3333

34-
#include "esp-idf/components/xtensa/include/esp_debug_helpers.h"
35-
#include "esp-idf/components/esp_rom/include/esp32s2/rom/ets_sys.h"
34+
#include "components/xtensa/include/esp_debug_helpers.h"
35+
#include "components/esp_rom/include/esp32s2/rom/ets_sys.h"
3636

3737
void mp_hal_delay_us(mp_uint_t delay) {
3838
ets_delay_us(delay);

‎ports/esp32s2/peripherals/pins.h

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

3535
#include "esp32s2_peripherals_config.h"
3636
#include "esp-idf/config/sdkconfig.h"
37-
#include "esp-idf/components/soc/include/hal/gpio_types.h"
37+
#include "components/soc/include/hal/gpio_types.h"
3838

3939
typedef struct {
4040
PIN_PREFIX_FIELDS

‎ports/esp32s2/peripherals/rmt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "rmt.h"
27+
#include "peripherals/rmt.h"
2828
#include "py/runtime.h"
2929

3030
bool rmt_reserved_channels[RMT_CHANNEL_MAX];

‎ports/esp32s2/peripherals/rmt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_RMT_H
2929

3030
#include "py/mphal.h"
31-
#include "driver/rmt.h"
31+
#include "components/driver/include/driver/rmt.h"
3232
#include <stdint.h>
3333

3434
void esp32s2_peripherals_rmt_reset(void);

‎ports/esp32s2/supervisor/internal_flash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "py/runtime.h"
3838
#include "lib/oofatfs/ff.h"
3939

40-
#include "esp-idf/components/spi_flash/include/esp_partition.h"
40+
#include "components/spi_flash/include/esp_partition.h"
4141

4242
#include "supervisor/usb.h"
4343

‎ports/esp32s2/supervisor/port.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
#include "shared-bindings/rtc/__init__.h"
4747

4848
#include "peripherals/rmt.h"
49-
#include "esp-idf/components/heap/include/esp_heap_caps.h"
50-
#include "esp-idf/components/soc/soc/esp32s2/include/soc/cache_memory.h"
49+
#include "components/heap/include/esp_heap_caps.h"
50+
#include "components/soc/soc/esp32s2/include/soc/cache_memory.h"
5151

5252
#define HEAP_SIZE (48 * 1024)
5353

0 commit comments

Comments
 (0)