Update driver blobs (#410)

* Update driver blobs

* Update README.md

* Don't build embassy-bench for S2 in CI

* Don't build embassy-bench for S2 in CI

.github/workflows/ci.yml

@@ -97,7 +97,7 @@ jobs:
         if: ${{ matrix.chip != 'esp32h2' }}
         run: cd esp-wifi && cargo b${{ matrix.chip }} --release --example=embassy_dhcp --features=async,wifi,embassy-net,${{ matrix.chip }}-hal/embassy-time-timg0
       - name: build (embassy_bench)
-        if: ${{ matrix.chip != 'esp32h2' }}
+        if: ${{ matrix.chip != 'esp32h2'  && matrix.chip != 'esp32s2' }}
         run: cd esp-wifi && cargo b${{ matrix.chip }} --release --example=embassy_bench --features=async,wifi,embassy-net,${{ matrix.chip }}-hal/embassy-time-timg0
       - name: build (embassy_access_point)
         if: ${{ matrix.chip != 'esp32h2' }}

Cargo.toml

@@ -56,3 +56,14 @@ embedded-io-async = { version = "0.6.0" }
 
 futures-util = { version = "0.3.28", default-features = false, features = ["portable-atomic"] } # need this to activate portable-atomic on AtomicWaker even though we don't use it
 atomic-waker = { version = "1.1.2", default-features = false, features = ["portable-atomic"] } # need this to activate portable-atomic on AtomicWaker used by embedded-svc even though we don't use it
+
+[patch.crates-io]
+esp-hal-common = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp-hal-common" }
+esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c2-hal" }
+esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c3-hal" }
+esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c6-hal" }
+esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32h2-hal" }
+esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32-hal" }
+esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32s3-hal" }
+esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32s2-hal" }
+

esp-wifi-sys/headers/esp32/esp_bt.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

esp-wifi-sys/headers/esp32/sdkconfig.h

@@ -1,6 +1,6 @@
 /*
  * Automatically generated file. DO NOT EDIT.
- * Espressif IoT Development Framework (ESP-IDF) Configuration Header
+ * Espressif IoT Development Framework (ESP-IDF) 5.1.2 Configuration Header
  */
 #pragma once
 #define CONFIG_SOC_BROWNOUT_RESET_SUPPORTED "Not determined"
@@ -60,12 +60,13 @@
 #define CONFIG_SOC_ADC_RTC_MIN_BITWIDTH 9
 #define CONFIG_SOC_ADC_RTC_MAX_BITWIDTH 12
 #define CONFIG_SOC_SHARED_IDCACHE_SUPPORTED 1
+#define CONFIG_SOC_IDCACHE_PER_CORE 1
 #define CONFIG_SOC_CPU_CORES_NUM 2
 #define CONFIG_SOC_CPU_INTR_NUM 32
 #define CONFIG_SOC_CPU_HAS_FPU 1
 #define CONFIG_SOC_CPU_BREAKPOINTS_NUM 2
 #define CONFIG_SOC_CPU_WATCHPOINTS_NUM 2
-#define CONFIG_SOC_CPU_WATCHPOINT_SIZE 64
+#define CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE 64
 #define CONFIG_SOC_DAC_CHAN_NUM 2
 #define CONFIG_SOC_DAC_RESOLUTION 8
 #define CONFIG_SOC_DAC_DMA_16BIT_ALIGN 1
@@ -75,6 +76,7 @@
 #define CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK 0xEF0FEA
 #define CONFIG_SOC_I2C_NUM 2
 #define CONFIG_SOC_I2C_FIFO_LEN 32
+#define CONFIG_SOC_I2C_CMD_REG_NUM 16
 #define CONFIG_SOC_I2C_SUPPORT_SLAVE 1
 #define CONFIG_SOC_I2C_SUPPORT_APB 1
 #define CONFIG_SOC_I2S_NUM 2
@@ -210,6 +212,7 @@
 #define CONFIG_SOC_BT_CLASSIC_SUPPORTED 1
 #define CONFIG_SOC_BLUFI_SUPPORTED 1
 #define CONFIG_SOC_ULP_HAS_ADC 1
+#define CONFIG_SOC_PHY_COMBO_MODULE 1
 #define CONFIG_IDF_CMAKE 1
 #define CONFIG_IDF_TARGET_ARCH_XTENSA 1
 #define CONFIG_IDF_TARGET_ARCH "xtensa"
@@ -282,6 +285,7 @@
 #define CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE 0
 #define CONFIG_BT_GATTC_ENABLE 1
 #define CONFIG_BT_GATTC_MAX_CACHE_CHAR 40
+#define CONFIG_BT_GATTC_NOTIF_REG_MAX 5
 #define CONFIG_BT_GATTC_CONNECT_RETRY_COUNT 3
 #define CONFIG_BT_BLE_SMP_ENABLE 1
 #define CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING 1
@@ -370,6 +374,7 @@
 #define CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID 1
 #define CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT 1
 #define CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM 1
+#define CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM 1
 #define CONFIG_DAC_DMA_AUTO_16BIT_ALIGN 1
 #define CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4 1
 #define CONFIG_EFUSE_MAX_BLK_LEN 192
@@ -409,9 +414,10 @@
 #define CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR 1
 #define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR 1
 #define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES 4
-#define CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND 1
 #define CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND 1
-#define CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY 2000
+#define CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND 1
+#define CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY 2000
+#define CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS 1
 #define CONFIG_RTC_CLK_SRC_INT_RC 1
 #define CONFIG_RTC_CLK_CAL_CYCLES 1024
 #define CONFIG_PERIPH_CTRL_FUNC_IN_IRAM 1
@@ -473,6 +479,9 @@
 #define CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER 1
 #define CONFIG_ESP_WIFI_TX_BUFFER_TYPE 1
 #define CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM 32
+#define CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER 1
+#define CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF 0
+#define CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF 5
 #define CONFIG_ESP_WIFI_AMPDU_TX_ENABLED 1
 #define CONFIG_ESP_WIFI_TX_BA_WIN 6
 #define CONFIG_ESP_WIFI_AMPDU_RX_ENABLED 1
@@ -483,9 +492,14 @@
 #define CONFIG_ESP_WIFI_MGMT_SBUF_NUM 32
 #define CONFIG_ESP_WIFI_IRAM_OPT 1
 #define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
+#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
+#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
+#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
 #define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
 #define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
 #define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
+#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
+#define CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT 1
 #define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
 #define CONFIG_FATFS_VOLUME_COUNT 2
 #define CONFIG_FATFS_LFN_NONE 1
@@ -523,17 +537,17 @@
 #define CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM 1
 #define CONFIG_HEAP_POISONING_DISABLED 1
 #define CONFIG_HEAP_TRACING_OFF 1
-#define CONFIG_IEEE802154_CCA_THRESHOLD -60
-#define CONFIG_IEEE802154_PENDING_TABLE_SIZE 20
 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1
 #define CONFIG_LOG_DEFAULT_LEVEL 3
 #define CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT 1
 #define CONFIG_LOG_MAXIMUM_LEVEL 3
 #define CONFIG_LOG_COLORS 1
 #define CONFIG_LOG_TIMESTAMP_SOURCE_RTOS 1
 #define CONFIG_LWIP_LOCAL_HOSTNAME "espressif"
+#define CONFIG_LWIP_TCPIP_TASK_PRIO 18
 #define CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES 1
 #define CONFIG_LWIP_TIMERS_ONDEMAND 1
+#define CONFIG_LWIP_ND6 1
 #define CONFIG_LWIP_MAX_SOCKETS 10
 #define CONFIG_LWIP_SO_REUSE 1
 #define CONFIG_LWIP_SO_REUSE_RXTOALL 1
@@ -567,10 +581,12 @@
 #define CONFIG_LWIP_TCP_TMR_INTERVAL 250
 #define CONFIG_LWIP_TCP_MSL 60000
 #define CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT 20000
-#define CONFIG_LWIP_TCP_SND_BUF_DEFAULT 5744
-#define CONFIG_LWIP_TCP_WND_DEFAULT 5744
+#define CONFIG_LWIP_TCP_SND_BUF_DEFAULT 5760
+#define CONFIG_LWIP_TCP_WND_DEFAULT 5760
 #define CONFIG_LWIP_TCP_RECVMBOX_SIZE 6
 #define CONFIG_LWIP_TCP_QUEUE_OOSEQ 1
+#define CONFIG_LWIP_TCP_OOSEQ_TIMEOUT 6
+#define CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS 4
 #define CONFIG_LWIP_TCP_OVERSIZE_MSS 1
 #define CONFIG_LWIP_TCP_RTO_TIME 1500
 #define CONFIG_LWIP_MAX_UDP_PCBS 16
@@ -590,6 +606,7 @@
 #define CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT 1
 #define CONFIG_LWIP_HOOK_IP6_ROUTE_NONE 1
 #define CONFIG_LWIP_HOOK_ND6_GET_GW_NONE 1
+#define CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_NONE 1
 #define CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE 1
 #define CONFIG_LWIP_HOOK_IP6_INPUT_NONE 1
 #define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
@@ -601,6 +618,7 @@
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE 1
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL 1
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS 200
+#define CONFIG_MBEDTLS_CMAC_C 1
 #define CONFIG_MBEDTLS_HARDWARE_AES 1
 #define CONFIG_MBEDTLS_HARDWARE_MPI 1
 #define CONFIG_MBEDTLS_HARDWARE_SHA 1
@@ -646,13 +664,22 @@
 #define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
 #define CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED 1
 #define CONFIG_MBEDTLS_ECP_NIST_OPTIM 1
+#define CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM 1
 #define CONFIG_MQTT_PROTOCOL_311 1
 #define CONFIG_MQTT_TRANSPORT_SSL 1
 #define CONFIG_MQTT_TRANSPORT_WEBSOCKET 1
 #define CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE 1
 #define CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF 1
 #define CONFIG_NEWLIB_STDIN_LINE_ENDING_CR 1
 #define CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT 1
+#define CONFIG_OPENTHREAD_NETWORK_NAME "OpenThread-ESP"
+#define CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX "fd00:db8:a0:0::/64"
+#define CONFIG_OPENTHREAD_NETWORK_CHANNEL 15
+#define CONFIG_OPENTHREAD_NETWORK_PANID 0x1234
+#define CONFIG_OPENTHREAD_NETWORK_EXTPANID "dead00beef00cafe"
+#define CONFIG_OPENTHREAD_NETWORK_MASTERKEY "00112233445566778899aabbccddeeff"
+#define CONFIG_OPENTHREAD_NETWORK_PSKC "104810e2315100afd6bc9215a6bfac53"
+#define CONFIG_OPENTHREAD_XTAL_ACCURACY 130
 #define CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0 1
 #define CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1 1
 #define CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 1
@@ -703,6 +730,7 @@
 #define CONFIG_VFS_SUPPORT_SELECT 1
 #define CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT 1
 #define CONFIG_VFS_SUPPORT_TERMIOS 1
+#define CONFIG_VFS_MAX_COUNT 8
 #define CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS 1
 #define CONFIG_WL_SECTOR_SIZE_4096 1
 #define CONFIG_WL_SECTOR_SIZE 4096
@@ -767,7 +795,7 @@
 #define CONFIG_ESP32_BROWNOUT_DET_LVL CONFIG_ESP_BROWNOUT_DET_LVL
 #define CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0 CONFIG_ESP_BROWNOUT_DET_LVL_SEL_0
 #define CONFIG_ESP32_DEBUG_OCDAWARE CONFIG_ESP_DEBUG_OCDAWARE
-#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY
+#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_160 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160
 #define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE CONFIG_ESP_COREDUMP_ENABLE_TO_NONE
@@ -790,6 +818,7 @@
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
 #define CONFIG_ESP32_WIFI_ENABLED CONFIG_ESP_WIFI_ENABLED
+#define CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
 #define CONFIG_ESP32_WIFI_IRAM_OPT CONFIG_ESP_WIFI_IRAM_OPT
 #define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM CONFIG_ESP_WIFI_MGMT_SBUF_NUM
 #define CONFIG_ESP32_WIFI_NVS_ENABLED CONFIG_ESP_WIFI_NVS_ENABLED
@@ -804,6 +833,7 @@
 #define CONFIG_ESP32_XTAL_FREQ CONFIG_XTAL_FREQ
 #define CONFIG_ESP32_XTAL_FREQ_40 CONFIG_XTAL_FREQ_40
 #define CONFIG_ESP_GRATUITOUS_ARP CONFIG_LWIP_ESP_GRATUITOUS_ARP
+#define CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY
 #define CONFIG_ESP_TASK_WDT CONFIG_ESP_TASK_WDT_INIT
 #define CONFIG_ESP_WIFI_SW_COEXIST_ENABLE CONFIG_ESP_COEX_SW_COEXIST_ENABLE
 #define CONFIG_FLASHMODE_DIO CONFIG_ESPTOOLPY_FLASHMODE_DIO
@@ -881,3 +911,4 @@
 #define CONFIG_TIMER_TASK_STACK_DEPTH CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH
 #define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
 #define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
+#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO