From 30639b10932ddbac91ad9c44e2f35a796689fe55 Mon Sep 17 00:00:00 2001 From: morris Date: Fri, 29 Jul 2022 15:54:56 +0800 Subject: [PATCH] example: update example_lvgl_demo_ui prototype --- .../peripherals/lcd/i2c_oled/main/i2c_oled_example_main.c | 5 ++--- examples/peripherals/lcd/i2c_oled/main/lvgl_demo_ui.c | 3 ++- .../lcd/i80_controller/main/i80_controller_example_main.c | 5 ++--- examples/peripherals/lcd/i80_controller/main/lvgl_demo_ui.c | 4 +++- examples/peripherals/lcd/rgb_panel/main/lvgl_demo_ui.c | 3 ++- .../peripherals/lcd/rgb_panel/main/rgb_lcd_example_main.c | 5 ++--- examples/peripherals/lcd/spi_lcd_touch/main/lvgl_demo_ui.c | 3 ++- .../lcd/spi_lcd_touch/main/spi_lcd_touch_example_main.c | 5 ++--- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/examples/peripherals/lcd/i2c_oled/main/i2c_oled_example_main.c b/examples/peripherals/lcd/i2c_oled/main/i2c_oled_example_main.c index d3bae5e43c..638652e51c 100644 --- a/examples/peripherals/lcd/i2c_oled/main/i2c_oled_example_main.c +++ b/examples/peripherals/lcd/i2c_oled/main/i2c_oled_example_main.c @@ -38,7 +38,7 @@ static const char *TAG = "example"; #define EXAMPLE_LVGL_TICK_PERIOD_MS 2 -extern void example_lvgl_demo_ui(lv_obj_t *scr); +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) { @@ -159,8 +159,7 @@ void app_main(void) ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); ESP_LOGI(TAG, "Display LVGL Scroll Text"); - lv_obj_t *scr = lv_disp_get_scr_act(disp); - example_lvgl_demo_ui(scr); + example_lvgl_demo_ui(disp); while (1) { // raise the task priority of LVGL and/or reduce the handler period can improve the performance diff --git a/examples/peripherals/lcd/i2c_oled/main/lvgl_demo_ui.c b/examples/peripherals/lcd/i2c_oled/main/lvgl_demo_ui.c index a8d0ee9d6a..28d9801515 100644 --- a/examples/peripherals/lcd/i2c_oled/main/lvgl_demo_ui.c +++ b/examples/peripherals/lcd/i2c_oled/main/lvgl_demo_ui.c @@ -6,8 +6,9 @@ #include "lvgl.h" -void example_lvgl_demo_ui(lv_obj_t *scr) +void example_lvgl_demo_ui(lv_disp_t *disp) { + lv_obj_t *scr = lv_disp_get_scr_act(disp); lv_obj_t *label = lv_label_create(scr); lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR); /* Circular scroll */ lv_label_set_text(label, "Hello Espressif, Hello LVGL."); 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 e3e1c156e2..26f4168852 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 @@ -74,7 +74,7 @@ static const char *TAG = "example"; // Supported alignment: 16, 32, 64. A higher alignment can enables higher burst transfer size, thus a higher i80 bus throughput. #define EXAMPLE_PSRAM_DATA_ALIGNMENT 64 -extern void example_lvgl_demo_ui(lv_obj_t *scr); +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) { @@ -268,8 +268,7 @@ void app_main(void) ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); ESP_LOGI(TAG, "Display LVGL animation"); - lv_obj_t *scr = lv_disp_get_scr_act(disp); - example_lvgl_demo_ui(scr); + example_lvgl_demo_ui(disp); while (1) { // raise the task priority of LVGL and/or reduce the handler period can improve the performance diff --git a/examples/peripherals/lcd/i80_controller/main/lvgl_demo_ui.c b/examples/peripherals/lcd/i80_controller/main/lvgl_demo_ui.c index cd4731e6a4..d3d8b4d8e4 100644 --- a/examples/peripherals/lcd/i80_controller/main/lvgl_demo_ui.c +++ b/examples/peripherals/lcd/i80_controller/main/lvgl_demo_ui.c @@ -74,8 +74,10 @@ static void anim_timer_cb(lv_timer_t *timer) } } -void example_lvgl_demo_ui(lv_obj_t *scr) +void example_lvgl_demo_ui(lv_disp_t *disp) { + lv_obj_t *scr = lv_disp_get_scr_act(disp); + // Create image img_logo = lv_img_create(scr); lv_img_set_src(img_logo, &esp_logo); diff --git a/examples/peripherals/lcd/rgb_panel/main/lvgl_demo_ui.c b/examples/peripherals/lcd/rgb_panel/main/lvgl_demo_ui.c index 3db1b24ea9..2ed988ceb3 100644 --- a/examples/peripherals/lcd/rgb_panel/main/lvgl_demo_ui.c +++ b/examples/peripherals/lcd/rgb_panel/main/lvgl_demo_ui.c @@ -39,8 +39,9 @@ static void add_data(lv_timer_t *timer) lv_chart_set_next_value2(chart, lv_chart_get_series_next(chart, NULL), lv_rand(0, 200), lv_rand(0, 1000)); } -void example_lvgl_demo_ui(lv_obj_t *scr) +void example_lvgl_demo_ui(lv_disp_t *disp) { + lv_obj_t *scr = lv_disp_get_scr_act(disp); lv_obj_t *chart = lv_chart_create(scr); lv_obj_set_size(chart, 200, 150); lv_obj_align(chart, LV_ALIGN_CENTER, 0, 0); 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 436cf29310..0b0fe81f36 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 @@ -60,7 +60,7 @@ SemaphoreHandle_t sem_vsync_end; SemaphoreHandle_t sem_gui_ready; #endif -extern void example_lvgl_demo_ui(lv_obj_t *scr); +extern void example_lvgl_demo_ui(lv_disp_t *disp); static bool example_on_vsync_event(esp_lcd_panel_handle_t panel, const esp_lcd_rgb_panel_event_data_t *event_data, void *user_data) { @@ -226,8 +226,7 @@ void app_main(void) ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); ESP_LOGI(TAG, "Display LVGL Scatter Chart"); - lv_obj_t *scr = lv_disp_get_scr_act(disp); - example_lvgl_demo_ui(scr); + example_lvgl_demo_ui(disp); while (1) { // raise the task priority of LVGL and/or reduce the handler period can improve the performance 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 df07a71ae6..591dd95eed 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 @@ -27,8 +27,9 @@ static void btn_cb(lv_event_t * e) lv_disp_set_rotation(disp, rotation); } -void example_lvgl_demo_ui(lv_disp_t *disp, lv_obj_t *scr) +void example_lvgl_demo_ui(lv_disp_t *disp) { + 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); 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 7c234336c5..4b3e51939d 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 @@ -66,7 +66,7 @@ static const char *TAG = "example"; esp_lcd_touch_handle_t tp = NULL; #endif -extern void example_lvgl_demo_ui(lv_disp_t *disp, lv_obj_t *scr); +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) { @@ -300,8 +300,7 @@ void app_main(void) #endif ESP_LOGI(TAG, "Display LVGL Meter Widget"); - lv_obj_t *scr = lv_disp_get_scr_act(disp); - example_lvgl_demo_ui(disp, scr); + example_lvgl_demo_ui(disp); while (1) { // raise the task priority of LVGL and/or reduce the handler period can improve the performance