blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/backport_wifi_fixes_v5.4' into 'release/v5.4'

Browse Source 
fix(wifi): backport some fixes to v5.4

See merge request espressif/esp-idf!37008
This commit is contained in:
Jiang Jiang Jian 2025-02-19 21:59:20 +08:00
commit 69bd12d792
11 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
View File

@ -122,7 +122,7 @@ pm_local_tsf_process = 0x40000cd4;
pm_set_beacon_filter = 0x40000cd8; pm_set_beacon_filter = 0x40000cd8;
pm_is_in_wifi_slice_threshold = 0x40000cdc; pm_is_in_wifi_slice_threshold = 0x40000cdc;
pm_is_waked = 0x40000ce0; pm_is_waked = 0x40000ce0;
pm_keep_alive = 0x40000ce4; //pm_keep_alive = 0x40000ce4;
pm_on_beacon_rx = 0x40000ce8; pm_on_beacon_rx = 0x40000ce8;
pm_on_data_rx = 0x40000cec; pm_on_data_rx = 0x40000cec;
pm_on_data_tx = 0x40000cf0; pm_on_data_tx = 0x40000cf0;

2
components/esp_wifi/include/esp_wifi.h
View File

@ -583,7 +583,7 @@ esp_err_t esp_wifi_scan_stop(void);
esp_err_t esp_wifi_scan_get_ap_num(uint16_t *number); 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. * @attention This API will free all memory occupied by scanned AP list.
* *

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit dfbd8b0145a604bcd4c0b57feff18cd1e62197cb Subproject commit e56388eff4b6e39db9125b399bfb6c5a165f9ed4

4
components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
View File

@ -1491,6 +1491,10 @@ config SOC_WIFI_MAC_VERSION_NUM
int int
default 3 default 3
config SOC_WIFI_NAN_SUPPORT
bool
default y
config SOC_BLE_SUPPORTED config SOC_BLE_SUPPORTED
bool bool
default y default y

1
components/soc/esp32c5/include/soc/soc_caps.h
View File

@ -616,6 +616,7 @@
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
#define SOC_WIFI_SUPPORT_5G (1) /*!< Support 5G */ #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_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */

4
components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
View File

@ -1071,6 +1071,10 @@ config SOC_WIFI_MAC_VERSION_NUM
int int
default 3 default 3
config SOC_WIFI_NAN_SUPPORT
bool
default y
config SOC_BLE_SUPPORTED config SOC_BLE_SUPPORTED
bool bool
default y default y

1
components/soc/esp32c61/include/soc/soc_caps.h
View File

@ -482,6 +482,7 @@
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */ #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_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */

2
examples/wifi/iperf/main/idf_component.yml
View File

@ -8,6 +8,6 @@ dependencies:
esp-qa/ping-cmd: esp-qa/ping-cmd:
version: "~1.0.0" version: "~1.0.0"
espressif/esp-extconn: espressif/esp-extconn:
version: "~0.1.0" version: "~0.2.0"
rules: rules:
- if: "target in [esp32p4]" - if: "target in [esp32p4]"

4
examples/wifi/wifi_aware/nan_console/README.md
View File

@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Console Example # NAN Console Example

4
examples/wifi/wifi_aware/nan_publisher/README.md
View File

@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Publisher Example # NAN Publisher Example

4
examples/wifi/wifi_aware/nan_subscriber/README.md
View File

@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
| ----------------- | ----- | -------- | | ----------------- | ----- | -------- | --------- | -------- |
# NAN Subscriber Example # NAN Subscriber Example