Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_idf_p4_uart_wakeupmode0_v6.0' into 'release/v6.0'

Browse Source 
change(example): change uart wakeup mode 0 edge threshold(v6.0)

See merge request espressif/esp-idf!46374
This commit is contained in:
Jiang Jiang Jian
2026-03-24 10:56:08 +08:00
parent 484cf8f97d 0231ab2694
commit d84bfab4b5
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_uart/test_apps/uart/main/test_uart.c
+1 -1
View File
@@ -273,7 +273,7 @@ static void uart_wakeup_set_get_test(int uart_num)
printf("uart wake up set and get test\n"); printf("uart wake up set and get test\n");
int wake_up_set = 0; int wake_up_set = 0;
int wake_up_get = 0; int wake_up_get = 0;
for (int i = 3; i < 0x3ff; i++) { for (int i = 6; i < 0x3ff; i++) {
wake_up_set = i; wake_up_set = i;
TEST_ESP_OK(uart_set_wakeup_threshold(uart_num, wake_up_set)); TEST_ESP_OK(uart_set_wakeup_threshold(uart_num, wake_up_set));
TEST_ESP_OK(uart_get_wakeup_threshold(uart_num, &wake_up_get)); TEST_ESP_OK(uart_get_wakeup_threshold(uart_num, &wake_up_get));
components/esp_hal_uart/esp32p4/include/hal/uart_ll.h
+8 -4
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -1061,8 +1061,10 @@ FORCE_INLINE_ATTR void uart_ll_set_dtr_active_level(uart_dev_t *hw, int level)
*/ */
FORCE_INLINE_ATTR void uart_ll_set_wakeup_edge_thrd(uart_dev_t *hw, uint32_t wakeup_thrd) FORCE_INLINE_ATTR void uart_ll_set_wakeup_edge_thrd(uart_dev_t *hw, uint32_t wakeup_thrd)
{ {
// System would wakeup when the number of positive edges of RxD signal is larger than or equal to (UART_ACTIVE_THRESHOLD+3) // System would wakeup when the number of positive edges of RxD signal is larger than or equal to (UART_ACTIVE_THRESHOLD+offset)
hw->sleep_conf2.active_threshold = wakeup_thrd - UART_LL_WAKEUP_EDGE_THRED_MIN; // HP UART: offset is 6, LP UART: offset is 3
uint32_t offset = (hw == &LP_UART) ? UART_LL_WAKEUP_EDGE_THRED_MIN : UART_LL_WAKEUP_EDGE_THRED_MIN + 3;
hw->sleep_conf2.active_threshold = wakeup_thrd - offset;
} }
/** /**
@@ -1370,7 +1372,9 @@ FORCE_INLINE_ATTR void uart_ll_get_at_cmd_char(uart_dev_t *hw, uint8_t *cmd_char
*/ */
FORCE_INLINE_ATTR uint32_t uart_ll_get_wakeup_edge_thrd(uart_dev_t *hw) FORCE_INLINE_ATTR uint32_t uart_ll_get_wakeup_edge_thrd(uart_dev_t *hw)
{ {
return hw->sleep_conf2.active_threshold + UART_LL_WAKEUP_EDGE_THRED_MIN; // HP UART: offset is 6, LP UART: offset is 3
uint32_t offset = (hw == &LP_UART) ? UART_LL_WAKEUP_EDGE_THRED_MIN : UART_LL_WAKEUP_EDGE_THRED_MIN + 3;
return hw->sleep_conf2.active_threshold + offset;
} }
/** /**
examples/system/light_sleep/main/uart_wakeup.c
+2 -1
View File
@@ -26,7 +26,8 @@
#define EXAMPLE_UART_BAUDRATE 115200 #define EXAMPLE_UART_BAUDRATE 115200
#endif #endif
#define EXAMPLE_UART_WAKEUP_EDGE_THRESHOLD 3 /* In ESP32, the min wakeup threshold is 2; in ESP32P4, the min wakeup threshold is 6; in other targets, the min wakeup threshold is 3.*/
#define EXAMPLE_UART_WAKEUP_EDGE_THRESHOLD 6
#define EXAMPLE_UART_WAKEUP_FIFO_THRESHOLD 8 #define EXAMPLE_UART_WAKEUP_FIFO_THRESHOLD 8
#define EXAMPLE_UART_WAKEUP_CHARS_SEQ "ok" #define EXAMPLE_UART_WAKEUP_CHARS_SEQ "ok"
#define EXAMPLE_UART_WAKEUP_CHARS_SEQ_LEN SOC_UART_WAKEUP_CHARS_SEQ_MAX_LEN #define EXAMPLE_UART_WAKEUP_CHARS_SEQ_LEN SOC_UART_WAKEUP_CHARS_SEQ_MAX_LEN
examples/system/light_sleep/pytest_light_sleep.py
+6 -6
View File
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
import logging import logging
import time import time
@@ -32,7 +32,7 @@ def test_light_sleep(dut: Dut) -> None:
# enter sleep second time # enter sleep second time
dut.expect_exact(ENTERING_SLEEP_STR) dut.expect_exact(ENTERING_SLEEP_STR)
match = dut.expect(EXIT_SLEEP_REGEX) match = dut.expect(EXIT_SLEEP_REGEX)
logging.info('Got second sleep period, wakeup from {}, slept for {}'.format(match.group(1), match.group(3))) logging.info(f'Got second sleep period, wakeup from {match.group(1)}, slept for {match.group(3)}')
# sleep time error should be less than 1ms # sleep time error should be less than 1ms
# TODO: Need to update sleep overhead_out time for esp32c5 (PM-209) # TODO: Need to update sleep overhead_out time for esp32c5 (PM-209)
assert ( assert (
@@ -47,7 +47,7 @@ def test_light_sleep(dut: Dut) -> None:
dut.serial.proc.setDTR(True) dut.serial.proc.setDTR(True)
time.sleep(1) time.sleep(1)
match = dut.expect(EXIT_SLEEP_PIN_REGEX) match = dut.expect(EXIT_SLEEP_PIN_REGEX)
logging.info('Got third sleep period, wakeup from {}, slept for {}'.format(match.group(1), match.group(3))) logging.info(f'Got third sleep period, wakeup from {match.group(1)}, slept for {match.group(3)}')
assert int(match.group(3)) < WAKEUP_INTERVAL_MS assert int(match.group(3)) < WAKEUP_INTERVAL_MS
dut.expect(WAITING_FOR_GPIO_STR) dut.expect(WAITING_FOR_GPIO_STR)
@@ -57,11 +57,11 @@ def test_light_sleep(dut: Dut) -> None:
dut.expect_exact(ENTERING_SLEEP_STR) dut.expect_exact(ENTERING_SLEEP_STR)
logging.info('Went to sleep again') logging.info('Went to sleep again')
# Write 'a' to uart, 'a' in ascii is 0x61 which contains 3 rising edges in total (including the stop bit) # Write 'tt' to uart, 'tt' in ascii is 0x74 0x74 which contains 6 rising edges in total (including the stop bit)
dut.write('a') dut.serial.proc.write(b'tt')
time.sleep(1) time.sleep(1)
match = dut.expect(EXIT_SLEEP_UART_REGEX) match = dut.expect(EXIT_SLEEP_UART_REGEX)
logging.info('Got third sleep period, wakeup from {}, slept for {}'.format(match.group(1), match.group(3))) logging.info(f'Got third sleep period, wakeup from {match.group(1)}, slept for {match.group(3)}')
assert int(match.group(3)) < WAKEUP_INTERVAL_MS assert int(match.group(3)) < WAKEUP_INTERVAL_MS
logging.info('Went to sleep again') logging.info('Went to sleep again')