From 0daccd7f30d938a10a96fb17851bfc76085c428b Mon Sep 17 00:00:00 2001 From: Chen Jichang Date: Fri, 25 Apr 2025 18:32:58 +0800 Subject: [PATCH] fix(lcd): fix the infinite wait when lvgl timer is no ready Merges https://github.com/espressif/esp-idf/pull/15853 --- .../main/i80_controller_example_main.c | 14 +++++++------- .../mipi_dsi/main/mipi_dsi_lcd_example_main.c | 14 ++++++++------ .../lcd/rgb_panel/main/rgb_lcd_example_main.c | 15 ++++++++------- .../main/spi_lcd_touch_example_main.c | 17 ++++++----------- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/examples/peripherals/lcd/i80_controller/main/i80_controller_example_main.c b/examples/peripherals/lcd/i80_controller/main/i80_controller_example_main.c index 6f65912e30..c17de48158 100644 --- a/examples/peripherals/lcd/i80_controller/main/i80_controller_example_main.c +++ b/examples/peripherals/lcd/i80_controller/main/i80_controller_example_main.c @@ -1,11 +1,12 @@ /* - * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: CC0-1.0 */ #include #include +#include #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" @@ -69,7 +70,7 @@ static const char *TAG = "example"; #define EXAMPLE_LVGL_TICK_PERIOD_MS 2 #define EXAMPLE_LVGL_TASK_MAX_DELAY_MS 500 -#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1 +#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1000 / CONFIG_FREERTOS_HZ #define EXAMPLE_LVGL_TASK_STACK_SIZE (4 * 1024) #define EXAMPLE_LVGL_TASK_PRIORITY 2 #define EXAMPLE_LVGL_DRAW_BUF_LINES 100 @@ -116,11 +117,10 @@ static void example_lvgl_port_task(void *arg) _lock_acquire(&lvgl_api_lock); time_till_next_ms = lv_timer_handler(); _lock_release(&lvgl_api_lock); - if (time_till_next_ms > EXAMPLE_LVGL_TASK_MAX_DELAY_MS) { - time_till_next_ms = EXAMPLE_LVGL_TASK_MAX_DELAY_MS; - } else if (time_till_next_ms < EXAMPLE_LVGL_TASK_MIN_DELAY_MS) { - time_till_next_ms = EXAMPLE_LVGL_TASK_MIN_DELAY_MS; - } + // in case of triggering a task watch dog time out + time_till_next_ms = MAX(time_till_next_ms, EXAMPLE_LVGL_TASK_MIN_DELAY_MS); + // in case of lvgl display not ready yet + time_till_next_ms = MIN(time_till_next_ms, EXAMPLE_LVGL_TASK_MAX_DELAY_MS); vTaskDelay(pdMS_TO_TICKS(time_till_next_ms)); } } diff --git a/examples/peripherals/lcd/mipi_dsi/main/mipi_dsi_lcd_example_main.c b/examples/peripherals/lcd/mipi_dsi/main/mipi_dsi_lcd_example_main.c index 80f8e08f81..a51828a783 100644 --- a/examples/peripherals/lcd/mipi_dsi/main/mipi_dsi_lcd_example_main.c +++ b/examples/peripherals/lcd/mipi_dsi/main/mipi_dsi_lcd_example_main.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: CC0-1.0 */ @@ -7,6 +7,7 @@ #include #include #include +#include #include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" @@ -79,6 +80,8 @@ static const char *TAG = "example"; #define EXAMPLE_LVGL_TICK_PERIOD_MS 2 #define EXAMPLE_LVGL_TASK_STACK_SIZE (4 * 1024) #define EXAMPLE_LVGL_TASK_PRIORITY 2 +#define EXAMPLE_LVGL_TASK_MAX_DELAY_MS 500 +#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1000 / CONFIG_FREERTOS_HZ // LVGL library is not thread-safe, this example will call LVGL APIs from different tasks, so use a mutex to protect it static _lock_t lvgl_api_lock; @@ -110,11 +113,10 @@ static void example_lvgl_port_task(void *arg) _lock_acquire(&lvgl_api_lock); time_till_next_ms = lv_timer_handler(); _lock_release(&lvgl_api_lock); - - // in case of task watch dog timeout, set the minimal delay to 10ms - if (time_till_next_ms < 10) { - time_till_next_ms = 10; - } + // in case of triggering a task watch dog time out + time_till_next_ms = MAX(time_till_next_ms, EXAMPLE_LVGL_TASK_MIN_DELAY_MS); + // in case of lvgl display not ready yet + time_till_next_ms = MIN(time_till_next_ms, EXAMPLE_LVGL_TASK_MAX_DELAY_MS); usleep(1000 * time_till_next_ms); } } diff --git a/examples/peripherals/lcd/rgb_panel/main/rgb_lcd_example_main.c b/examples/peripherals/lcd/rgb_panel/main/rgb_lcd_example_main.c index d9b983617d..0b0366158b 100644 --- a/examples/peripherals/lcd/rgb_panel/main/rgb_lcd_example_main.c +++ b/examples/peripherals/lcd/rgb_panel/main/rgb_lcd_example_main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: CC0-1.0 */ @@ -7,6 +7,7 @@ #include #include #include +#include #include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" @@ -95,6 +96,8 @@ static const char *TAG = "example"; #define EXAMPLE_LVGL_TICK_PERIOD_MS 2 #define EXAMPLE_LVGL_TASK_STACK_SIZE (5 * 1024) #define EXAMPLE_LVGL_TASK_PRIORITY 2 +#define EXAMPLE_LVGL_TASK_MAX_DELAY_MS 500 +#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1000 / CONFIG_FREERTOS_HZ // LVGL library is not thread-safe, this example will call LVGL APIs from different tasks, so use a mutex to protect it static _lock_t lvgl_api_lock; @@ -133,12 +136,10 @@ static void example_lvgl_port_task(void *arg) _lock_acquire(&lvgl_api_lock); time_till_next_ms = lv_timer_handler(); _lock_release(&lvgl_api_lock); - - // in case of task watch dog timeout, set the minimal delay to 10ms - if (time_till_next_ms < 10) { - time_till_next_ms = 10; - } - + // in case of task watch dog timeout + time_till_next_ms = MAX(time_till_next_ms, EXAMPLE_LVGL_TASK_MIN_DELAY_MS); + // in case of lvgl display not ready yet + time_till_next_ms = MIN(time_till_next_ms, EXAMPLE_LVGL_TASK_MAX_DELAY_MS); usleep(1000 * time_till_next_ms); } } diff --git a/examples/peripherals/lcd/spi_lcd_touch/main/spi_lcd_touch_example_main.c b/examples/peripherals/lcd/spi_lcd_touch/main/spi_lcd_touch_example_main.c index a5dfae5b7b..c80ed7174d 100644 --- a/examples/peripherals/lcd/spi_lcd_touch/main/spi_lcd_touch_example_main.c +++ b/examples/peripherals/lcd/spi_lcd_touch/main/spi_lcd_touch_example_main.c @@ -65,7 +65,7 @@ static const char *TAG = "example"; #define EXAMPLE_LVGL_DRAW_BUF_LINES 20 // number of display lines in each draw buffer #define EXAMPLE_LVGL_TICK_PERIOD_MS 2 #define EXAMPLE_LVGL_TASK_MAX_DELAY_MS 500 -#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1 +#define EXAMPLE_LVGL_TASK_MIN_DELAY_MS 1000 / CONFIG_FREERTOS_HZ #define EXAMPLE_LVGL_TASK_STACK_SIZE (4 * 1024) #define EXAMPLE_LVGL_TASK_PRIORITY 2 @@ -157,20 +157,15 @@ static void example_lvgl_port_task(void *arg) { ESP_LOGI(TAG, "Starting LVGL task"); uint32_t time_till_next_ms = 0; - uint32_t time_threshold_ms = 1000 / CONFIG_FREERTOS_HZ; while (1) { _lock_acquire(&lvgl_api_lock); time_till_next_ms = lv_timer_handler(); _lock_release(&lvgl_api_lock); - if ( time_till_next_ms == LV_NO_TIMER_READY ) { - //most probably lvgl display not ready yet - usleep( 1000 * 1000 ); - } - else { - // in case of triggering a task watch dog time out - time_till_next_ms = MAX(time_till_next_ms, time_threshold_ms); - usleep(1000 * time_till_next_ms); - } + // in case of triggering a task watch dog time out + time_till_next_ms = MAX(time_till_next_ms, EXAMPLE_LVGL_TASK_MIN_DELAY_MS); + // in case of lvgl display not ready yet + time_till_next_ms = MIN(time_till_next_ms, EXAMPLE_LVGL_TASK_MAX_DELAY_MS); + usleep(1000 * time_till_next_ms); } }