From f554d773fa4f63b92f4beb43027b7afcf0060254 Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Wed, 16 Apr 2025 21:05:36 +0800 Subject: [PATCH] fix(esp_hw_support): add delay to wait chip enter sleep in ut --- .../wakeup_tests/main/src/io_wakeup_cmd.c | 16 ++++++++++------ .../wakeup_tests/pytest_wakeup_tests.py | 10 +++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/components/esp_hw_support/test_apps/wakeup_tests/main/src/io_wakeup_cmd.c b/components/esp_hw_support/test_apps/wakeup_tests/main/src/io_wakeup_cmd.c index 3c8c9fc870..01319c24fd 100644 --- a/components/esp_hw_support/test_apps/wakeup_tests/main/src/io_wakeup_cmd.c +++ b/components/esp_hw_support/test_apps/wakeup_tests/main/src/io_wakeup_cmd.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -38,9 +38,13 @@ static int process_sleep(int argc, char **argv) if (sleep_args.mode->count == 1) { if (sleep_args.mode->ival[0] == 0) { + ESP_LOGI(TAG, "enter light sleep"); + fflush(stdout); + fsync(fileno(stdout)); esp_light_sleep_start(); - ESP_LOGI(TAG, "esp_light_sleep_start"); + ESP_LOGI(TAG, "wakeup from lightsleep"); } else if (sleep_args.mode->ival[0] == 1) { + ESP_LOGI(TAG, "enter deep sleep"); esp_deep_sleep_start(); } else { ESP_LOGE(TAG, "no valid arguments"); @@ -128,7 +132,7 @@ static void register_ext1_wakeup(void) const esp_console_cmd_t cmd = { .command = "ext1", - .help = "configue ext1 wakeup", + .help = "configure ext1 wakeup", .hint = NULL, .func = &process_ext1_wakeup, .argtable = &ext1_wakeup_args @@ -202,7 +206,7 @@ static void register_rtcio_wakeup(void) const esp_console_cmd_t cmd = { .command = "rtcio", - .help = "configue rtcio wakeup", + .help = "configure rtcio wakeup", .hint = NULL, .func = &process_rtcio_wakeup, .argtable = &rtcio_wakeup_args @@ -277,7 +281,7 @@ static void register_gpio_wakeup(void) const esp_console_cmd_t cmd = { .command = "gpio", - .help = "configue gpio wakeup", + .help = "configure gpio wakeup", .hint = NULL, .func = &process_gpio_wakeup, .argtable = &gpio_wakeup_args @@ -336,7 +340,7 @@ static void register_gpio_control(void) const esp_console_cmd_t cmd = { .command = "gpio_control", - .help = "configue gpio control", + .help = "configure gpio control", .hint = NULL, .func = &process_gpio_control, .argtable = &gpio_control_args diff --git a/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py b/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py index f621c295e0..7e9cc880b8 100644 --- a/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py +++ b/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py @@ -113,15 +113,14 @@ def test_rtcio_deepsleep(dut: Tuple[IdfDut, IdfDut]) -> None: waker.expect(f'io_level = {sleep_level}', timeout=10) wakee.write('sleep -m 1') + wakee.expect('enter deep sleep', timeout=10) + sleep(2) waker.write(f'gpio_control -p {gpio_num} -l {wakeup_level}') waker.expect(f'io_num = {gpio_num}', timeout=10) waker.expect(f'io_level = {wakeup_level}', timeout=10) - wakee.expect('io_wakeup_test>', timeout=10) - sleep(2) - wakee.write('cause') wakee.expect('Wake up from GPIO', timeout=10) wakee.write(f'rtcio -p {gpio_num} -d') @@ -156,12 +155,13 @@ def test_gpio_wakeup_enable_lightsleep(dut: Tuple[IdfDut, IdfDut]) -> None: waker.expect(f'io_level = {sleep_level}', timeout=10) wakee.write('sleep -m 0') + wakee.expect('enter light sleep', timeout=10) + sleep(1) waker.write(f'gpio_control -p {gpio_num} -l {wakeup_level}') waker.expect(f'io_num = {gpio_num}', timeout=10) waker.expect(f'io_level = {wakeup_level}', timeout=10) - - wakee.expect('esp_light_sleep_start', timeout=10) + wakee.expect('wakeup from lightsleep', timeout=10) wakee.write('cause') wakee.expect('Wake up from GPIO', timeout=10)