From 36caf700c7c9a7721b95dd8acc125b03579035b9 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 9 Feb 2023 15:01:49 +0800 Subject: [PATCH 1/3] esp_wifi: fix some wifi bugs 1. fix ftm timer macro issue 2. send null data when state change from association to run 3. bugfix for optimize abnormal beacon log 4. bugfix RSNXE related changes 5. send ftm frames immediately 6. fix ftm procedure with peer failed status 4 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 90d646774f..5f50276b3d 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 90d646774f5f1176564cc04cc1aeabeed407b82d +Subproject commit 5f50276b3d3a0cddc7d0a94afcb851a9bac82d61 From 6c4ac9ab9e0225e5eba48293f5b5ada3030490d6 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Tue, 13 Dec 2022 19:48:30 +0800 Subject: [PATCH 2/3] docs: add some details for wifi scan description --- docs/en/api-guides/wifi.rst | 2 +- docs/zh_CN/api-guides/wifi.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/api-guides/wifi.rst b/docs/en/api-guides/wifi.rst index 2d69d41985..ecb179d7fa 100644 --- a/docs/en/api-guides/wifi.rst +++ b/docs/en/api-guides/wifi.rst @@ -1216,7 +1216,7 @@ API :cpp:func:`esp_wifi_set_config()` can be used to configure the station. And * - bssid - This is valid only when bssid_set is 1; see field “bssid_set”. * - channel - - If the channel is 0, the station scans the channel 1 ~ N to search for the target AP; otherwise, the station starts by scanning the channel whose value is the same as that of the “channel” field, and then scans others to find the target AP. If you do not know which channel the target AP is running on, set it to 0. + - If the channel is 0, the station scans the channel 1 ~ N to search for the target AP; otherwise, the station starts by scanning the channel whose value is the same as that of the “channel” field, and then scans the channel 1 ~ N but skip the specific channel to find the target AP. For example, if the channel is 3, the scan order will be 3, 1, 2, 4,..., N. If you do not know which channel the target AP is running on, set it to 0. * - sort_method - This field is only for WIFI_ALL_CHANNEL_SCAN. diff --git a/docs/zh_CN/api-guides/wifi.rst b/docs/zh_CN/api-guides/wifi.rst index 20717a5736..f637ead2de 100644 --- a/docs/zh_CN/api-guides/wifi.rst +++ b/docs/zh_CN/api-guides/wifi.rst @@ -1217,7 +1217,7 @@ API :cpp:func:`esp_wifi_set_config()` 可用于配置 station。配置的参数 * - bssid - 只有当 bssid_set 为 1 时有效。见字段 “bssid_set”。 * - channel - - 该字段为 0 时，station 扫描信道 1 ~ N 寻找目标 AP；否则，station 首先扫描值与 “channel” 字段相同的信道，再扫描其他信道。如果您不知道目标 AP 在哪个信道，请将该字段设置为 0。 + - 该字段为 0 时，station 扫描信道 1 ~ N 寻找目标 AP；否则，station 首先扫描值与 “channel” 字段相同的信道，再扫描其他信道。比如，当该字段设置为 3 时，扫描顺序为 3，1，2，...，N 。如果您不知道目标 AP 在哪个信道，请将该字段设置为 0。 * - sort_method - 该字段仅用于 WIFI_ALL_CHANNEL_SCAN 模式。 From 997af8de8abb4bf31c156612eea1b41af70e48b3 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Tue, 10 Jan 2023 20:55:31 +0800 Subject: [PATCH 3/3] docs: update ftm docs --- components/wpa_supplicant/src/rsn_supp/wpa.c | 2 +- docs/en/api-guides/wifi.rst | 2 +- docs/zh_CN/api-guides/wifi.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c index 413a46dd5f..2054127d2b 100644 --- a/components/wpa_supplicant/src/rsn_supp/wpa.c +++ b/components/wpa_supplicant/src/rsn_supp/wpa.c @@ -2386,7 +2386,7 @@ int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher, if (res < 0) return -1; sm->assoc_wpa_ie_len = res; - res = wpa_gen_rsnxe(sm ,assoc_rsnxe, assoc_rsnxe_len); + res = wpa_gen_rsnxe(sm, assoc_rsnxe, assoc_rsnxe_len); if (res < 0) return -1; assoc_rsnxe_len = res; diff --git a/docs/en/api-guides/wifi.rst b/docs/en/api-guides/wifi.rst index ecb179d7fa..5e9f4b60e4 100644 --- a/docs/en/api-guides/wifi.rst +++ b/docs/en/api-guides/wifi.rst @@ -1510,7 +1510,7 @@ Current implementation of 802.11k includes support for beacon measurement report Refer IDF example :idf_file:`examples/wifi/roaming/README.md` to set up and use these APIs. Example code only demonstrates how these APIs can be used, the application should define its own algorithm and cases as required. -.. only:: esp32s2 or esp32c3 +.. only:: SOC_WIFI_FTM_SUPPORT Wi-Fi Location ------------------------------- diff --git a/docs/zh_CN/api-guides/wifi.rst b/docs/zh_CN/api-guides/wifi.rst index f637ead2de..ac6ae60fb9 100644 --- a/docs/zh_CN/api-guides/wifi.rst +++ b/docs/zh_CN/api-guides/wifi.rst @@ -1512,7 +1512,7 @@ WPA2-Enterprise 是企业无线网络的安全认证机制。在连接到接入 请参考 IDF 示例程序 :idf_file:`examples/wifi/roaming/README.md` 来设置和使用这些 API。示例代码只演示了如何使用这些 API，应用程序应根据需要定义自己的算法和案例。 -.. only:: esp32s2 or esp32c3 +.. only:: SOC_WIFI_FTM_SUPPORT Wi-Fi Location -------------------------------