mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-02 12:14:32 +02:00
Merge branch 'bugfix/fix_wifi_espnow_coexist_API_doc_v5.0' into 'release/v5.0'
bugfix: fix wifi espnow coexist api doc v5.0 See merge request espressif/esp-idf!25023
This commit is contained in:
@@ -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);
|
||||||
|
|
||||||
|
Submodule components/esp_wifi/lib updated: 814f1482ac...d83e414db9
@@ -58,4 +58,29 @@ menu "Example Configuration"
|
|||||||
help
|
help
|
||||||
When enable long range, the PHY rate of ESP32 will be 512Kbps or 256Kbps
|
When enable long range, the PHY rate of ESP32 will be 512Kbps or 256Kbps
|
||||||
|
|
||||||
|
config ESPNOW_ENABLE_POWER_SAVE
|
||||||
|
bool "Enable ESPNOW Power Save"
|
||||||
|
default "n"
|
||||||
|
select ESP_WIFI_STA_DISCONNECTED_PM_ENABLE
|
||||||
|
depends on ESPNOW_WIFI_MODE_STATION
|
||||||
|
help
|
||||||
|
With ESPNOW power save enabled, chip would be able to wakeup and sleep periodically
|
||||||
|
Notice ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is essential at Wi-Fi disconnected
|
||||||
|
|
||||||
|
config ESPNOW_WAKE_WINDOW
|
||||||
|
int "ESPNOW wake window, unit in millisecond"
|
||||||
|
range 0 65535
|
||||||
|
default 50
|
||||||
|
depends on ESPNOW_ENABLE_POWER_SAVE
|
||||||
|
help
|
||||||
|
ESPNOW wake window
|
||||||
|
|
||||||
|
config ESPNOW_WAKE_INTERVAL
|
||||||
|
int "ESPNOW wake interval, unit in millisecond"
|
||||||
|
range 1 65535
|
||||||
|
default 100
|
||||||
|
depends on ESPNOW_ENABLE_POWER_SAVE
|
||||||
|
help
|
||||||
|
ESPNOW wake interval
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
@@ -299,8 +299,9 @@ static esp_err_t example_espnow_init(void)
|
|||||||
ESP_ERROR_CHECK( esp_now_init() );
|
ESP_ERROR_CHECK( esp_now_init() );
|
||||||
ESP_ERROR_CHECK( esp_now_register_send_cb(example_espnow_send_cb) );
|
ESP_ERROR_CHECK( esp_now_register_send_cb(example_espnow_send_cb) );
|
||||||
ESP_ERROR_CHECK( esp_now_register_recv_cb(example_espnow_recv_cb) );
|
ESP_ERROR_CHECK( esp_now_register_recv_cb(example_espnow_recv_cb) );
|
||||||
#if CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE
|
#if CONFIG_ESPNOW_ENABLE_POWER_SAVE
|
||||||
ESP_ERROR_CHECK( esp_now_set_wake_window(65535) );
|
ESP_ERROR_CHECK( esp_now_set_wake_window(CONFIG_ESPNOW_WAKE_WINDOW) );
|
||||||
|
ESP_ERROR_CHECK( esp_wifi_connectionless_module_set_wake_interval(CONFIG_ESPNOW_WAKE_INTERVAL) );
|
||||||
#endif
|
#endif
|
||||||
/* Set primary master key. */
|
/* Set primary master key. */
|
||||||
ESP_ERROR_CHECK( esp_now_set_pmk((uint8_t *)CONFIG_ESPNOW_PMK) );
|
ESP_ERROR_CHECK( esp_now_set_pmk((uint8_t *)CONFIG_ESPNOW_PMK) );
|
||||||
|
Reference in New Issue
Block a user