diff --git a/modules/lvgl/CMakeLists.txt b/modules/lvgl/CMakeLists.txt index 599606fe74bfc..d626ac0681f31 100644 --- a/modules/lvgl/CMakeLists.txt +++ b/modules/lvgl/CMakeLists.txt @@ -37,10 +37,27 @@ zephyr_library_sources( ${LVGL_DIR}/src/display/lv_display.c + ${LVGL_DIR}/src/draw/convert/lv_draw_buf_convert.c + ${LVGL_DIR}/src/draw/convert/neon/lv_draw_buf_convert_neon.c + ${LVGL_DIR}/src/draw/dma2d/lv_draw_dma2d.c ${LVGL_DIR}/src/draw/dma2d/lv_draw_dma2d_fill.c ${LVGL_DIR}/src/draw/dma2d/lv_draw_dma2d_img.c + ${LVGL_DIR}/src/draw/espressif/ppa/lv_draw_ppa_buf.c + ${LVGL_DIR}/src/draw/espressif/ppa/lv_draw_ppa.c + ${LVGL_DIR}/src/draw/espressif/ppa/lv_draw_ppa_fill.c + ${LVGL_DIR}/src/draw/espressif/ppa/lv_draw_ppa_img.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_arc.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_fill.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_image.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_letter.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_line.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_ram_g.c + ${LVGL_DIR}/src/draw/eve/lv_draw_eve_triangle.c + ${LVGL_DIR}/src/draw/eve/lv_eve.c + ${LVGL_DIR}/src/draw/lv_draw_3d.c ${LVGL_DIR}/src/draw/lv_draw_arc.c ${LVGL_DIR}/src/draw/lv_draw_buf.c @@ -54,6 +71,20 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/lv_draw_vector.c ${LVGL_DIR}/src/draw/lv_image_decoder.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_arc.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_border.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_fill.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_img.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_label.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_layer.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_line.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_stm32_hal.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_triangle.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_utils.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_draw_nema_gfx_vector.c + ${LVGL_DIR}/src/draw/nema_gfx/lv_nema_gfx_path.c + ${LVGL_DIR}/src/draw/nxp/pxp/lv_draw_buf_pxp.c ${LVGL_DIR}/src/draw/nxp/pxp/lv_draw_pxp.c ${LVGL_DIR}/src/draw/nxp/pxp/lv_draw_pxp_fill.c @@ -63,25 +94,14 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/nxp/pxp/lv_pxp_osa.c ${LVGL_DIR}/src/draw/nxp/pxp/lv_pxp_utils.c ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_g2d_img.c - ${LVGL_DIR}/src/draw/nxp/g2d/lv_g2d_utils.c ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_buf_g2d.c - ${LVGL_DIR}/src/draw/nxp/g2d/lv_g2d_buf_map.c - ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_g2d_fill.c ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_g2d.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_buf_vglite.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_arc.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_border.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_fill.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_img.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_label.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_layer.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_line.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_draw_vglite_triangle.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_vglite_buf.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_vglite_matrix.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_vglite_path.c - ${LVGL_DIR}/src/draw/nxp/vglite/lv_vglite_utils.c + ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_g2d_fill.c + ${LVGL_DIR}/src/draw/nxp/g2d/lv_draw_g2d_img.c + ${LVGL_DIR}/src/draw/nxp/g2d/lv_g2d_buf_map.c + ${LVGL_DIR}/src/draw/nxp/g2d/lv_g2d_utils.c + + ${LVGL_DIR}/src/draw/opengles/lv_draw_opengles.c ${LVGL_DIR}/src/draw/renesas/dave2d/lv_draw_dave2d_arc.c ${LVGL_DIR}/src/draw/renesas/dave2d/lv_draw_dave2d_border.c @@ -103,6 +123,8 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565_swapped.c ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c + ${LVGL_DIR}/src/draw/sw/blend/neon/lv_draw_sw_blend_neon_to_rgb565.c + ${LVGL_DIR}/src/draw/sw/blend/neon/lv_draw_sw_blend_neon_to_rgb888.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_arc.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_border.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_box_shadow.c @@ -119,26 +141,26 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/sw/lv_draw_sw_utils.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_vector.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_buf_vg_lite.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_arc.c ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_border.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_fill.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_img.c ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_label.c + ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_path.c + ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_grad.c + ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_stroke.c ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_layer.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_line.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_triangle.c - ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_vector.c + ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_pending.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_line.c ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_decoder.c - ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_grad.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_fill.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_img.c ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_math.c - ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_path.c - ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_pending.c - ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_stroke.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_arc.c ${LVGL_DIR}/src/draw/vg_lite/lv_vg_lite_utils.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_vector.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c + ${LVGL_DIR}/src/draw/vg_lite/lv_draw_buf_vg_lite.c ${LVGL_DIR}/src/font/lv_binfont_loader.c ${LVGL_DIR}/src/font/lv_font.c @@ -167,8 +189,6 @@ zephyr_library_sources( ${LVGL_DIR}/src/font/lv_font_montserrat_46.c ${LVGL_DIR}/src/font/lv_font_montserrat_48.c ${LVGL_DIR}/src/font/lv_font_montserrat_8.c - ${LVGL_DIR}/src/font/lv_font_simsun_14_cjk.c - ${LVGL_DIR}/src/font/lv_font_simsun_16_cjk.c ${LVGL_DIR}/src/font/lv_font_source_han_sans_sc_14_cjk.c ${LVGL_DIR}/src/font/lv_font_source_han_sans_sc_16_cjk.c ${LVGL_DIR}/src/font/lv_font_unscii_16.c @@ -205,7 +225,7 @@ zephyr_library_sources( ${LVGL_DIR}/src/libs/fsdrv/lv_fs_stdio.c ${LVGL_DIR}/src/libs/fsdrv/lv_fs_uefi.c ${LVGL_DIR}/src/libs/fsdrv/lv_fs_win32.c - ${LVGL_DIR}/src/libs/gif/gifdec.c + ${LVGL_DIR}/src/libs/gif/AnimatedGIF/src/gif.c ${LVGL_DIR}/src/libs/gif/lv_gif.c ${LVGL_DIR}/src/libs/libjpeg_turbo/lv_libjpeg_turbo.c ${LVGL_DIR}/src/libs/libpng/lv_libpng.c @@ -224,15 +244,23 @@ zephyr_library_sources( ${LVGL_DIR}/src/libs/tiny_ttf/lv_tiny_ttf.c ${LVGL_DIR}/src/libs/tjpgd/lv_tjpgd.c ${LVGL_DIR}/src/libs/tjpgd/tjpgd.c + ${LVGL_DIR}/src/libs/vg_lite_driver/lv_vg_lite_hal/lv_vg_lite_hal.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLiteKernel/vg_lite_kernel.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLite/vg_lite.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLite/vg_lite_image.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLite/vg_lite_matrix.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLite/vg_lite_path.c + ${LVGL_DIR}/src/libs/vg_lite_driver/VGLite/vg_lite_stroke.c ${LVGL_DIR}/src/lv_init.c - ${LVGL_DIR}/src/misc/cache/lv_cache.c - ${LVGL_DIR}/src/misc/cache/lv_cache_entry.c - ${LVGL_DIR}/src/misc/cache/class/lv_cache_lru_rb.c ${LVGL_DIR}/src/misc/cache/class/lv_cache_lru_ll.c + ${LVGL_DIR}/src/misc/cache/class/lv_cache_lru_rb.c + ${LVGL_DIR}/src/misc/cache/class/lv_cache_sc_da.c ${LVGL_DIR}/src/misc/cache/instance/lv_image_cache.c ${LVGL_DIR}/src/misc/cache/instance/lv_image_header_cache.c + ${LVGL_DIR}/src/misc/cache/lv_cache.c + ${LVGL_DIR}/src/misc/cache/lv_cache_entry.c ${LVGL_DIR}/src/misc/lv_anim.c ${LVGL_DIR}/src/misc/lv_anim_timeline.c ${LVGL_DIR}/src/misc/lv_area.c @@ -276,36 +304,39 @@ zephyr_library_sources( ${LVGL_DIR}/src/others/observer/lv_observer.c ${LVGL_DIR}/src/others/snapshot/lv_snapshot.c ${LVGL_DIR}/src/others/sysmon/lv_sysmon.c + ${LVGL_DIR}/src/others/translation/lv_translation.c ${LVGL_DIR}/src/others/vg_lite_tvg/vg_lite_matrix.c - ${LVGL_DIR}/src/others/xml/lv_xml_base_types.c - ${LVGL_DIR}/src/others/xml/lv_xml.c - ${LVGL_DIR}/src/others/xml/lv_xml_component.c - ${LVGL_DIR}/src/others/xml/lv_xml_parser.c - ${LVGL_DIR}/src/others/xml/lv_xml_style.c - ${LVGL_DIR}/src/others/xml/lv_xml_update.c - ${LVGL_DIR}/src/others/xml/lv_xml_utils.c + ${LVGL_DIR}/src/others/xml/lv_xml_translation.c ${LVGL_DIR}/src/others/xml/lv_xml_widget.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_spangroup_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_dropdown_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_scale_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_arc_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_bar_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_tabview_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_slider_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_chart_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_buttonmatrix_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_button_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_calendar_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_canvas_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_chart_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_checkbox_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_dropdown_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_event_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_image_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_keyboard_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_calendar_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_switch_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_bar_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_button_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_label_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_keyboard_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_obj_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_textarea_parser.c + ${LVGL_DIR}/src/others/xml/parsers/lv_xml_image_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_roller_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_scale_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_slider_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_spangroup_parser.c ${LVGL_DIR}/src/others/xml/parsers/lv_xml_table_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_tabview_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_textarea_parser.c + ${LVGL_DIR}/src/others/xml/lv_xml_parser.c + ${LVGL_DIR}/src/others/xml/lv_xml_component.c + ${LVGL_DIR}/src/others/xml/lv_xml_base_types.c + ${LVGL_DIR}/src/others/xml/lv_xml_style.c + ${LVGL_DIR}/src/others/xml/lv_xml_test.c + ${LVGL_DIR}/src/others/xml/lv_xml_utils.c + ${LVGL_DIR}/src/others/xml/lv_xml.c + ${LVGL_DIR}/src/others/xml/lv_xml_update.c ${LVGL_DIR}/src/stdlib/builtin/lv_tlsf.c ${LVGL_DIR}/src/stdlib/clib/lv_string_clib.c diff --git a/modules/lvgl/lvgl_zephyr_osal.c b/modules/lvgl/lvgl_zephyr_osal.c index e66f4a385fc14..bcb6bca8dacfd 100644 --- a/modules/lvgl/lvgl_zephyr_osal.c +++ b/modules/lvgl/lvgl_zephyr_osal.c @@ -42,10 +42,20 @@ lv_result_t lv_thread_delete(lv_thread_t *thread) { int ret; - k_thread_abort(thread->tid); + if (thread == NULL || thread->tid == NULL) { + LOG_ERR("Invalid thread pointer"); + return LV_RESULT_INVALID; + } + + ret = k_thread_join(&thread->thread, K_MSEC(100)); + if (ret != 0) { + LOG_WRN("Thread join failed or timed out: %d, aborting thread", ret); + k_thread_abort(thread->tid); + } + ret = k_thread_stack_free(thread->stack); if (ret < 0) { - LOG_ERR("Failled to delete thread: %d", ret); + LOG_ERR("Failed to delete thread: %d", ret); return LV_RESULT_INVALID; } @@ -153,7 +163,11 @@ void thread_entry(void *thread, void *cb, void *user_data) lv_thread_entry entry_cb = (lv_thread_entry)cb; entry_cb(user_data); - lv_thread_delete((lv_thread_t *)thread); +} + +void lv_sleep_ms(uint32_t ms) +{ + k_msleep(ms); } #endif /* CONFIG_LV_Z_USE_OSAL */ diff --git a/samples/modules/lvgl/demos/CMakeLists.txt b/samples/modules/lvgl/demos/CMakeLists.txt index d8da9af6116eb..cf21ee3bccf7f 100644 --- a/samples/modules/lvgl/demos/CMakeLists.txt +++ b/samples/modules/lvgl/demos/CMakeLists.txt @@ -16,53 +16,53 @@ target_include_directories(app PRIVATE ) target_sources_ifdef(CONFIG_LV_USE_DEMO_MUSIC app PRIVATE - ${LVGL_DIR}/demos/music/lv_demo_music_list.c ${LVGL_DIR}/demos/music/lv_demo_music.c - ${LVGL_DIR}/demos/music/lv_demo_music_main.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_corner_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_corner_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause.c + ${LVGL_DIR}/demos/music/lv_demo_music_main.c + ${LVGL_DIR}/demos/music/lv_demo_music_list.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_BENCHMARK app PRIVATE @@ -84,11 +84,15 @@ target_sources_ifdef(CONFIG_LV_USE_DEMO_STRESS app PRIVATE ) target_sources_ifdef(CONFIG_LV_USE_DEMO_WIDGETS app PRIVATE - ${LVGL_DIR}/demos/widgets/assets/img_clothes.c + ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_avatar.c + ${LVGL_DIR}/demos/widgets/assets/img_clothes.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_needle.c - ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c ${LVGL_DIR}/demos/widgets/lv_demo_widgets.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_profile.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_analytics.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_components.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_KEYPAD_AND_ENCODER app PRIVATE @@ -96,15 +100,15 @@ target_sources_ifdef(CONFIG_LV_USE_DEMO_KEYPAD_AND_ENCODER app PRIVATE ) target_sources_ifdef(CONFIG_LV_USE_DEMO_RENDER app PRIVATE - ${LVGL_DIR}/demos/render/assets/img_render_arc_bg.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_argb8888.c + ${LVGL_DIR}/demos/render/lv_demo_render.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb565.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb565a8.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_xrgb8888.c ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_argb8888_premultiplied.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_argb8888.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb888.c + ${LVGL_DIR}/demos/render/assets/img_render_arc_bg.c ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_i1.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_l8.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb565a8.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb565.c ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb565_swapped.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_rgb888.c - ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_xrgb8888.c - ${LVGL_DIR}/demos/render/lv_demo_render.c + ${LVGL_DIR}/demos/render/assets/img_render_lvgl_logo_l8.c ) diff --git a/samples/modules/lvgl/multi_display/CMakeLists.txt b/samples/modules/lvgl/multi_display/CMakeLists.txt index 9d40ac7a8e6f3..7296edc05d819 100644 --- a/samples/modules/lvgl/multi_display/CMakeLists.txt +++ b/samples/modules/lvgl/multi_display/CMakeLists.txt @@ -17,62 +17,66 @@ target_include_directories(app PRIVATE ) target_sources_ifdef(CONFIG_LV_USE_DEMO_MUSIC app PRIVATE - ${LVGL_DIR}/demos/music/lv_demo_music_list.c ${LVGL_DIR}/demos/music/lv_demo_music.c - ${LVGL_DIR}/demos/music/lv_demo_music_main.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_corner_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause_large.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3_large.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_corner_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_pause.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_pause.c + ${LVGL_DIR}/demos/music/lv_demo_music_main.c + ${LVGL_DIR}/demos/music/lv_demo_music_list.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_BENCHMARK app PRIVATE ${LVGL_DIR}/demos/benchmark/assets/img_benchmark_avatar.c ${LVGL_DIR}/demos/benchmark/assets/img_benchmark_lvgl_logo_argb.c ${LVGL_DIR}/demos/benchmark/assets/img_benchmark_lvgl_logo_rgb.c - ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_12_compr_az.c.c - ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_16_compr_az.c.c - ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_28_compr_az.c.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_12_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_14_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_16_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_18_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_20_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_24_aligned.c + ${LVGL_DIR}/demos/benchmark/assets/lv_font_benchmark_montserrat_26_aligned.c ${LVGL_DIR}/demos/benchmark/lv_demo_benchmark.c ) @@ -81,9 +85,13 @@ target_sources_ifdef(CONFIG_LV_USE_DEMO_STRESS app PRIVATE ) target_sources_ifdef(CONFIG_LV_USE_DEMO_WIDGETS app PRIVATE - ${LVGL_DIR}/demos/widgets/assets/img_clothes.c + ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_avatar.c + ${LVGL_DIR}/demos/widgets/assets/img_clothes.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_needle.c - ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c ${LVGL_DIR}/demos/widgets/lv_demo_widgets.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_profile.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_analytics.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_components.c ) diff --git a/tests/lib/gui/lvgl/testcase.yaml b/tests/lib/gui/lvgl/testcase.yaml index 270f355c9311f..1b52c419c973e 100644 --- a/tests/lib/gui/lvgl/testcase.yaml +++ b/tests/lib/gui/lvgl/testcase.yaml @@ -86,6 +86,7 @@ tests: - CONFIG_DYNAMIC_THREAD=y - CONFIG_DYNAMIC_THREAD_POOL_SIZE=4 - CONFIG_DYNAMIC_THREAD_ALLOC=y + - CONFIG_THREAD_STACK_INFO=y platform_allow: - native_sim/native/64 - native_sim diff --git a/west.yml b/west.yml index 9cd3c993d80d4..f25a18482f795 100644 --- a/west.yml +++ b/west.yml @@ -313,7 +313,7 @@ manifest: revision: fb00b383072518c918e2258b0916c996f2d4eebe path: modules/lib/loramac-node - name: lvgl - revision: b03edc8e6282a963cd312cd0b409eb5ce263ea75 + revision: pull/68/head path: modules/lib/gui/lvgl - name: mbedtls revision: 85440ef5fffa95d0e9971e9163719189cf34d979