Skip to content

Commit adf9ee2

Browse files
committed
Merge branch 'feature/add_64bits_sleep_time_support_for_esp_deep_sleep' into 'master'
feat(esp8266): support 64bit sleep time for esp_deep_sleep See merge request sdk/ESP8266_RTOS_SDK!1516
2 parents 7cb74a7 + 8eab911 commit adf9ee2

File tree

11 files changed

+38
-5
lines changed

11 files changed

+38
-5
lines changed

components/esp8266/include/esp_sleep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef enum {
6565
*
6666
* @return null
6767
*/
68-
void esp_deep_sleep(uint32_t time_in_us);
68+
void esp_deep_sleep(uint64_t time_in_us);
6969

7070
/**
7171
* @brief Set implementation-specific power management configuration

components/esp8266/include/esp_wifi.h

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,39 @@ esp_err_t esp_wifi_set_rssi_threshold(int32_t rssi);
10191019
*/
10201020
int64_t esp_wifi_get_tsf_time(wifi_interface_t interface);
10211021

1022+
/**
1023+
* @brief Set the inactive time of the ESP32 STA or AP
1024+
*
1025+
* @attention 1. For Station, If the station does not receive a beacon frame from the connected SoftAP during the inactive time,
1026+
* disconnect from SoftAP. Default 6s.
1027+
* @attention 2. For SoftAP, If the softAP doesn't receive any data from the connected STA during inactive time,
1028+
* the softAP will force deauth the STA. Default is 300s.
1029+
* @attention 3. The inactive time configuration is not stored into flash
1030+
*
1031+
* @param ifx interface to be configured.
1032+
* @param sec Inactive time. Unit seconds.
1033+
*
1034+
* @return
1035+
* - ESP_OK: succeed
1036+
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
1037+
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
1038+
* - ESP_ERR_WIFI_ARG: invalid argument, For Station, if sec is less than 3. For SoftAP, if sec is less than 10.
1039+
*/
1040+
esp_err_t esp_wifi_set_inactive_time(wifi_interface_t ifx, uint16_t sec);
1041+
1042+
/**
1043+
* @brief Get inactive time of specified interface
1044+
*
1045+
* @param ifx Interface to be configured.
1046+
* @param sec Inactive time. Unit seconds.
1047+
*
1048+
* @return
1049+
* - ESP_OK: succeed
1050+
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
1051+
* - ESP_ERR_WIFI_ARG: invalid argument
1052+
*/
1053+
esp_err_t esp_wifi_get_inactive_time(wifi_interface_t ifx, uint16_t *sec);
1054+
10221055
#ifdef __cplusplus
10231056
}
10241057
#endif

components/esp8266/lib/VERSION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
gwen:
2-
core: 0f4f59c
3-
net80211: 0f4f59c
4-
pp: 0f4f59c
5-
espnow: 0f4f59c
2+
core: 99a1d31
3+
net80211: 99a1d31
4+
pp: 99a1d31
5+
espnow: 99a1d31
66

77
smartconfig: 2.8.2
88
phy: 1163.0

components/esp8266/lib/libcore.a

416 Bytes
Binary file not shown.

components/esp8266/lib/libcore_dbg.a

416 Bytes
Binary file not shown.

components/esp8266/lib/libespnow.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

components/esp8266/lib/libnet80211.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

components/esp8266/lib/libpp.a

478 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)