From 35771eed0eacbed048ec030c3a41da8f9496a7cf Mon Sep 17 00:00:00 2001 From: "wangtao@espressif.com" Date: Fri, 17 Jan 2025 19:15:50 +0800 Subject: [PATCH 1/9] fix(wifi): fix max idle period 1 issue --- components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld index 7362e8be00..dcc07aab80 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld @@ -122,7 +122,7 @@ pm_local_tsf_process = 0x40000cd4; pm_set_beacon_filter = 0x40000cd8; pm_is_in_wifi_slice_threshold = 0x40000cdc; pm_is_waked = 0x40000ce0; -pm_keep_alive = 0x40000ce4; +//pm_keep_alive = 0x40000ce4; pm_on_beacon_rx = 0x40000ce8; pm_on_data_rx = 0x40000cec; pm_on_data_tx = 0x40000cf0; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index dfbd8b0145..de73fd85d6 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit dfbd8b0145a604bcd4c0b57feff18cd1e62197cb +Subproject commit de73fd85d6023be1f0aabe06a88ce7c99bde6e42 From df4667849c5706291fe1bc7cc4f288bc6dd7f57d Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 23 Jan 2025 15:58:26 +0800 Subject: [PATCH 2/9] fix(wifi): fix wep shared auth connect fail issue --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index de73fd85d6..ef0b83bddb 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit de73fd85d6023be1f0aabe06a88ce7c99bde6e42 +Subproject commit ef0b83bddbe4647837e3c0a31dc699966796c080 From b565bbdbaba2869f9393dd1543ed88d12220cef3 Mon Sep 17 00:00:00 2001 From: Sarvesh Bodakhe Date: Thu, 23 Jan 2025 15:32:34 +0530 Subject: [PATCH 3/9] fix(wifi): Fix stack overflow when failure_retry_cnt is set Fix issue of increased stack usage when failure_retry_cnt is set and wifi driver internally retries connection attempts --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index ef0b83bddb..196459bdee 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit ef0b83bddbe4647837e3c0a31dc699966796c080 +Subproject commit 196459bdee76b91a4c020785e7280a38582c3395 From 0a33f8fda0541fb77c19f37ecb2c882e89aec931 Mon Sep 17 00:00:00 2001 From: Sarvesh Bodakhe Date: Fri, 24 Jan 2025 13:17:03 +0530 Subject: [PATCH 4/9] fix(wifi): Fix crash when failure_retry_cnt is set in station config Fixes the regression introduced by 21c2bef602a09ad63f331a788416149484390d80 --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 196459bdee..ca860ab163 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 196459bdee76b91a4c020785e7280a38582c3395 +Subproject commit ca860ab1637410e11c660dd6a31333411bf4715e From 50e700792b3127ff0d7fc5b2a5165a09cb64dbf3 Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Mon, 10 Feb 2025 16:56:46 +0530 Subject: [PATCH 5/9] fix(esp_wifi): Check SSID from Assoc Req before starting SA Query --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index ca860ab163..3e488b625e 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit ca860ab1637410e11c660dd6a31333411bf4715e +Subproject commit 3e488b625eb76692aa8ada263e4da629d71542f8 From afab2130fd3f58c7eab3014c48fef3d6d3b56b7c Mon Sep 17 00:00:00 2001 From: Linda Date: Mon, 20 Jan 2025 17:51:26 +0800 Subject: [PATCH 6/9] docs: update the API description for esp-wifi_scan_get_ap_records --- components/esp_wifi/include/esp_wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index cce6afaa9c..c1205a8ab1 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -583,7 +583,7 @@ esp_err_t esp_wifi_scan_stop(void); esp_err_t esp_wifi_scan_get_ap_num(uint16_t *number); /** - * @brief Get AP list found in last scan. + * @brief Retrieve the list of APs found during the last scan. The returned AP list is sorted in descending order based on RSSI. * * @attention This API will free all memory occupied by scanned AP list. * From 2e55890069bbcb8edd39078f55633c0eabd9aa91 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 12 Feb 2025 11:50:30 +0800 Subject: [PATCH 7/9] fix(wifi): update wifi lib for doc changes --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 3e488b625e..6a7e0ca9ae 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 3e488b625eb76692aa8ada263e4da629d71542f8 +Subproject commit 6a7e0ca9ae3adb9542bdf9cef38b6e4e324d0ad1 From cbcfecd6045ca3d073d35cff320a47c4fc5e2203 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Tue, 11 Feb 2025 14:52:45 +0800 Subject: [PATCH 8/9] fix(wifi): fix some esp32p4 host issues --- components/esp_wifi/lib | 2 +- examples/wifi/iperf/main/idf_component.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 6a7e0ca9ae..e56388eff4 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 6a7e0ca9ae3adb9542bdf9cef38b6e4e324d0ad1 +Subproject commit e56388eff4b6e39db9125b399bfb6c5a165f9ed4 diff --git a/examples/wifi/iperf/main/idf_component.yml b/examples/wifi/iperf/main/idf_component.yml index d3655c7f6e..e36ce2502b 100644 --- a/examples/wifi/iperf/main/idf_component.yml +++ b/examples/wifi/iperf/main/idf_component.yml @@ -8,6 +8,6 @@ dependencies: esp-qa/ping-cmd: version: "~1.0.0" espressif/esp-extconn: - version: "~0.1.0" + version: "~0.2.0" rules: - if: "target in [esp32p4]" From 597cfcb4f3762e9a79011eb5655a76eb3940098b Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Mon, 7 Oct 2024 23:03:33 +0530 Subject: [PATCH 9/9] feat(wifi): Enable Wi-Fi Aware (NAN) for ESP32C5 and ESP32C61 --- components/soc/esp32c5/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c5/include/soc/soc_caps.h | 1 + components/soc/esp32c61/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c61/include/soc/soc_caps.h | 1 + examples/wifi/wifi_aware/nan_console/README.md | 4 ++-- examples/wifi/wifi_aware/nan_publisher/README.md | 4 ++-- examples/wifi/wifi_aware/nan_subscriber/README.md | 4 ++-- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in index e09a1bb829..b5af33c431 100644 --- a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in @@ -1487,6 +1487,10 @@ config SOC_WIFI_MAC_VERSION_NUM int default 3 +config SOC_WIFI_NAN_SUPPORT + bool + default y + config SOC_BLE_SUPPORTED bool default y diff --git a/components/soc/esp32c5/include/soc/soc_caps.h b/components/soc/esp32c5/include/soc/soc_caps.h index 8d9061cebd..b099edafa4 100644 --- a/components/soc/esp32c5/include/soc/soc_caps.h +++ b/components/soc/esp32c5/include/soc/soc_caps.h @@ -615,6 +615,7 @@ #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #define SOC_WIFI_SUPPORT_5G (1) /*!< Support 5G */ #define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */ +#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */ /*---------------------------------- Bluetooth CAPS ----------------------------------*/ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in index 2eb6ab0847..12a47865e4 100644 --- a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in @@ -1067,6 +1067,10 @@ config SOC_WIFI_MAC_VERSION_NUM int default 3 +config SOC_WIFI_NAN_SUPPORT + bool + default y + config SOC_BLE_SUPPORTED bool default y diff --git a/components/soc/esp32c61/include/soc/soc_caps.h b/components/soc/esp32c61/include/soc/soc_caps.h index e794da88ba..739cb52dd7 100644 --- a/components/soc/esp32c61/include/soc/soc_caps.h +++ b/components/soc/esp32c61/include/soc/soc_caps.h @@ -481,6 +481,7 @@ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */ +#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */ /*---------------------------------- Bluetooth CAPS ----------------------------------*/ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/examples/wifi/wifi_aware/nan_console/README.md b/examples/wifi/wifi_aware/nan_console/README.md index 21be95000d..2601c22a5c 100644 --- a/examples/wifi/wifi_aware/nan_console/README.md +++ b/examples/wifi/wifi_aware/nan_console/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-S2 | -| ----------------- | ----- | -------- | +| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 | +| ----------------- | ----- | -------- | --------- | -------- | # NAN Console Example diff --git a/examples/wifi/wifi_aware/nan_publisher/README.md b/examples/wifi/wifi_aware/nan_publisher/README.md index ea3f6d1b07..a50dd05847 100644 --- a/examples/wifi/wifi_aware/nan_publisher/README.md +++ b/examples/wifi/wifi_aware/nan_publisher/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-S2 | -| ----------------- | ----- | -------- | +| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 | +| ----------------- | ----- | -------- | --------- | -------- | # NAN Publisher Example diff --git a/examples/wifi/wifi_aware/nan_subscriber/README.md b/examples/wifi/wifi_aware/nan_subscriber/README.md index 013770468b..c648c75ab7 100644 --- a/examples/wifi/wifi_aware/nan_subscriber/README.md +++ b/examples/wifi/wifi_aware/nan_subscriber/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-S2 | -| ----------------- | ----- | -------- | +| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 | +| ----------------- | ----- | -------- | --------- | -------- | # NAN Subscriber Example