mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-02 20:24:32 +02:00
Merge branch 'bugfix/fix_some_wifi_bugs_230719_v4.4' into 'release/v4.4'
fix(wifi): fix some wifi bugs 230719 (backport v4.4) See merge request espressif/esp-idf!24898
This commit is contained in:
@@ -1589,7 +1589,7 @@ hal_mac_is_low_rate_enabled = 0x400015cc;
|
|||||||
hal_mac_tx_get_blockack = 0x400015d0;
|
hal_mac_tx_get_blockack = 0x400015d0;
|
||||||
/* hal_mac_tx_set_ppdu = 0x400015d4; */
|
/* hal_mac_tx_set_ppdu = 0x400015d4; */
|
||||||
ic_get_trc = 0x400015d8;
|
ic_get_trc = 0x400015d8;
|
||||||
ic_mac_deinit = 0x400015dc;
|
/* ic_mac_deinit = 0x400015dc; */
|
||||||
ic_mac_init = 0x400015e0;
|
ic_mac_init = 0x400015e0;
|
||||||
ic_interface_enabled = 0x400015e4;
|
ic_interface_enabled = 0x400015e4;
|
||||||
is_lmac_idle = 0x400015e8;
|
is_lmac_idle = 0x400015e8;
|
||||||
|
@@ -1899,7 +1899,7 @@ hal_mac_is_low_rate_enabled = 0x400052a4;
|
|||||||
hal_mac_tx_get_blockack = 0x400052b0;
|
hal_mac_tx_get_blockack = 0x400052b0;
|
||||||
/* hal_mac_tx_set_ppdu = 0x400052bc; */
|
/* hal_mac_tx_set_ppdu = 0x400052bc; */
|
||||||
ic_get_trc = 0x400052c8;
|
ic_get_trc = 0x400052c8;
|
||||||
ic_mac_deinit = 0x400052d4;
|
/* ic_mac_deinit = 0x400052d4; */
|
||||||
ic_mac_init = 0x400052e0;
|
ic_mac_init = 0x400052e0;
|
||||||
ic_interface_enabled = 0x400052ec;
|
ic_interface_enabled = 0x400052ec;
|
||||||
is_lmac_idle = 0x400052f8;
|
is_lmac_idle = 0x400052f8;
|
||||||
|
@@ -1,10 +1,9 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/* Notes about WiFi Programming
|
/* Notes about WiFi Programming
|
||||||
*
|
*
|
||||||
* The esp32 WiFi programming model can be depicted as following picture:
|
* The esp32 WiFi programming model can be depicted as following picture:
|
||||||
@@ -620,7 +619,7 @@ esp_err_t esp_wifi_get_channel(uint8_t *primary, wifi_second_chan_t *second);
|
|||||||
* it's up to the user to fill in all fields according to local regulations.
|
* it's up to the user to fill in all fields according to local regulations.
|
||||||
* Please use esp_wifi_set_country_code instead.
|
* Please use esp_wifi_set_country_code instead.
|
||||||
* @attention 2. The default country is CHINA {.cc="CN", .schan=1, .nchan=13, .policy=WIFI_COUNTRY_POLICY_AUTO}.
|
* @attention 2. The default country is CHINA {.cc="CN", .schan=1, .nchan=13, .policy=WIFI_COUNTRY_POLICY_AUTO}.
|
||||||
* @attention 3. The third octect of country code string is one of the following: ' ', 'O', 'I', 'X', otherwise it is considered as ' '.
|
* @attention 3. The third octet of country code string is one of the following: ' ', 'O', 'I', 'X', otherwise it is considered as ' '.
|
||||||
* @attention 4. When the country policy is WIFI_COUNTRY_POLICY_AUTO, the country info of the AP to which
|
* @attention 4. When the country policy is WIFI_COUNTRY_POLICY_AUTO, the country info of the AP to which
|
||||||
* the station is connected is used. E.g. if the configured country info is {.cc="US", .schan=1, .nchan=11}
|
* the station is connected is used. E.g. if the configured country info is {.cc="US", .schan=1, .nchan=11}
|
||||||
* and the country info of the AP to which the station is connected is {.cc="JP", .schan=1, .nchan=14}
|
* and the country info of the AP to which the station is connected is {.cc="JP", .schan=1, .nchan=14}
|
||||||
@@ -1268,7 +1267,7 @@ esp_err_t esp_wifi_set_connectionless_wake_interval(uint16_t interval);
|
|||||||
*
|
*
|
||||||
* @attention 7. When country code "01" (world safe mode) is set, SoftAP mode won't contain country IE.
|
* @attention 7. When country code "01" (world safe mode) is set, SoftAP mode won't contain country IE.
|
||||||
* @attention 8. The default country is "CN" and ieee80211d_enabled is TRUE.
|
* @attention 8. The default country is "CN" and ieee80211d_enabled is TRUE.
|
||||||
* @attention 9. The third octect of country code string is one of the following: ' ', 'O', 'I', 'X', otherwise it is considered as ' '.
|
* @attention 9. The third octet of country code string is one of the following: ' ', 'O', 'I', 'X', otherwise it is considered as ' '.
|
||||||
*
|
*
|
||||||
* @param country the configured country ISO code
|
* @param country the configured country ISO code
|
||||||
* @param ieee80211d_enabled 802.11d is enabled or not
|
* @param ieee80211d_enabled 802.11d is enabled or not
|
||||||
@@ -1342,6 +1341,21 @@ esp_err_t esp_wifi_sta_get_aid(uint16_t *aid);
|
|||||||
* - ESP_OK: succeed
|
* - ESP_OK: succeed
|
||||||
*/
|
*/
|
||||||
esp_err_t esp_wifi_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);
|
esp_err_t esp_wifi_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get the rssi info after station connected to AP
|
||||||
|
*
|
||||||
|
* @attention This API should be called after station connected to AP.
|
||||||
|
*
|
||||||
|
* @param rssi store the rssi info received from last beacon.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* - ESP_OK: succeed
|
||||||
|
* - ESP_ERR_INVALID_ARG: invalid argument
|
||||||
|
* - ESP_FAIL: failed
|
||||||
|
*/
|
||||||
|
esp_err_t esp_wifi_sta_get_rssi(int *rssi);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Submodule components/esp_wifi/lib updated: 70366b600a...adcb3b0a7a
@@ -12,7 +12,7 @@ The Wi-Fi libraries provide support for configuring and monitoring the {IDF_TARG
|
|||||||
- AP mode (aka Soft-AP mode or Access Point mode). Stations connect to the {IDF_TARGET_NAME}.
|
- AP mode (aka Soft-AP mode or Access Point mode). Stations connect to the {IDF_TARGET_NAME}.
|
||||||
- Combined AP-STA mode ({IDF_TARGET_NAME} is concurrently an access point and a station connected to another access point).
|
- Combined AP-STA mode ({IDF_TARGET_NAME} is concurrently an access point and a station connected to another access point).
|
||||||
|
|
||||||
- Various security modes for the above (WPA, WPA2, WEP, etc.)
|
- Various security modes for the above (WPA, WPA2, WPA3, etc.)
|
||||||
- Scanning for access points (active & passive scanning).
|
- Scanning for access points (active & passive scanning).
|
||||||
- Promiscuous mode for monitoring of IEEE802.11 Wi-Fi packets.
|
- Promiscuous mode for monitoring of IEEE802.11 Wi-Fi packets.
|
||||||
|
|
||||||
|
@@ -14,7 +14,7 @@ Wi-Fi 库支持配置及监控 {IDF_TARGET_NAME} Wi-Fi 连网功能。
|
|||||||
- AP 模式(即 Soft-AP 模式或接入点模式),此时基站连接到 {IDF_TARGET_NAME}。
|
- AP 模式(即 Soft-AP 模式或接入点模式),此时基站连接到 {IDF_TARGET_NAME}。
|
||||||
- AP-STA 共存模式({IDF_TARGET_NAME} 既是接入点,同时又作为基站连接到另外一个接入点)。
|
- AP-STA 共存模式({IDF_TARGET_NAME} 既是接入点,同时又作为基站连接到另外一个接入点)。
|
||||||
|
|
||||||
- 上述模式的各种安全模式(WPA、WPA2 及 WEP 等)。
|
- 上述模式的各种安全模式(WPA、WPA2、WPA3 等)。
|
||||||
- 扫描接入点(包括主动扫描及被动扫描)。
|
- 扫描接入点(包括主动扫描及被动扫描)。
|
||||||
- 使用混杂模式监控 IEEE802.11 Wi-Fi 数据包。
|
- 使用混杂模式监控 IEEE802.11 Wi-Fi 数据包。
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user