diff --git a/components/esp_lcd/test_apps/.build-test-rules.yml b/components/esp_lcd/test_apps/.build-test-rules.yml index 4db9d3a06e..d6308cf692 100644 --- a/components/esp_lcd/test_apps/.build-test-rules.yml +++ b/components/esp_lcd/test_apps/.build-test-rules.yml @@ -52,7 +52,3 @@ components/esp_lcd/test_apps/spi_lcd: - esp_driver_spi disable: - if: SOC_GPSPI_SUPPORTED != 1 - disable_test: - - if: IDF_TARGET in ["esp32c61"] - temporary: true - reason: test failed # TODO: ESP32C61 IDF-10953 diff --git a/components/esp_lcd/test_apps/spi_lcd/main/test_spi_board.h b/components/esp_lcd/test_apps/spi_lcd/main/test_spi_board.h index 9ce7d5224e..aa8d1c8d7b 100644 --- a/components/esp_lcd/test_apps/spi_lcd/main/test_spi_board.h +++ b/components/esp_lcd/test_apps/spi_lcd/main/test_spi_board.h @@ -28,6 +28,13 @@ extern "C" { #define TEST_LCD_DC_GPIO 1 #define TEST_LCD_PCLK_GPIO 2 #define TEST_LCD_DATA0_GPIO 4 +#elif CONFIG_IDF_TARGET_ESP32C61 +#define TEST_LCD_BK_LIGHT_GPIO 3 +#define TEST_LCD_RST_GPIO 5 +#define TEST_LCD_CS_GPIO 0 +#define TEST_LCD_DC_GPIO 1 +#define TEST_LCD_PCLK_GPIO 2 +#define TEST_LCD_DATA0_GPIO 4 #elif CONFIG_IDF_TARGET_ESP32P4 #define TEST_LCD_BK_LIGHT_GPIO 23 #define TEST_LCD_RST_GPIO 6 diff --git a/components/esp_lcd/test_apps/spi_lcd/pytest_spi_lcd.py b/components/esp_lcd/test_apps/spi_lcd/pytest_spi_lcd.py index 5f29356b4c..2cdeaf11e8 100644 --- a/components/esp_lcd/test_apps/spi_lcd/pytest_spi_lcd.py +++ b/components/esp_lcd/test_apps/spi_lcd/pytest_spi_lcd.py @@ -5,7 +5,6 @@ from pytest_embedded import Dut @pytest.mark.supported_targets -@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='test case fail') # TODO: [ESP32C61] IDF-10953 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/docs/en/api-reference/peripherals/lcd/spi_lcd.rst b/docs/en/api-reference/peripherals/lcd/spi_lcd.rst index 8f254ca9d9..2fbb8fc2a9 100644 --- a/docs/en/api-reference/peripherals/lcd/spi_lcd.rst +++ b/docs/en/api-reference/peripherals/lcd/spi_lcd.rst @@ -5,14 +5,16 @@ SPI Interfaced LCD #. Create an SPI bus. Please refer to :doc:`SPI Master API doc ` for more details. + Currently the driver supports SPI, Quad SPI and Octal SPI (simulate Intel 8080 timing) modes. + .. code-block:: c spi_bus_config_t buscfg = { .sclk_io_num = EXAMPLE_PIN_NUM_SCLK, .mosi_io_num = EXAMPLE_PIN_NUM_MOSI, .miso_io_num = EXAMPLE_PIN_NUM_MISO, - .quadwp_io_num = -1, // Quad SPI LCD driver is not yet supported - .quadhd_io_num = -1, // Quad SPI LCD driver is not yet supported + .quadwp_io_num = -1, + .quadhd_io_num = -1, .max_transfer_sz = EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t), // transfer 80 lines of pixels (assume pixel is RGB565) at most in one SPI transaction }; ESP_ERROR_CHECK(spi_bus_initialize(LCD_HOST, &buscfg, SPI_DMA_CH_AUTO)); // Enable the DMA feature diff --git a/docs/zh_CN/api-reference/peripherals/lcd/spi_lcd.rst b/docs/zh_CN/api-reference/peripherals/lcd/spi_lcd.rst index 1460cd39fc..44d511c547 100644 --- a/docs/zh_CN/api-reference/peripherals/lcd/spi_lcd.rst +++ b/docs/zh_CN/api-reference/peripherals/lcd/spi_lcd.rst @@ -5,14 +5,16 @@ SPI 接口的 LCD #. 创建 SPI 总线。详情请参阅 :doc:`SPI 主机 API 文档 `。 + 目前驱动支持 SPI， Quad SPI 和 Octal SPI（模拟 Intel 8080 时序）模式。 + .. code-block:: c spi_bus_config_t buscfg = { .sclk_io_num = EXAMPLE_PIN_NUM_SCLK, .mosi_io_num = EXAMPLE_PIN_NUM_MOSI, .miso_io_num = EXAMPLE_PIN_NUM_MISO, - .quadwp_io_num = -1, // 目前不支持 Quad SPI LCD 驱动 - .quadhd_io_num = -1, // 目前不支持 Quad SPI LCD 驱动 + .quadwp_io_num = -1, + .quadhd_io_num = -1, .max_transfer_sz = EXAMPLE_LCD_H_RES * 80 * sizeof(uint16_t), // 单次最多可传输 80 行像素（假设像素格式为 RGB565） }; ESP_ERROR_CHECK(spi_bus_initialize(LCD_HOST, &buscfg, SPI_DMA_CH_AUTO)); // 启用 DMA diff --git a/examples/peripherals/lcd/spi_lcd_touch/main/idf_component.yml b/examples/peripherals/lcd/spi_lcd_touch/main/idf_component.yml index a1a4039923..1ce88fe63e 100644 --- a/examples/peripherals/lcd/spi_lcd_touch/main/idf_component.yml +++ b/examples/peripherals/lcd/spi_lcd_touch/main/idf_component.yml @@ -1,6 +1,5 @@ dependencies: - idf: ">=4.4" - lvgl/lvgl: "~8.3.0" + lvgl/lvgl: "~9.2.0" esp_lcd_ili9341: "^1.0" esp_lcd_gc9a01: "^1.0" esp_lcd_touch_stmpe610: "^1.0" diff --git a/examples/peripherals/lcd/spi_lcd_touch/main/lvgl_demo_ui.c b/examples/peripherals/lcd/spi_lcd_touch/main/lvgl_demo_ui.c index 591dd95eed..a47d76ffee 100644 --- a/examples/peripherals/lcd/spi_lcd_touch/main/lvgl_demo_ui.c +++ b/examples/peripherals/lcd/spi_lcd_touch/main/lvgl_demo_ui.c @@ -1,86 +1,56 @@ /* - * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: CC0-1.0 */ -// This demo UI is adapted from LVGL official example: https://docs.lvgl.io/master/widgets/extra/meter.html#simple-meter +// This demo UI is adapted from LVGL official example: https://docs.lvgl.io/master/examples.html#loader-with-arc #include "lvgl.h" -static lv_obj_t *meter; static lv_obj_t * btn; -static lv_disp_rot_t rotation = LV_DISP_ROT_NONE; - -static void set_value(void *indic, int32_t v) -{ - lv_meter_set_indicator_end_value(meter, indic, v); -} +static lv_display_rotation_t rotation = LV_DISP_ROTATION_0; static void btn_cb(lv_event_t * e) { - lv_disp_t *disp = lv_event_get_user_data(e); + lv_display_t *disp = lv_event_get_user_data(e); rotation++; - if (rotation > LV_DISP_ROT_270) { - rotation = LV_DISP_ROT_NONE; + if (rotation > LV_DISP_ROTATION_270) { + rotation = LV_DISP_ROTATION_0; } lv_disp_set_rotation(disp, rotation); } - -void example_lvgl_demo_ui(lv_disp_t *disp) +static void set_angle(void * obj, int32_t v) { - lv_obj_t *scr = lv_disp_get_scr_act(disp); - meter = lv_meter_create(scr); - lv_obj_center(meter); - lv_obj_set_size(meter, 200, 200); + lv_arc_set_value(obj, v); +} - /*Add a scale first*/ - lv_meter_scale_t *scale = lv_meter_add_scale(meter); - lv_meter_set_scale_ticks(meter, scale, 41, 2, 10, lv_palette_main(LV_PALETTE_GREY)); - lv_meter_set_scale_major_ticks(meter, scale, 8, 4, 15, lv_color_black(), 10); +void example_lvgl_demo_ui(lv_display_t *disp) +{ + lv_obj_t *scr = lv_display_get_screen_active(disp); - lv_meter_indicator_t *indic; - - /*Add a blue arc to the start*/ - indic = lv_meter_add_arc(meter, scale, 3, lv_palette_main(LV_PALETTE_BLUE), 0); - lv_meter_set_indicator_start_value(meter, indic, 0); - lv_meter_set_indicator_end_value(meter, indic, 20); - - /*Make the tick lines blue at the start of the scale*/ - indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_BLUE), false, 0); - lv_meter_set_indicator_start_value(meter, indic, 0); - lv_meter_set_indicator_end_value(meter, indic, 20); - - /*Add a red arc to the end*/ - indic = lv_meter_add_arc(meter, scale, 3, lv_palette_main(LV_PALETTE_RED), 0); - lv_meter_set_indicator_start_value(meter, indic, 80); - lv_meter_set_indicator_end_value(meter, indic, 100); - - /*Make the tick lines red at the end of the scale*/ - indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_RED), lv_palette_main(LV_PALETTE_RED), false, 0); - lv_meter_set_indicator_start_value(meter, indic, 80); - lv_meter_set_indicator_end_value(meter, indic, 100); - - /*Add a needle line indicator*/ - indic = lv_meter_add_needle_line(meter, scale, 4, lv_palette_main(LV_PALETTE_GREY), -10); - - btn = lv_btn_create(scr); + btn = lv_button_create(scr); lv_obj_t * lbl = lv_label_create(btn); lv_label_set_text_static(lbl, LV_SYMBOL_REFRESH" ROTATE"); lv_obj_align(btn, LV_ALIGN_BOTTOM_LEFT, 30, -30); /*Button event*/ lv_obj_add_event_cb(btn, btn_cb, LV_EVENT_CLICKED, disp); - /*Create an animation to set the value*/ + /*Create an Arc*/ + lv_obj_t * arc = lv_arc_create(scr); + lv_arc_set_rotation(arc, 270); + lv_arc_set_bg_angles(arc, 0, 360); + lv_obj_remove_style(arc, NULL, LV_PART_KNOB); /*Be sure the knob is not displayed*/ + lv_obj_remove_flag(arc, LV_OBJ_FLAG_CLICKABLE); /*To not allow adjusting by click*/ + lv_obj_center(arc); + lv_anim_t a; lv_anim_init(&a); - lv_anim_set_exec_cb(&a, set_value); - lv_anim_set_var(&a, indic); + lv_anim_set_var(&a, arc); + lv_anim_set_exec_cb(&a, set_angle); + lv_anim_set_duration(&a, 1000); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); /*Just for the demo*/ + lv_anim_set_repeat_delay(&a, 500); lv_anim_set_values(&a, 0, 100); - lv_anim_set_time(&a, 2000); - lv_anim_set_repeat_delay(&a, 100); - lv_anim_set_playback_time(&a, 500); - lv_anim_set_playback_delay(&a, 100); - lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); lv_anim_start(&a); } 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 03c7921e32..7388ae80b9 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 @@ -1,13 +1,15 @@ /* - * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: CC0-1.0 */ #include +#include +#include +#include #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "freertos/semphr.h" #include "esp_timer.h" #include "esp_lcd_panel_io.h" #include "esp_lcd_panel_vendor.h" @@ -60,99 +62,80 @@ static const char *TAG = "example"; #define EXAMPLE_LCD_CMD_BITS 8 #define EXAMPLE_LCD_PARAM_BITS 8 +#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_STACK_SIZE (4 * 1024) #define EXAMPLE_LVGL_TASK_PRIORITY 2 -static SemaphoreHandle_t lvgl_mux = NULL; - -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED -esp_lcd_touch_handle_t tp = NULL; -#endif +// 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; extern void example_lvgl_demo_ui(lv_disp_t *disp); static bool example_notify_lvgl_flush_ready(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx) { - lv_disp_drv_t *disp_driver = (lv_disp_drv_t *)user_ctx; - lv_disp_flush_ready(disp_driver); + lv_display_t *disp = (lv_display_t *)user_ctx; + lv_display_flush_ready(disp); return false; } -static void example_lvgl_flush_cb(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map) -{ - esp_lcd_panel_handle_t panel_handle = (esp_lcd_panel_handle_t) drv->user_data; - int offsetx1 = area->x1; - int offsetx2 = area->x2; - int offsety1 = area->y1; - int offsety2 = area->y2; - // copy a buffer's content to a specific area of the display - esp_lcd_panel_draw_bitmap(panel_handle, offsetx1, offsety1, offsetx2 + 1, offsety2 + 1, color_map); -} - /* Rotate display and touch, when rotated screen in LVGL. Called when driver parameters are updated. */ -static void example_lvgl_port_update_callback(lv_disp_drv_t *drv) +static void example_lvgl_port_update_callback(lv_display_t *disp) { - esp_lcd_panel_handle_t panel_handle = (esp_lcd_panel_handle_t) drv->user_data; + esp_lcd_panel_handle_t panel_handle = lv_display_get_user_data(disp); + lv_display_rotation_t rotation = lv_display_get_rotation(disp); - switch (drv->rotated) { - case LV_DISP_ROT_NONE: + switch (rotation) { + case LV_DISPLAY_ROTATION_0: // Rotate LCD display esp_lcd_panel_swap_xy(panel_handle, false); esp_lcd_panel_mirror(panel_handle, true, false); -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - // Rotate LCD touch - esp_lcd_touch_set_mirror_y(tp, false); - esp_lcd_touch_set_mirror_x(tp, false); -#endif break; - case LV_DISP_ROT_90: + case LV_DISPLAY_ROTATION_90: // Rotate LCD display esp_lcd_panel_swap_xy(panel_handle, true); esp_lcd_panel_mirror(panel_handle, true, true); -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - // Rotate LCD touch - esp_lcd_touch_set_mirror_y(tp, false); - esp_lcd_touch_set_mirror_x(tp, false); -#endif break; - case LV_DISP_ROT_180: + case LV_DISPLAY_ROTATION_180: // Rotate LCD display esp_lcd_panel_swap_xy(panel_handle, false); esp_lcd_panel_mirror(panel_handle, false, true); -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - // Rotate LCD touch - esp_lcd_touch_set_mirror_y(tp, false); - esp_lcd_touch_set_mirror_x(tp, false); -#endif break; - case LV_DISP_ROT_270: + case LV_DISPLAY_ROTATION_270: // Rotate LCD display esp_lcd_panel_swap_xy(panel_handle, true); esp_lcd_panel_mirror(panel_handle, false, false); -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - // Rotate LCD touch - esp_lcd_touch_set_mirror_y(tp, false); - esp_lcd_touch_set_mirror_x(tp, false); -#endif break; } } +static void example_lvgl_flush_cb(lv_display_t *disp, const lv_area_t *area, uint8_t *px_map) +{ + example_lvgl_port_update_callback(disp); + esp_lcd_panel_handle_t panel_handle = lv_display_get_user_data(disp); + int offsetx1 = area->x1; + int offsetx2 = area->x2; + int offsety1 = area->y1; + int offsety2 = area->y2; + // because SPI LCD is big-endian, we need to swap the RGB bytes order + lv_draw_sw_rgb565_swap(px_map, (offsetx2 + 1 - offsetx1) * (offsety2 + 1 - offsety1)); + // copy a buffer's content to a specific area of the display + esp_lcd_panel_draw_bitmap(panel_handle, offsetx1, offsety1, offsetx2 + 1, offsety2 + 1, px_map); +} + #if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED -static void example_lvgl_touch_cb(lv_indev_drv_t * drv, lv_indev_data_t * data) +static void example_lvgl_touch_cb(lv_indev_t * indev, lv_indev_data_t * data) { uint16_t touchpad_x[1] = {0}; uint16_t touchpad_y[1] = {0}; uint8_t touchpad_cnt = 0; - /* Read touch controller data */ - esp_lcd_touch_read_data(drv->user_data); - + esp_lcd_touch_handle_t touch_pad = lv_indev_get_user_data(indev); + esp_lcd_touch_read_data(touch_pad); /* Get coordinates */ - bool touchpad_pressed = esp_lcd_touch_get_coordinates(drv->user_data, touchpad_x, touchpad_y, NULL, &touchpad_cnt, 1); + bool touchpad_pressed = esp_lcd_touch_get_coordinates(touch_pad, touchpad_x, touchpad_y, NULL, &touchpad_cnt, 1); if (touchpad_pressed && touchpad_cnt > 0) { data->point.x = touchpad_x[0]; @@ -170,44 +153,23 @@ static void example_increase_lvgl_tick(void *arg) lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS); } -bool example_lvgl_lock(int timeout_ms) -{ - // Convert timeout in milliseconds to FreeRTOS ticks - // If `timeout_ms` is set to -1, the program will block until the condition is met - const TickType_t timeout_ticks = (timeout_ms == -1) ? portMAX_DELAY : pdMS_TO_TICKS(timeout_ms); - return xSemaphoreTakeRecursive(lvgl_mux, timeout_ticks) == pdTRUE; -} - -void example_lvgl_unlock(void) -{ - xSemaphoreGiveRecursive(lvgl_mux); -} - static void example_lvgl_port_task(void *arg) { ESP_LOGI(TAG, "Starting LVGL task"); - uint32_t task_delay_ms = EXAMPLE_LVGL_TASK_MAX_DELAY_MS; + uint32_t time_till_next_ms = 0; + uint32_t time_threshold_ms = 1000 / CONFIG_FREERTOS_HZ; while (1) { - // Lock the mutex due to the LVGL APIs are not thread-safe - if (example_lvgl_lock(-1)) { - task_delay_ms = lv_timer_handler(); - // Release the mutex - example_lvgl_unlock(); - } - if (task_delay_ms > EXAMPLE_LVGL_TASK_MAX_DELAY_MS) { - task_delay_ms = EXAMPLE_LVGL_TASK_MAX_DELAY_MS; - } else if (task_delay_ms < EXAMPLE_LVGL_TASK_MIN_DELAY_MS) { - task_delay_ms = EXAMPLE_LVGL_TASK_MIN_DELAY_MS; - } - vTaskDelay(pdMS_TO_TICKS(task_delay_ms)); + _lock_acquire(&lvgl_api_lock); + time_till_next_ms = lv_timer_handler(); + _lock_release(&lvgl_api_lock); + // 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); } } void app_main(void) { - static lv_disp_draw_buf_t disp_buf; // contains internal graphic buffer(s) called draw buffer(s) - static lv_disp_drv_t disp_drv; // contains callback functions - ESP_LOGI(TAG, "Turn off LCD backlight"); gpio_config_t bk_gpio_config = { .mode = GPIO_MODE_OUTPUT, @@ -236,8 +198,6 @@ void app_main(void) .lcd_param_bits = EXAMPLE_LCD_PARAM_BITS, .spi_mode = 0, .trans_queue_depth = 10, - .on_color_trans_done = example_notify_lvgl_flush_ready, - .user_ctx = &disp_drv, }; // Attach the LCD to the SPI bus ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)LCD_HOST, &io_config, &io_handle)); @@ -266,6 +226,49 @@ void app_main(void) // user can flush pre-defined pattern to the screen before we turn on the screen or backlight ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_handle, true)); + ESP_LOGI(TAG, "Turn on LCD backlight"); + gpio_set_level(EXAMPLE_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL); + + ESP_LOGI(TAG, "Initialize LVGL library"); + lv_init(); + + // create a lvgl display + lv_display_t *display = lv_display_create(EXAMPLE_LCD_H_RES, EXAMPLE_LCD_V_RES); + + // alloc draw buffers used by LVGL + // it's recommended to choose the size of the draw buffer(s) to be at least 1/10 screen sized + size_t draw_buffer_sz = EXAMPLE_LCD_H_RES * EXAMPLE_LVGL_DRAW_BUF_LINES * sizeof(lv_color16_t); + + void *buf1 = spi_bus_dma_memory_alloc(LCD_HOST, draw_buffer_sz, 0); + assert(buf1); + void *buf2 = spi_bus_dma_memory_alloc(LCD_HOST, draw_buffer_sz, 0); + assert(buf2); + // initialize LVGL draw buffers + lv_display_set_buffers(display, buf1, buf2, draw_buffer_sz, LV_DISPLAY_RENDER_MODE_PARTIAL); + // associate the mipi panel handle to the display + lv_display_set_user_data(display, panel_handle); + // set color depth + lv_display_set_color_format(display, LV_COLOR_FORMAT_RGB565); + // set the callback which can copy the rendered image to an area of the display + lv_display_set_flush_cb(display, example_lvgl_flush_cb); + + ESP_LOGI(TAG, "Install LVGL tick timer"); + // Tick interface for LVGL (using esp_timer to generate 2ms periodic event) + const esp_timer_create_args_t lvgl_tick_timer_args = { + .callback = &example_increase_lvgl_tick, + .name = "lvgl_tick" + }; + esp_timer_handle_t lvgl_tick_timer = NULL; + ESP_ERROR_CHECK(esp_timer_create(&lvgl_tick_timer_args, &lvgl_tick_timer)); + ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); + + ESP_LOGI(TAG, "Register io panel event callback for LVGL flush ready notification"); + const esp_lcd_panel_io_callbacks_t cbs = { + .on_color_trans_done = example_notify_lvgl_flush_ready, + }; + /* Register done callback */ + ESP_ERROR_CHECK(esp_lcd_panel_io_register_event_callbacks(io_handle, &cbs, display)); + #if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED esp_lcd_panel_io_handle_t tp_io_handle = NULL; esp_lcd_panel_io_spi_config_t tp_io_config = ESP_LCD_TOUCH_IO_SPI_STMPE610_CONFIG(EXAMPLE_PIN_NUM_TOUCH_CS); @@ -283,68 +286,27 @@ void app_main(void) .mirror_y = 0, }, }; + esp_lcd_touch_handle_t tp = NULL; #if CONFIG_EXAMPLE_LCD_TOUCH_CONTROLLER_STMPE610 ESP_LOGI(TAG, "Initialize touch controller STMPE610"); ESP_ERROR_CHECK(esp_lcd_touch_new_spi_stmpe610(tp_io_handle, &tp_cfg, &tp)); #endif // CONFIG_EXAMPLE_LCD_TOUCH_CONTROLLER_STMPE610 -#endif // CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - ESP_LOGI(TAG, "Turn on LCD backlight"); - gpio_set_level(EXAMPLE_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL); - - ESP_LOGI(TAG, "Initialize LVGL library"); - lv_init(); - // alloc draw buffers used by LVGL - // it's recommended to choose the size of the draw buffer(s) to be at least 1/10 screen sized - lv_color_t *buf1 = heap_caps_malloc(EXAMPLE_LCD_H_RES * 20 * sizeof(lv_color_t), MALLOC_CAP_DMA); - assert(buf1); - lv_color_t *buf2 = heap_caps_malloc(EXAMPLE_LCD_H_RES * 20 * sizeof(lv_color_t), MALLOC_CAP_DMA); - assert(buf2); - // initialize LVGL draw buffers - lv_disp_draw_buf_init(&disp_buf, buf1, buf2, EXAMPLE_LCD_H_RES * 20); - - ESP_LOGI(TAG, "Register display driver to LVGL"); - lv_disp_drv_init(&disp_drv); - disp_drv.hor_res = EXAMPLE_LCD_H_RES; - disp_drv.ver_res = EXAMPLE_LCD_V_RES; - disp_drv.flush_cb = example_lvgl_flush_cb; - disp_drv.drv_update_cb = example_lvgl_port_update_callback; - disp_drv.draw_buf = &disp_buf; - disp_drv.user_data = panel_handle; - lv_disp_t *disp = lv_disp_drv_register(&disp_drv); - - ESP_LOGI(TAG, "Install LVGL tick timer"); - // Tick interface for LVGL (using esp_timer to generate 2ms periodic event) - const esp_timer_create_args_t lvgl_tick_timer_args = { - .callback = &example_increase_lvgl_tick, - .name = "lvgl_tick" - }; - esp_timer_handle_t lvgl_tick_timer = NULL; - ESP_ERROR_CHECK(esp_timer_create(&lvgl_tick_timer_args, &lvgl_tick_timer)); - ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); - -#if CONFIG_EXAMPLE_LCD_TOUCH_ENABLED - static lv_indev_drv_t indev_drv; // Input device driver (Touch) - lv_indev_drv_init(&indev_drv); - indev_drv.type = LV_INDEV_TYPE_POINTER; - indev_drv.disp = disp; - indev_drv.read_cb = example_lvgl_touch_cb; - indev_drv.user_data = tp; - - lv_indev_drv_register(&indev_drv); + static lv_indev_t *indev; + indev = lv_indev_create(); // Input device driver (Touch) + lv_indev_set_type(indev, LV_INDEV_TYPE_POINTER); + lv_indev_set_display(indev, display); + lv_indev_set_user_data(indev, tp); + lv_indev_set_read_cb(indev, example_lvgl_touch_cb); #endif - lvgl_mux = xSemaphoreCreateRecursiveMutex(); - assert(lvgl_mux); ESP_LOGI(TAG, "Create LVGL task"); xTaskCreate(example_lvgl_port_task, "LVGL", EXAMPLE_LVGL_TASK_STACK_SIZE, NULL, EXAMPLE_LVGL_TASK_PRIORITY, NULL); ESP_LOGI(TAG, "Display LVGL Meter Widget"); // Lock the mutex due to the LVGL APIs are not thread-safe - if (example_lvgl_lock(-1)) { - example_lvgl_demo_ui(disp); - // Release the mutex - example_lvgl_unlock(); - } + _lock_acquire(&lvgl_api_lock); + example_lvgl_demo_ui(display); + _lock_release(&lvgl_api_lock); } diff --git a/examples/peripherals/lcd/spi_lcd_touch/sdkconfig.defaults b/examples/peripherals/lcd/spi_lcd_touch/sdkconfig.defaults index 06bb9fb0bf..1db5dbb646 100644 --- a/examples/peripherals/lcd/spi_lcd_touch/sdkconfig.defaults +++ b/examples/peripherals/lcd/spi_lcd_touch/sdkconfig.defaults @@ -1,3 +1,3 @@ -CONFIG_LV_USE_USER_DATA=y -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_COLOR_DEPTH_16=y +CONFIG_LV_CONF_SKIP=y +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y