Skip to content

Commit 97d217a

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into esp32-analogin
2 parents 7386a94 + 4bec776 commit 97d217a

24 files changed

Lines changed: 843 additions & 23 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155-
url = https://github.com/hierophect/esp-idf.git
155+
url = https://github.com/espressif/esp-idf.git

‎ports/atmel-samd/common-hal/canio/CAN.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ typedef struct canio_can_obj {
4141
mp_obj_base_t base;
4242
Can *hw;
4343
canio_can_state_t *state;
44-
volatile uint32_t error_warning_state_count;
45-
volatile uint32_t error_passive_state_count;
46-
volatile uint32_t bus_off_state_count;
4744
int baudrate;
4845
uint8_t rx_pin_number:8;
4946
uint8_t tx_pin_number:8;

‎ports/esp32s2/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ menuconfig: $(BUILD)/esp-idf/config
271271
# qstr builds include headers so we need to make sure they are up to date
272272
$(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
273273

274-
# Order here matters
275-
ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
274+
ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
276275

277276
ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
278277

@@ -284,11 +283,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
284283
MBEDTLS_COMPONENTS_LINK = crypto tls x509
285284
MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
286285

287-
BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
286+
BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
288287
BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
289288
BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
290289

291-
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libhal.a
290+
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libxt_hal.a
292291
ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
293292

294293
FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)

‎ports/esp32s2/common-hal/analogio/AnalogIn.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 "components/soc/include/hal/adc_types.h"
32+
#include "components/hal/include/hal/adc_types.h"
3333
#include "FreeRTOS.h"
3434
#include "freertos/semphr.h"
3535
#include "py/obj.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 "components/soc/include/hal/i2c_types.h"
32+
#include "components/hal/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.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 "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"
33+
#include "components/hal/include/hal/spi_hal.h"
34+
#include "components/hal/include/hal/spi_types.h"
3535
#include "py/obj.h"
3636

3737
typedef struct {

‎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 "components/soc/include/hal/uart_types.h"
32+
#include "components/hal/include/hal/uart_types.h"
3333
#include "py/obj.h"
3434

3535
typedef struct {

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

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

3131
#include "components/driver/include/driver/gpio.h"
3232

33-
#include "components/soc/include/hal/gpio_hal.h"
33+
#include "components/hal/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "py/mphal.h"
3333

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

3737
#ifdef MICROPY_HW_NEOPIXEL
3838
bool neopixel_in_use;

‎ports/esp32s2/esp-idf‎

Submodule esp-idf updated 662 files

0 commit comments

Comments
 (0)