alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 10:46:02 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_wifi_espnow_coexist_API_doc_v4.4' into 'release/v4.4'

Browse Source 
fix(esp_wifi): fix ret when setting channel at wifi not started

See merge request espressif/esp-idf!25018
This commit is contained in:
Jiang Jiang Jian 2023-07-28 16:39:39 +08:00
commit 949739c9b7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,7 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
/**
* @brief Set primary/secondary channel of ESP32
*
* @attention 1. This API should be called after esp_wifi_start()
* @attention 1. This API should be called after esp_wifi_start() and before esp_wifi_stop()
* @attention 2. When ESP32 is in STA mode, this API should not be called when STA is scanning or connecting to an external AP
* @attention 3. When ESP32 is in softAP mode, this API should not be called when softAP has connected to external STAs
* @attention 4. When ESP32 is in STA+softAP mode, this API should not be called when in the scenarios described above
@ -595,6 +595,7 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_IF: invalid interface
* - ESP_ERR_INVALID_ARG: invalid argument
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
*/
esp_err_t esp_wifi_set_channel(uint8_t primary, wifi_second_chan_t second);

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 6c3fda24604a9a21b852c6318d92c89127f6cdb4
Subproject commit d739d660a490a8a8986faef7a83c7a4124fcfe26