Merge develop into main (#338)
### Cardputer: - Fix keyboard issue with up/down button conflict when selecting switch - Fix backlight flickering ### UI improvements - Removed a 3 pixel border that went around the entire desktop environment - Improved system layout (GuiService) - Statusbar: improved layout (mainly margin/padding) - Toolbar: fixed margin/padding of all buttons, fixed alignment of all content - Improved layout/UI of many apps ### Other - Update LVGL to 9.3.0 official release (was dev version)
This commit is contained in:
committed by
GitHub
parent
53b711584f
commit
a2af95b92d
+5
-6
@@ -49,11 +49,12 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
||||
set(EXCLUDE_COMPONENTS "Simulator")
|
||||
|
||||
# LVGL
|
||||
get_filename_component(
|
||||
LVGL_CONFIG_FULL_PATH Libraries/lvgl_conf ABSOLUTE
|
||||
)
|
||||
# set(LV_CONF_PATH Libraries/lvgl/src/lv_conf_kconfig.h)
|
||||
# get_filename_component(
|
||||
# LV_CONF_PATH Libraries/lvgl/src/lv_conf_kconfig.h ABSOLUTE
|
||||
# )
|
||||
# add_compile_definitions(LV_CONF_PATH="${LVGL_CONFIG_FULL_PATH}")
|
||||
|
||||
add_compile_definitions(LV_CONF_PATH="${LVGL_CONFIG_FULL_PATH}/lv_conf_kconfig.h")
|
||||
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
|
||||
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_log_write" APPEND)
|
||||
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=lv_button_create" APPEND)
|
||||
@@ -111,8 +112,6 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
|
||||
|
||||
# LVGL
|
||||
add_subdirectory(Libraries/lvgl) # Added as idf component for ESP and as library for other targets
|
||||
include_directories(lvgl PUBLIC ${PROJECT_SOURCE_DIR}/Libraries/lvgl_conf)
|
||||
target_compile_definitions(lvgl PUBLIC "-DLV_CONF_PATH=\"${PROJECT_SOURCE_DIR}/Libraries/lvgl_conf/lv_conf_simulator.h\"")
|
||||
target_link_libraries(lvgl PRIVATE SDL2-static)
|
||||
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user