mirror of
https://github.com/espressif/esp-idf.git
synced 2025-10-05 12:51:31 +00:00
refactor(i80_lcd): adapt example to lvgl9
This commit is contained in:
@@ -35,7 +35,7 @@ static lv_color_t arc_color[] = {
|
||||
|
||||
static void anim_timer_cb(lv_timer_t *timer)
|
||||
{
|
||||
my_timer_context_t *timer_ctx = (my_timer_context_t *) timer->user_data;
|
||||
my_timer_context_t *timer_ctx = (my_timer_context_t *)lv_timer_get_user_data(timer);
|
||||
int count = timer_ctx->count_val;
|
||||
lv_obj_t *scr = timer_ctx->scr;
|
||||
|
||||
@@ -53,17 +53,17 @@ static void anim_timer_cb(lv_timer_t *timer)
|
||||
// Delete arcs when animation finished
|
||||
if (count == 90) {
|
||||
for (size_t i = 0; i < sizeof(arc) / sizeof(arc[0]); i++) {
|
||||
lv_obj_del(arc[i]);
|
||||
lv_obj_delete(arc[i]);
|
||||
}
|
||||
|
||||
// Create new image and make it transparent
|
||||
img_text = lv_img_create(scr);
|
||||
img_text = lv_image_create(scr);
|
||||
#if CONFIG_EXAMPLE_LCD_IMAGE_FROM_FILE_SYSTEM
|
||||
lv_img_set_src(img_text, "S:/spiffs/esp_text.png");
|
||||
lv_image_set_src(img_text, "S:/spiffs/esp_text.png");
|
||||
#elif CONFIG_EXAMPLE_LCD_IMAGE_FROM_EMBEDDED_BINARY
|
||||
lv_img_set_src(img_text, &esp_text);
|
||||
lv_image_set_src(img_text, &esp_text);
|
||||
#endif
|
||||
lv_obj_set_style_img_opa(img_text, 0, 0);
|
||||
lv_obj_set_style_image_opa(img_text, 0, 0);
|
||||
}
|
||||
|
||||
// Move images when arc animation finished
|
||||
@@ -71,12 +71,12 @@ static void anim_timer_cb(lv_timer_t *timer)
|
||||
lv_coord_t offset = (sinf((count - 140) * 2.25f / 90.0f) + 1) * 20.0f;
|
||||
lv_obj_align(img_logo, LV_ALIGN_CENTER, 0, -offset);
|
||||
lv_obj_align(img_text, LV_ALIGN_CENTER, 0, 2 * offset);
|
||||
lv_obj_set_style_img_opa(img_text, offset / 40.0f * 255, 0);
|
||||
lv_obj_set_style_image_opa(img_text, offset / 40.0f * 255, 0);
|
||||
}
|
||||
|
||||
// Delete timer when all animation finished
|
||||
if ((count += 5) == 220) {
|
||||
lv_timer_del(timer);
|
||||
lv_timer_delete(timer);
|
||||
} else {
|
||||
timer_ctx->count_val = count;
|
||||
}
|
||||
@@ -106,7 +106,7 @@ static void start_animation(lv_obj_t *scr)
|
||||
}
|
||||
|
||||
if (img_text) {
|
||||
lv_obj_del(img_text);
|
||||
lv_obj_delete(img_text);
|
||||
img_text = NULL;
|
||||
}
|
||||
|
||||
@@ -118,14 +118,14 @@ static void start_animation(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 *scr = lv_display_get_screen_active(disp);
|
||||
|
||||
// Create image
|
||||
img_logo = lv_img_create(scr);
|
||||
img_logo = lv_image_create(scr);
|
||||
#if CONFIG_EXAMPLE_LCD_IMAGE_FROM_FILE_SYSTEM
|
||||
lv_img_set_src(img_logo, "S:/spiffs/esp_logo.png");
|
||||
lv_image_set_src(img_logo, "S:/spiffs/esp_logo.png");
|
||||
#elif CONFIG_EXAMPLE_LCD_IMAGE_FROM_EMBEDDED_BINARY
|
||||
lv_img_set_src(img_logo, &esp_logo);
|
||||
lv_image_set_src(img_logo, &esp_logo);
|
||||
#endif
|
||||
|
||||
start_animation(scr);
|
||||
|
Reference in New Issue
Block a user