Merge branch 'bugfix/update_esp32_phy_4370_v4.2' into 'release/v4.2'

esp_wifi: backport some wifi fix to v4.2

See merge request espressif/esp-idf!10024
This commit is contained in:
Jiang Jiang Jian 2020-08-14 17:45:22 +08:00
commit d0dae54263
2 changed files with 34 additions and 1 deletions

View file

@ -1106,6 +1106,39 @@ esp_err_t esp_wifi_get_ant(wifi_ant_config_t *config);
*/
int64_t esp_wifi_get_tsf_time(wifi_interface_t interface);
/**
* @brief Set the inactive time of the ESP32 STA or AP
*
* @attention 1. For Station, If the station does not receive a beacon frame from the connected SoftAP during the inactive time,
* disconnect from SoftAP. Default 6s.
* @attention 2. For SoftAP, If the softAP doesn't receive any data from the connected STA during inactive time,
* the softAP will force deauth the STA. Default is 300s.
* @attention 3. The inactive time configuration is not stored into flash
*
* @param ifx interface to be configured.
* @param sec Inactive time. Unit seconds.
*
* @return
* - ESP_OK: succeed
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
* - ESP_ERR_WIFI_ARG: invalid argument, For Station, if sec is less than 3. For SoftAP, if sec is less than 10.
*/
esp_err_t esp_wifi_set_inactive_time(wifi_interface_t ifx, uint16_t sec);
/**
* @brief Get inactive time of specified interface
*
* @param ifx Interface to be configured.
* @param sec Inactive time. Unit seconds.
*
* @return
* - ESP_OK: succeed
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_ARG: invalid argument
*/
esp_err_t esp_wifi_get_inactive_time(wifi_interface_t ifx, uint16_t *sec);
#ifdef __cplusplus
}
#endif

@ -1 +1 @@
Subproject commit 1dc481e59a8099299b6b1c60b14fe3672f13a0a9
Subproject commit c934be7c20279db86e825fd44f7bc7eef9929ac1