alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(app_update): Reverted: Fix CI test_switch_ota by increasing deepsleep

Browse Source 
This reverts commit 7ac7d43541.
This commit is contained in:
Zim Kalinowski 2023-09-27 12:25:13 +02:00
parent 1256e6fd6b
commit 1c21f07139
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/app_update/test_apps/main/test_switch_ota.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -185,8 +185,8 @@ static void erase_ota_data(void)
static void reboot_as_deep_sleep(void) static void reboot_as_deep_sleep(void)
{ {
ESP_LOGI(TAG, "reboot as deep sleep"); ESP_LOGI(TAG, "reboot as deep sleep");
esp_deep_sleep(20000); esp_sleep_enable_timer_wakeup(2000);
TEST_FAIL_MESSAGE("Should never be reachable except when sleep is rejected, abort"); esp_deep_sleep_start();
} }
/* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx. /* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx.

16
components/esp_hw_support/include/esp_sleep.h
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -439,12 +439,9 @@ esp_err_t esp_sleep_pd_config(esp_sleep_pd_domain_t domain,
/** /**
* @brief Enter deep sleep with the configured wakeup options * @brief Enter deep sleep with the configured wakeup options
* *
* @note In general, the function does not return, but if the sleep is rejected, * This function does not return.
* then it returns from it.
*
* The reason for the rejection can be such as a short sleep time.
*/ */
void esp_deep_sleep_start(void); void esp_deep_sleep_start(void) __attribute__((__noreturn__));
/** /**
* @brief Enter light sleep with the configured wakeup options * @brief Enter light sleep with the configured wakeup options
@ -468,14 +465,9 @@ esp_err_t esp_light_sleep_start(void);
* Call to this function is equivalent to a call to esp_deep_sleep_enable_timer_wakeup * Call to this function is equivalent to a call to esp_deep_sleep_enable_timer_wakeup
* followed by a call to esp_deep_sleep_start. * followed by a call to esp_deep_sleep_start.
* *
* @note In general, the function does not return, but if the sleep is rejected,
* then it returns from it.
*
* The reason for the rejection can be such as a short sleep time.
*
* @param time_in_us deep-sleep time, unit: microsecond * @param time_in_us deep-sleep time, unit: microsecond
*/ */
void esp_deep_sleep(uint64_t time_in_us); void esp_deep_sleep(uint64_t time_in_us) __attribute__((__noreturn__));
/** /**

8
components/esp_hw_support/sleep_modes.c
View File

@ -873,15 +873,15 @@ void IRAM_ATTR esp_deep_sleep_start(void)
// Enter sleep // Enter sleep
if (esp_sleep_start(force_pd_flags | pd_flags, ESP_SLEEP_MODE_DEEP_SLEEP) == ESP_ERR_SLEEP_REJECT) { if (esp_sleep_start(force_pd_flags | pd_flags, ESP_SLEEP_MODE_DEEP_SLEEP) == ESP_ERR_SLEEP_REJECT) {
ESP_EARLY_LOGE(TAG, "Deep sleep request is rejected"); ESP_EARLY_LOGW(TAG, "Deep sleep request is rejected");
} else { }
// Because RTC is in a slower clock domain than the CPU, it // Because RTC is in a slower clock domain than the CPU, it
// can take several CPU cycles for the sleep mode to start. // can take several CPU cycles for the sleep mode to start.
while (1) { while (1) {
; ;
} }
} // Never returns here
// Never returns here, except that the sleep is rejected.
esp_ipc_isr_release_other_cpu(); esp_ipc_isr_release_other_cpu();
portEXIT_CRITICAL(&spinlock_rtc_deep_sleep); portEXIT_CRITICAL(&spinlock_rtc_deep_sleep);
} }