espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!25011
This commit is contained in:
Jiang Jiang Jian
2023-07-27 13:34:54 +08:00
parent 08c212e30c 77223bfa9f
commit 65a1cce3fa
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,7 +578,7 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
/** /**
* @brief Set primary/secondary channel of ESP32 * @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 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 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 * @attention 4. When ESP32 is in STA+softAP mode, this API should not be called when in the scenarios described above
@ -593,6 +593,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_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_IF: invalid interface * - ESP_ERR_WIFI_IF: invalid interface
* - ESP_ERR_INVALID_ARG: invalid argument * - 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); esp_err_t esp_wifi_set_channel(uint8_t primary, wifi_second_chan_t second);

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: fe79c61130...1ad467063b