example: update example_lvgl_demo_ui prototype

pull/9485/head
morris 2022-07-29 15:54:56 +08:00
rodzic df3e506703
commit 30639b1093
8 zmienionych plików z 17 dodań i 16 usunięć

Wyświetl plik

@ -38,7 +38,7 @@ static const char *TAG = "example";
#define EXAMPLE_LVGL_TICK_PERIOD_MS 2 #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) 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_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000));
ESP_LOGI(TAG, "Display LVGL Scroll Text"); ESP_LOGI(TAG, "Display LVGL Scroll Text");
lv_obj_t *scr = lv_disp_get_scr_act(disp); example_lvgl_demo_ui(disp);
example_lvgl_demo_ui(scr);
while (1) { while (1) {
// raise the task priority of LVGL and/or reduce the handler period can improve the performance // raise the task priority of LVGL and/or reduce the handler period can improve the performance

Wyświetl plik

@ -6,8 +6,9 @@
#include "lvgl.h" #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_obj_t *label = lv_label_create(scr);
lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR); /* Circular scroll */ lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR); /* Circular scroll */
lv_label_set_text(label, "Hello Espressif, Hello LVGL."); lv_label_set_text(label, "Hello Espressif, Hello LVGL.");

Wyświetl plik

@ -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. // 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 #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) 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_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000));
ESP_LOGI(TAG, "Display LVGL animation"); ESP_LOGI(TAG, "Display LVGL animation");
lv_obj_t *scr = lv_disp_get_scr_act(disp); example_lvgl_demo_ui(disp);
example_lvgl_demo_ui(scr);
while (1) { while (1) {
// raise the task priority of LVGL and/or reduce the handler period can improve the performance // raise the task priority of LVGL and/or reduce the handler period can improve the performance

Wyświetl plik

@ -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 // Create image
img_logo = lv_img_create(scr); img_logo = lv_img_create(scr);
lv_img_set_src(img_logo, &esp_logo); lv_img_set_src(img_logo, &esp_logo);

Wyświetl plik

@ -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)); 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_t *chart = lv_chart_create(scr);
lv_obj_set_size(chart, 200, 150); lv_obj_set_size(chart, 200, 150);
lv_obj_align(chart, LV_ALIGN_CENTER, 0, 0); lv_obj_align(chart, LV_ALIGN_CENTER, 0, 0);

Wyświetl plik

@ -60,7 +60,7 @@ SemaphoreHandle_t sem_vsync_end;
SemaphoreHandle_t sem_gui_ready; SemaphoreHandle_t sem_gui_ready;
#endif #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) 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_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000));
ESP_LOGI(TAG, "Display LVGL Scatter Chart"); ESP_LOGI(TAG, "Display LVGL Scatter Chart");
lv_obj_t *scr = lv_disp_get_scr_act(disp); example_lvgl_demo_ui(disp);
example_lvgl_demo_ui(scr);
while (1) { while (1) {
// raise the task priority of LVGL and/or reduce the handler period can improve the performance // raise the task priority of LVGL and/or reduce the handler period can improve the performance

Wyświetl plik

@ -27,8 +27,9 @@ static void btn_cb(lv_event_t * e)
lv_disp_set_rotation(disp, rotation); 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); meter = lv_meter_create(scr);
lv_obj_center(meter); lv_obj_center(meter);
lv_obj_set_size(meter, 200, 200); lv_obj_set_size(meter, 200, 200);

Wyświetl plik

@ -66,7 +66,7 @@ static const char *TAG = "example";
esp_lcd_touch_handle_t tp = NULL; esp_lcd_touch_handle_t tp = NULL;
#endif #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) 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 #endif
ESP_LOGI(TAG, "Display LVGL Meter Widget"); ESP_LOGI(TAG, "Display LVGL Meter Widget");
lv_obj_t *scr = lv_disp_get_scr_act(disp); example_lvgl_demo_ui(disp);
example_lvgl_demo_ui(disp, scr);
while (1) { while (1) {
// raise the task priority of LVGL and/or reduce the handler period can improve the performance // raise the task priority of LVGL and/or reduce the handler period can improve the performance