Skip to content

Commit 187b26c

Browse files
ApehaengerClemensElfleinrovo89
authored
Sabo WIP (#13)
Just my Sabo related changes for not blocking possible larger structural changes. --------- Co-authored-by: Clemens Elflein <clemens1@familie-elflein.de> Co-authored-by: Robert Vollmer <dev@robv.de>
1 parent a6affae commit 187b26c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6645
-5
lines changed

CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
3636

3737
target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -Wall -Wextra -Werror)
3838

39-
4039
# Add lib subdirectory
4140
add_subdirectory(ext)
4241
target_compile_definitions(ulog PUBLIC ULOG_ENABLED)
@@ -47,6 +46,12 @@ target_link_directories(${CMAKE_PROJECT_NAME} PRIVATE
4746
# Add user defined library search paths
4847
)
4948

49+
# Add LVGL assets
50+
file(GLOB LVGL_ASSETS_SRC
51+
"src/drivers/ui/lvgl/assets/*.c"
52+
"src/drivers/ui/lvgl/assets/Orbitron/*.c"
53+
)
54+
5055
# Add sources to executable
5156
target_sources(${CMAKE_PROJECT_NAME} PRIVATE
5257
boards/XCORE/board_utils.cpp
@@ -90,12 +95,17 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE
9095
src/drivers/input/gpio_input_driver.cpp
9196
src/drivers/input/worx_input_driver.cpp
9297
$<$<CONFIG:Debug>:src/drivers/input/simulated_input_driver.cpp>
98+
# Sabo driver
99+
src/drivers/ui/SaboCoverUI/sabo_cover_ui_cabo_driver_base.cpp
100+
src/drivers/ui/SaboCoverUI/sabo_cover_ui_controller.cpp
101+
src/drivers/ui/SaboCoverUI/sabo_cover_ui_display_driver_uc1698.cpp
93102
# Raw driver debug interface
94103
src/debug/debug_tcp_interface.cpp
95104
src/debug/debug_udp_interface.cpp
96105
src/debug/debuggable_driver.cpp
97106
robots/src/robot.cpp
98107
${PLATFORM_SOURCES}
108+
${LVGL_ASSETS_SRC}
99109
)
100110

101111
# Add include paths
@@ -122,6 +132,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC
122132
etl::etl
123133
LittleFS
124134
lwjson
135+
lvgl
125136
)
126137

127138
target_add_service(${CMAKE_PROJECT_NAME} ImuService ${CMAKE_CURRENT_SOURCE_DIR}/services/imu_service.json)

ext/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ target_compile_definitions(xbot-service PUBLIC XBOT_ENABLE_STATIC_STACK)
1010
add_subdirectory(LSM6DS3TR-C-PID)
1111
add_subdirectory(etl)
1212

13+
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
14+
set(CONFIG_LV_BUILD_EXAMPLES OFF)
15+
set(CONFIG_LV_BUILD_DEMOS OFF)
16+
set(CONFIG_LV_USE_THORVG_INTERNAL OFF)
17+
add_subdirectory(lvgl)
1318

1419
# Add LittleFS
1520
add_library(LittleFS littlefs/lfs.c littlefs/lfs_util.c)

ext/lvgl/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Include(FetchContent)
2+
3+
FetchContent_Declare(
4+
lvgl
5+
GIT_REPOSITORY https://github.com/lvgl/lvgl
6+
GIT_TAG v9.3.0
7+
)
8+
9+
FetchContent_MakeAvailable(lvgl)

0 commit comments

Comments
 (0)