Skip to content

Upgrade to LVGL 9.2 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jefdriesen wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Upgrade to LVGL 9.2 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ce5992
Update the LVGL submodule to v9.2.0
jefdriesen Aug 2, 2024
df27e7d
Remove the LVGL drivers submodule
jefdriesen Aug 2, 2024
e9027e3
Remove the deps directory from the include dirs
jefdriesen Aug 2, 2024
b16d4b2
Update the LVGL config file to v9.2.0
jefdriesen Aug 2, 2024
cac8952
Restore the non-default configuration
jefdriesen Aug 6, 2024
e9a90fe
Update to the new driver api
jefdriesen Aug 2, 2024
0e05acc
Update to the new LVGL api
jefdriesen Aug 2, 2024
93eb27f
Temporary disable the chart related api
jefdriesen Aug 6, 2024
263be66
Use explicit cast to convert integers to enum
jefdriesen Aug 23, 2024
b544847
Fix some magic values in the javascript code
jefdriesen Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "deps/lvgl"]
path = deps/lvgl
url = https://github.com/lvgl/lvgl.git
[submodule "deps/lv_drivers"]
path = deps/lv_drivers
url = https://github.com/lvgl/lv_drivers.git
[submodule "deps/txiki"]
path = deps/txiki
url = https://github.com/saghul/txiki.js.git
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,9 @@ endif()

add_subdirectory(deps/txiki EXCLUDE_FROM_ALL)
add_subdirectory(deps/lvgl EXCLUDE_FROM_ALL)
add_subdirectory(deps/lv_drivers EXCLUDE_FROM_ALL)

target_include_directories(lvgljs PUBLIC
${LVGL_PATH}
deps
src/
src/engine
src/engine/hal
Expand All @@ -111,11 +109,9 @@ target_include_directories(lvgljs PUBLIC
target_link_libraries(lvgljs PUBLIC
tjs
lvgl
lv_drivers
)

if(${CMAKE_BUILD_TYPE} MATCHES Simulator)
find_package(SDL2 REQUIRED)
target_include_directories(lv_drivers PUBLIC ${SDL2_INCLUDE_DIRS})
target_link_libraries(lvgljs PUBLIC ${SDL2_LIBRARIES})
endif()
Loading