From 4ef2e50563aafc0d63e4687dbaecc463b2ce84aa Mon Sep 17 00:00:00 2001 From: gagarinlg Date: Sat, 1 Jan 2022 15:45:37 +0100 Subject: [PATCH] add missing file to colorlcd CMakelist --- .gitmodules | 3 +- radio/src/gui/colorlcd/CMakeLists.txt | 53 ++++++++++++++++++++++++++- radio/src/thirdparty/libopenui | 2 +- radio/src/thirdparty/lvgl | 2 +- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index f9f1e42e8..0bd72c1f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,5 +14,4 @@ shallow = true [submodule "radio/src/thirdparty/lvgl"] path = radio/src/thirdparty/lvgl - url = https://github.com/lvgl/lvgl.git - branch = v8.1.0 + url = https://github.com/gagarinlg/lvgl.git diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index 652f87a31..417562e8b 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/radio/src/gui/colorlcd/CMakeLists.txt @@ -136,7 +136,6 @@ foreach(LIBOPENUI_FILE ${LIBOPENUI_SRC}) endforeach() set(LVGL_SOURCES - gpu/lv_gpu_stm32_dma2d.c core/lv_group.c core/lv_obj.c core/lv_event.c @@ -194,6 +193,7 @@ set(LVGL_SOURCES misc/lv_log.c misc/lv_area.c misc/lv_math.c + misc/lv_lru.c misc/lv_tlsf.c misc/lv_anim_timeline.c misc/lv_ll.c @@ -204,9 +204,55 @@ set(LVGL_SOURCES misc/lv_anim.c misc/lv_txt_ap.c draw/lv_draw_mask.c + draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c + draw/nxp_pxp/lv_gpu_nxp_pxp.c draw/lv_img_cache.c - draw/lv_draw_blend.c + draw/stm32_dma2d/lv_gpu_stm32_dma2d.c + draw/nxp_vglite/lv_gpu_nxp_vglite.c + draw/sw/lv_draw_sw.c + draw/sw/lv_draw_sw_blend.c + draw/sw/lv_draw_sw_letter.c + draw/sw/lv_draw_sw_arc.c + draw/sw/lv_draw_sw_polygon.c + draw/sw/lv_draw_sw_img.c + draw/sw/lv_draw_sw_line.c + draw/sw/lv_draw_sw_rect.c draw/lv_draw_line.c + draw/sdl/lv_draw_sdl_rect.c + draw/sdl/lv_draw_sdl_arc.c + draw/sdl/lv_draw_sdl.c + draw/sdl/lv_draw_sdl_mask.c + draw/sdl/lv_draw_sdl_stack_blur.c + draw/sdl/lv_draw_sdl_utils.c + draw/sdl/lv_draw_sdl_img.c + draw/sdl/lv_draw_sdl_blend.c + draw/sdl/lv_draw_sdl_bg.c + draw/sdl/lv_draw_sdl_label.c + draw/sdl/lv_draw_sdl_texture_cache.c + draw/sdl/lv_draw_sdl_line.c + draw/sdl/lv_draw_sdl_composite.c + draw/lv_draw.c + draw/lv_img_buf.c + draw/lv_draw_rect.c + draw/lv_draw_label.c + draw/lv_draw_img.c + draw/sw/lv_draw_sw_line.c + draw/sw/lv_draw_sw_rect.c + draw/lv_draw_line.c + draw/sdl/lv_draw_sdl_rect.c + draw/sdl/lv_draw_sdl_arc.c + draw/sdl/lv_draw_sdl.c + draw/sdl/lv_draw_sdl_mask.c + draw/sdl/lv_draw_sdl_stack_blur.c + draw/sdl/lv_draw_sdl_utils.c + draw/sdl/lv_draw_sdl_img.c + draw/sdl/lv_draw_sdl_blend.c + draw/sdl/lv_draw_sdl_bg.c + draw/sdl/lv_draw_sdl_label.c + draw/sdl/lv_draw_sdl_texture_cache.c + draw/sdl/lv_draw_sdl_line.c + draw/sdl/lv_draw_sdl_composite.c + draw/lv_draw.c draw/lv_img_buf.c draw/lv_draw_rect.c draw/lv_draw_label.c @@ -217,10 +263,12 @@ set(LVGL_SOURCES hal/lv_hal_indev.c hal/lv_hal_disp.c hal/lv_hal_tick.c + extra/others/monkey/lv_monkey.c extra/others/snapshot/lv_snapshot.c extra/layouts/grid/lv_grid.c extra/layouts/flex/lv_flex.c extra/libs/bmp/lv_bmp.c + extra/libs/ffmpeg/lv_ffmpeg.c extra/libs/gif/lv_gif.c extra/libs/gif/gifdec.c extra/libs/freetype/lv_freetype.c @@ -237,6 +285,7 @@ set(LVGL_SOURCES extra/libs/png/lodepng.c extra/lv_extra.c extra/widgets/imgbtn/lv_imgbtn.c + extra/widgets/menu/lv_menu.c extra/widgets/win/lv_win.c extra/widgets/colorwheel/lv_colorwheel.c extra/widgets/list/lv_list.c diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index f19339587..daeb3f133 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit f193395874ef6d371ce4fca9c3c222db88d60816 +Subproject commit daeb3f1330ad6bac33738419ec9c582b79c2e781 diff --git a/radio/src/thirdparty/lvgl b/radio/src/thirdparty/lvgl index d38eb1e68..9dc084429 160000 --- a/radio/src/thirdparty/lvgl +++ b/radio/src/thirdparty/lvgl @@ -1 +1 @@ -Subproject commit d38eb1e689fa5a64c25e677275172d9c8a4ab2f0 +Subproject commit 9dc084429642a2fac6e4086bae375feccf7dd1f6