diff --git a/components/esp8266/include/esp_sleep.h b/components/esp8266/include/esp_sleep.h index 5dcb5885..b783bb75 100644 --- a/components/esp8266/include/esp_sleep.h +++ b/components/esp8266/include/esp_sleep.h @@ -75,14 +75,14 @@ void esp_deep_sleep_set_rf_option(uint8_t option); * * @return null */ -void esp_wifi_fpm_open(void); +void esp_wifi_fpm_open(void) __attribute__ ((deprecated)); /** * @brief Disable force sleep function. * * @return null */ -void esp_wifi_fpm_close(void); +void esp_wifi_fpm_close(void) __attribute__ ((deprecated)); /** * @brief Wake ESP8266 up from MODEM_SLEEP_T force sleep. @@ -93,7 +93,7 @@ void esp_wifi_fpm_close(void); * * @return null */ -void esp_wifi_fpm_do_wakeup(void); +void esp_wifi_fpm_do_wakeup(void) __attribute__ ((deprecated)); /** * @brief Set a callback of waken up from force sleep because of time out. @@ -110,7 +110,7 @@ void esp_wifi_fpm_do_wakeup(void); * * @return null */ -void esp_wifi_fpm_set_wakeup_cb(fpm_wakeup_cb cb); +void esp_wifi_fpm_set_wakeup_cb(fpm_wakeup_cb cb) __attribute__ ((deprecated)); /** * @brief Force ESP8266 enter sleep mode, and it will wake up automatically when time out. @@ -133,7 +133,7 @@ void esp_wifi_fpm_set_wakeup_cb(fpm_wakeup_cb cb); * @return ESP_ERR_WIFI_PM_MODE_OPEN, fail to sleep, Please call esp_wifi_set_ps(WIFI_PS_NONE) first. * @return ESP_ERR_WIFI_MODE, fail to sleep, Please call esp_wifi_set_mode(WIFI_MODE_NULL) first. */ -esp_err_t esp_wifi_fpm_do_sleep(uint32_t sleep_time_in_us); +esp_err_t esp_wifi_fpm_do_sleep(uint32_t sleep_time_in_us) __attribute__ ((deprecated)); /** * @brief Set sleep type for force sleep function. @@ -144,14 +144,14 @@ esp_err_t esp_wifi_fpm_do_sleep(uint32_t sleep_time_in_us); * * @return null */ -void esp_wifi_fpm_set_sleep_type(wifi_sleep_type_t type); +void esp_wifi_fpm_set_sleep_type(wifi_sleep_type_t type) __attribute__ ((deprecated)); /** * @brief Get sleep type of force sleep function. * * @return sleep type */ -wifi_sleep_type_t esp_wifi_fpm_get_sleep_type(void); +wifi_sleep_type_t esp_wifi_fpm_get_sleep_type(void) __attribute__ ((deprecated)); /** * @brief Set a GPIO to wake the ESP8266 up from light-sleep mode @@ -171,12 +171,12 @@ wifi_sleep_type_t esp_wifi_fpm_get_sleep_type(void); * * @return null */ -void esp_wifi_enable_gpio_wakeup(uint32_t gpio_num, gpio_int_type_t intr_status); +void esp_wifi_enable_gpio_wakeup(uint32_t gpio_num, gpio_int_type_t intr_status) __attribute__ ((deprecated)); /** * @brief Disable the function that the GPIO can wake the ESP8266 up from light-sleep mode. */ -void esp_wifi_disable_gpio_wakeup(void); +void esp_wifi_disable_gpio_wakeup(void) __attribute__ ((deprecated)); /** * @brief Enable wakeup by timer diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index 98b39cc0..02817340 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -1,10 +1,10 @@ gwen: - core: f467b5d - net80211: 7f8c705 - pp: 7f8c705 - wpa: f467b5d - espnow: 7f8c705 - wps: 7f8c705 + core: 743c778 + net80211: 743c778 + pp: 743c778 + wpa: 743c778 + espnow: 743c778 + wps: 743c778 smartconfig: 2.8.2 phy: 1055_22 diff --git a/components/esp8266/lib/libcore.a b/components/esp8266/lib/libcore.a index 8bbc0bde..f7282855 100644 Binary files a/components/esp8266/lib/libcore.a and b/components/esp8266/lib/libcore.a differ diff --git a/components/esp8266/lib/libcore_dbg.a b/components/esp8266/lib/libcore_dbg.a index 9c6bf691..ce9966d4 100644 Binary files a/components/esp8266/lib/libcore_dbg.a and b/components/esp8266/lib/libcore_dbg.a differ diff --git a/components/esp8266/lib/libespnow.a b/components/esp8266/lib/libespnow.a index 8afeddb0..d12337d3 100644 Binary files a/components/esp8266/lib/libespnow.a and b/components/esp8266/lib/libespnow.a differ diff --git a/components/esp8266/lib/libespnow_dbg.a b/components/esp8266/lib/libespnow_dbg.a index a48d83bb..40109a8d 100644 Binary files a/components/esp8266/lib/libespnow_dbg.a and b/components/esp8266/lib/libespnow_dbg.a differ diff --git a/components/esp8266/lib/libnet80211.a b/components/esp8266/lib/libnet80211.a index c0878f22..12913231 100644 Binary files a/components/esp8266/lib/libnet80211.a and b/components/esp8266/lib/libnet80211.a differ diff --git a/components/esp8266/lib/libnet80211_dbg.a b/components/esp8266/lib/libnet80211_dbg.a index 9dc5a71b..76b25929 100644 Binary files a/components/esp8266/lib/libnet80211_dbg.a and b/components/esp8266/lib/libnet80211_dbg.a differ diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a index 7beaa55a..2dc7d19d 100644 Binary files a/components/esp8266/lib/libpp.a and b/components/esp8266/lib/libpp.a differ diff --git a/components/esp8266/lib/libpp_dbg.a b/components/esp8266/lib/libpp_dbg.a index 1c9c2d9b..993bf763 100644 Binary files a/components/esp8266/lib/libpp_dbg.a and b/components/esp8266/lib/libpp_dbg.a differ diff --git a/components/esp8266/lib/libwpa.a b/components/esp8266/lib/libwpa.a index c1fcec88..89204880 100644 Binary files a/components/esp8266/lib/libwpa.a and b/components/esp8266/lib/libwpa.a differ diff --git a/components/esp8266/lib/libwpa_dbg.a b/components/esp8266/lib/libwpa_dbg.a index a9f587c3..6faee56a 100644 Binary files a/components/esp8266/lib/libwpa_dbg.a and b/components/esp8266/lib/libwpa_dbg.a differ diff --git a/components/esp8266/lib/libwps.a b/components/esp8266/lib/libwps.a index 88f15228..820a0687 100644 Binary files a/components/esp8266/lib/libwps.a and b/components/esp8266/lib/libwps.a differ diff --git a/components/esp8266/lib/libwps_dbg.a b/components/esp8266/lib/libwps_dbg.a index 95f0efee..ad0898ed 100644 Binary files a/components/esp8266/lib/libwps_dbg.a and b/components/esp8266/lib/libwps_dbg.a differ diff --git a/components/esp8266/source/esp_fsleep.c b/components/esp8266/source/esp_fsleep.c new file mode 100644 index 00000000..e0bb404c --- /dev/null +++ b/components/esp8266/source/esp_fsleep.c @@ -0,0 +1,65 @@ +// Copyright 2019-2020 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "esp_sleep.h" +#include "esp_log.h" + +static const char* TAG = "FPM"; + +void esp_wifi_fpm_open(void) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +void esp_wifi_fpm_close(void) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +void esp_wifi_fpm_do_wakeup(void) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +void esp_wifi_fpm_set_wakeup_cb(fpm_wakeup_cb cb) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +esp_err_t esp_wifi_fpm_do_sleep(uint32_t sleep_time_in_us) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); + return ESP_FAIL; +} + +void esp_wifi_fpm_set_sleep_type(wifi_sleep_type_t type) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +wifi_sleep_type_t esp_wifi_fpm_get_sleep_type(void) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); + return WIFI_NONE_SLEEP_T; +} + +void esp_wifi_enable_gpio_wakeup(uint32_t gpio_num, gpio_int_type_t intr_status) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +} + +void esp_wifi_disable_gpio_wakeup(void) +{ + ESP_LOGE(TAG, "We have removed this api, please do not call"); +}