Skip to content

Commit 43666f5

Browse files
committed
boards: Add lvgl v9 support.
Signed-off-by: lbuque <[email protected]>
1 parent 1a6ea7b commit 43666f5

File tree

53 files changed

+780
-190
lines changed

Some content is hidden

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

53 files changed

+780
-190
lines changed

.gitmodules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
[submodule "m5stack/components/epdiy"]
2929
path = m5stack/components/epdiy
3030
url = https://github.com/vroland/epdiy.git
31-
3231
[submodule "m5stack/components/esp_zigbee_host"]
3332
path = m5stack/components/esp_zigbee_host
3433
url = https://github.com/hlym123/esp_zigbee_host.git
34+
[submodule "m5stack/cmodules/lv_binding_micropython"]
35+
path = m5stack/cmodules/lv_binding_micropython
36+
url = https://github.com/lvgl/lv_binding_micropython.git

m5stack/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
7777

7878
if(BUILD_WITH_LVGL)
7979
# Include LVGL component, ignore KCONFIG
80-
idf_build_set_property(LV_MICROPYTHON 1)
81-
idf_build_component(${CMAKE_SOURCE_DIR}/components/lv_bindings/lvgl)
82-
idf_build_set_property(COMPILE_DEFINITIONS "-DLV_KCONFIG_IGNORE" APPEND)
83-
separate_arguments(LV_CFLAGS_ENV UNIX_COMMAND $ENV{LV_CFLAGS})
84-
list(APPEND LV_CFLAGS ${LV_CFLAGS_ENV})
85-
idf_build_set_property(COMPILE_DEFINITIONS "${LV_CFLAGS}" APPEND)
80+
# idf_build_set_property(LV_MICROPYTHON 1)
81+
# idf_build_component(${CMAKE_SOURCE_DIR}/components/lv_bindings/lvgl)
82+
# idf_build_set_property(COMPILE_DEFINITIONS "-DLV_KCONFIG_IGNORE" APPEND)
83+
# separate_arguments(LV_CFLAGS_ENV UNIX_COMMAND $ENV{LV_CFLAGS})
84+
# list(APPEND LV_CFLAGS ${LV_CFLAGS_ENV})
85+
# idf_build_set_property(COMPILE_DEFINITIONS "${LV_CFLAGS}" APPEND)
8686
endif()
8787

8888
# Include main IDF cmake file.

m5stack/CMakeListsDefault.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ target_compile_definitions(${MICROPY_TARGET} PUBLIC
308308
LFS1_NO_MALLOC LFS1_NO_DEBUG LFS1_NO_WARN LFS1_NO_ERROR LFS1_NO_ASSERT
309309
LFS2_NO_MALLOC LFS2_NO_DEBUG LFS2_NO_WARN LFS2_NO_ERROR LFS2_NO_ASSERT
310310
BOARD_ID=${BOARD_ID}
311+
MICROPY_PY_LVGL=${MICROPY_PY_LVGL}
311312
)
312313

313314
# Disable some warnings to keep the build output clean.
@@ -318,7 +319,7 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
318319
)
319320

320321
target_link_options(${MICROPY_TARGET} PUBLIC
321-
${MICROPY_LINK_TINYUSB}
322+
${MICROPY_LINK_TINYUSB}
322323
)
323324

324325
# Additional include directories needed for private NimBLE headers.

0 commit comments

Comments
 (0)