From 3658dbd489fb97afdcd38bd29732b4a76e32e5a9 Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Sat, 17 Jan 2026 10:36:08 +0100 Subject: [PATCH] manifest: Update LVGL to 9.4.X Update the west yaml to point to the new LVGL version. Update CMakeLists and samples accordingly. Signed-off-by: Fabian Blatz --- modules/lvgl/CMakeLists.txt | 135 ++++++++++++------ samples/modules/lvgl/demos/CMakeLists.txt | 99 ++++++------- .../modules/lvgl/multi_display/CMakeLists.txt | 99 ++++++------- west.yml | 2 +- 4 files changed, 195 insertions(+), 140 deletions(-) diff --git a/modules/lvgl/CMakeLists.txt b/modules/lvgl/CMakeLists.txt index d626ac0681f..cc1aee1d53e 100644 --- a/modules/lvgl/CMakeLists.txt +++ b/modules/lvgl/CMakeLists.txt @@ -33,8 +33,19 @@ zephyr_library_sources( ${LVGL_DIR}/src/core/lv_obj_style.c ${LVGL_DIR}/src/core/lv_obj_style_gen.c ${LVGL_DIR}/src/core/lv_obj_tree.c + ${LVGL_DIR}/src/core/lv_observer.c ${LVGL_DIR}/src/core/lv_refr.c + ${LVGL_DIR}/src/debugging/monkey/lv_monkey.c + ${LVGL_DIR}/src/debugging/sysmon/lv_sysmon.c + ${LVGL_DIR}/src/debugging/test/lv_test_display.c + ${LVGL_DIR}/src/debugging/test/lv_test_fs.c + ${LVGL_DIR}/src/debugging/test/lv_test_helpers.c + ${LVGL_DIR}/src/debugging/test/lv_test_indev.c + ${LVGL_DIR}/src/debugging/test/lv_test_indev_gesture.c + ${LVGL_DIR}/src/debugging/test/lv_test_screenshot_compare.c + ${LVGL_DIR}/src/debugging/vg_lite_tvg/vg_lite_matrix.c + ${LVGL_DIR}/src/display/lv_display.c ${LVGL_DIR}/src/draw/convert/lv_draw_buf_convert.c @@ -60,6 +71,7 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/lv_draw_3d.c ${LVGL_DIR}/src/draw/lv_draw_arc.c + ${LVGL_DIR}/src/draw/lv_draw_blur.c ${LVGL_DIR}/src/draw/lv_draw_buf.c ${LVGL_DIR}/src/draw/lv_draw.c ${LVGL_DIR}/src/draw/lv_draw_image.c @@ -71,6 +83,23 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/lv_draw_vector.c ${LVGL_DIR}/src/draw/lv_image_decoder.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_arc.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_border.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_box_shadow.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_fill.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_grad.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_image.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_label.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_layer.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_line.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_mask_rect.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_triangle.c + ${LVGL_DIR}/src/draw/nanovg/lv_draw_nanovg_vector.c + ${LVGL_DIR}/src/draw/nanovg/lv_nanovg_fbo_cache.c + ${LVGL_DIR}/src/draw/nanovg/lv_nanovg_image_cache.c + ${LVGL_DIR}/src/draw/nanovg/lv_nanovg_utils.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 @@ -114,7 +143,10 @@ zephyr_library_sources( ${LVGL_DIR}/src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c ${LVGL_DIR}/src/draw/renesas/dave2d/lv_draw_dave2d_utils.c + ${LVGL_DIR}/src/draw/snapshot/lv_snapshot.c + ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend.c + ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_a8.c ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_al88.c ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c ${LVGL_DIR}/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c @@ -127,6 +159,7 @@ zephyr_library_sources( ${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_blur.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_box_shadow.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw.c ${LVGL_DIR}/src/draw/sw/lv_draw_sw_fill.c @@ -162,10 +195,13 @@ zephyr_library_sources( ${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/binfont_loader/lv_binfont_loader.c + ${LVGL_DIR}/src/font/font_manager/lv_font_manager.c + ${LVGL_DIR}/src/font/font_manager/lv_font_manager_recycle.c + ${LVGL_DIR}/src/font/imgfont/lv_imgfont.c ${LVGL_DIR}/src/font/lv_font.c ${LVGL_DIR}/src/font/lv_font_dejavu_16_persian_hebrew.c - ${LVGL_DIR}/src/font/lv_font_fmt_txt.c + ${LVGL_DIR}/src/font/fmt_txt/lv_font_fmt_txt.c ${LVGL_DIR}/src/font/lv_font_montserrat_10.c ${LVGL_DIR}/src/font/lv_font_montserrat_12.c ${LVGL_DIR}/src/font/lv_font_montserrat_14.c @@ -197,6 +233,7 @@ zephyr_library_sources( ${LVGL_DIR}/src/indev/lv_indev.c ${LVGL_DIR}/src/indev/lv_indev_gesture.c ${LVGL_DIR}/src/indev/lv_indev_scroll.c + ${LVGL_DIR}/src/indev/lv_gridnav.c ${LVGL_DIR}/src/layouts/flex/lv_flex.c ${LVGL_DIR}/src/layouts/grid/lv_grid.c @@ -280,6 +317,7 @@ zephyr_library_sources( ${LVGL_DIR}/src/misc/lv_math.c ${LVGL_DIR}/src/misc/lv_matrix.c ${LVGL_DIR}/src/misc/lv_palette.c + ${LVGL_DIR}/src/misc/lv_pending.c ${LVGL_DIR}/src/misc/lv_profiler_builtin.c ${LVGL_DIR}/src/misc/lv_rb.c ${LVGL_DIR}/src/misc/lv_style.c @@ -293,50 +331,45 @@ zephyr_library_sources( ${LVGL_DIR}/src/osal/lv_os.c ${LVGL_DIR}/src/others/file_explorer/lv_file_explorer.c - ${LVGL_DIR}/src/others/font_manager/lv_font_manager.c - ${LVGL_DIR}/src/others/font_manager/lv_font_manager_recycle.c ${LVGL_DIR}/src/others/fragment/lv_fragment.c ${LVGL_DIR}/src/others/fragment/lv_fragment_manager.c - ${LVGL_DIR}/src/others/gridnav/lv_gridnav.c - ${LVGL_DIR}/src/others/ime/lv_ime_pinyin.c - ${LVGL_DIR}/src/others/imgfont/lv_imgfont.c - ${LVGL_DIR}/src/others/monkey/lv_monkey.c - ${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_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_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_canvas_parser.c - ${LVGL_DIR}/src/others/xml/parsers/lv_xml_checkbox_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_table_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/xml/lv_xml_translation.c + ${LVGL_DIR}/src/xml/lv_xml_widget.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_spangroup_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_dropdown_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_scale_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_arc_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_tabview_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_slider_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_chart_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_buttonmatrix_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_canvas_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_checkbox_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_calendar_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_switch_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_bar_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_button_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_label_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_keyboard_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_obj_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_qrcode_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_textarea_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_image_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_imagebutton_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_roller_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_spinbox_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_spinner_parser.c + ${LVGL_DIR}/src/xml/parsers/lv_xml_table_parser.c + ${LVGL_DIR}/src/xml/lv_xml_parser.c + ${LVGL_DIR}/src/xml/lv_xml_component.c + ${LVGL_DIR}/src/xml/lv_xml_base_types.c + ${LVGL_DIR}/src/xml/lv_xml_load.c + ${LVGL_DIR}/src/xml/lv_xml_style.c + ${LVGL_DIR}/src/xml/lv_xml_test.c + ${LVGL_DIR}/src/xml/lv_xml_utils.c + ${LVGL_DIR}/src/xml/lv_xml.c + ${LVGL_DIR}/src/xml/lv_xml_update.c ${LVGL_DIR}/src/stdlib/builtin/lv_tlsf.c ${LVGL_DIR}/src/stdlib/clib/lv_string_clib.c @@ -369,6 +402,7 @@ zephyr_library_sources( ${LVGL_DIR}/src/widgets/dropdown/lv_dropdown.c ${LVGL_DIR}/src/widgets/imagebutton/lv_imagebutton.c ${LVGL_DIR}/src/widgets/image/lv_image.c + ${LVGL_DIR}/src/widgets/ime/lv_ime_pinyin.c ${LVGL_DIR}/src/widgets/keyboard/lv_keyboard.c ${LVGL_DIR}/src/widgets/label/lv_label.c ${LVGL_DIR}/src/widgets/led/lv_led.c @@ -379,14 +413,29 @@ zephyr_library_sources( ${LVGL_DIR}/src/widgets/msgbox/lv_msgbox.c ${LVGL_DIR}/src/widgets/objx_templ/lv_objx_templ.c ${LVGL_DIR}/src/widgets/property/lv_animimage_properties.c + ${LVGL_DIR}/src/widgets/property/lv_arc_properties.c + ${LVGL_DIR}/src/widgets/property/lv_bar_properties.c + ${LVGL_DIR}/src/widgets/property/lv_buttonmatrix_properties.c + ${LVGL_DIR}/src/widgets/property/lv_chart_properties.c + ${LVGL_DIR}/src/widgets/property/lv_checkbox_properties.c ${LVGL_DIR}/src/widgets/property/lv_dropdown_properties.c ${LVGL_DIR}/src/widgets/property/lv_image_properties.c ${LVGL_DIR}/src/widgets/property/lv_keyboard_properties.c ${LVGL_DIR}/src/widgets/property/lv_label_properties.c + ${LVGL_DIR}/src/widgets/property/lv_led_properties.c + ${LVGL_DIR}/src/widgets/property/lv_line_properties.c + ${LVGL_DIR}/src/widgets/property/lv_menu_properties.c ${LVGL_DIR}/src/widgets/property/lv_obj_properties.c ${LVGL_DIR}/src/widgets/property/lv_roller_properties.c + ${LVGL_DIR}/src/widgets/property/lv_scale_properties.c ${LVGL_DIR}/src/widgets/property/lv_slider_properties.c + ${LVGL_DIR}/src/widgets/property/lv_span_properties.c + ${LVGL_DIR}/src/widgets/property/lv_spinbox_properties.c + ${LVGL_DIR}/src/widgets/property/lv_spinner_properties.c ${LVGL_DIR}/src/widgets/property/lv_style_properties.c + ${LVGL_DIR}/src/widgets/property/lv_switch_properties.c + ${LVGL_DIR}/src/widgets/property/lv_table_properties.c + ${LVGL_DIR}/src/widgets/property/lv_tabview_properties.c ${LVGL_DIR}/src/widgets/property/lv_textarea_properties.c ${LVGL_DIR}/src/widgets/roller/lv_roller.c ${LVGL_DIR}/src/widgets/scale/lv_scale.c diff --git a/samples/modules/lvgl/demos/CMakeLists.txt b/samples/modules/lvgl/demos/CMakeLists.txt index cf21ee3bccf..1a207ea2c05 100644 --- a/samples/modules/lvgl/demos/CMakeLists.txt +++ b/samples/modules/lvgl/demos/CMakeLists.txt @@ -9,60 +9,63 @@ project(lvgl_sample) set(LVGL_DIR ${ZEPHYR_LVGL_MODULE_DIR}) FILE(GLOB app_sources src/*.c) -target_sources(app PRIVATE ${app_sources}) +target_sources(app PRIVATE + ${app_sources} + ${LVGL_DIR}/demos/lv_demos.c +) target_include_directories(app PRIVATE ${LVGL_DIR}/demos/ ) target_sources_ifdef(CONFIG_LV_USE_DEMO_MUSIC app PRIVATE - ${LVGL_DIR}/demos/music/lv_demo_music.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_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_wave_bottom_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_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_list_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.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_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_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_list_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play.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_loop.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_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/assets/img_lv_demo_music_btn_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c + ${LVGL_DIR}/demos/music/lv_demo_music.c ${LVGL_DIR}/demos/music/lv_demo_music_list.c + ${LVGL_DIR}/demos/music/lv_demo_music_main.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_BENCHMARK app PRIVATE @@ -84,15 +87,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_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_avatar.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_needle.c - ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c + ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.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 + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_profile.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_KEYPAD_AND_ENCODER app PRIVATE diff --git a/samples/modules/lvgl/multi_display/CMakeLists.txt b/samples/modules/lvgl/multi_display/CMakeLists.txt index 7296edc05d8..cd7a6601d5d 100644 --- a/samples/modules/lvgl/multi_display/CMakeLists.txt +++ b/samples/modules/lvgl/multi_display/CMakeLists.txt @@ -10,60 +10,63 @@ project(lvgl_multi_display) set(LVGL_DIR ${ZEPHYR_LVGL_MODULE_DIR}) FILE(GLOB app_sources src/*.c) -target_sources(app PRIVATE ${app_sources}) +target_sources(app PRIVATE + ${app_sources} + ${LVGL_DIR}/demos/lv_demos.c +) target_include_directories(app PRIVATE ${LVGL_DIR}/demos/ ) target_sources_ifdef(CONFIG_LV_USE_DEMO_MUSIC app PRIVATE - ${LVGL_DIR}/demos/music/lv_demo_music.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_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_wave_bottom_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_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_list_play.c - ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.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_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_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_list_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_list_play.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_loop.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_loop_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_next_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/assets/img_lv_demo_music_btn_pause_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_play_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_prev_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_btn_rnd_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_left_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_corner_right_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_cover_3_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_1_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_2_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_3_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_icon_4_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_list_border_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_logo.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_slider_knob_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_bottom_large.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top.c + ${LVGL_DIR}/demos/music/assets/img_lv_demo_music_wave_top_large.c + ${LVGL_DIR}/demos/music/lv_demo_music.c ${LVGL_DIR}/demos/music/lv_demo_music_list.c + ${LVGL_DIR}/demos/music/lv_demo_music_main.c ) target_sources_ifdef(CONFIG_LV_USE_DEMO_BENCHMARK app PRIVATE @@ -85,13 +88,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_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_avatar.c ${LVGL_DIR}/demos/widgets/assets/img_demo_widgets_needle.c - ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c + ${LVGL_DIR}/demos/widgets/assets/img_lvgl_logo.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 + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_profile.c + ${LVGL_DIR}/demos/widgets/lv_demo_widgets_shop.c ) diff --git a/west.yml b/west.yml index 1f0d439fc5f..54df2a7dc76 100644 --- a/west.yml +++ b/west.yml @@ -318,7 +318,7 @@ manifest: revision: fb00b383072518c918e2258b0916c996f2d4eebe path: modules/lib/loramac-node - name: lvgl - revision: c016f72d4c125098287be5e83c0f1abed4706ee5 + revision: 94ae6c0535aa6ac4b08a75f4ae2c3a08cacb5c41 path: modules/lib/gui/lvgl - name: mbedtls revision: c5b06d89c9c498d8fc8659ce31f7e53137b6270f