mirror of
https://github.com/eez-open/lvgl-template-web.git
synced 2026-11-17 05:58:55 +01:00
update eez-framework
This commit is contained in:
parent
237fa83883
commit
29d33fb0ad
@ -27,7 +27,7 @@ if (${HAS_FLOW_SUPPORT})
|
|||||||
# EEZ Framework
|
# EEZ Framework
|
||||||
add_definitions(-DEEZ_PLATFORM_SIMULATOR)
|
add_definitions(-DEEZ_PLATFORM_SIMULATOR)
|
||||||
add_definitions(-DEEZ_FOR_LVGL)
|
add_definitions(-DEEZ_FOR_LVGL)
|
||||||
add_definitions(-DOPTION_GUI=0)
|
add_definitions(-DEEZ_OPTION_GUI=0)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
./
|
./
|
||||||
@ -41,61 +41,6 @@ if (${HAS_FLOW_SUPPORT})
|
|||||||
./eez/*.c
|
./eez/*.c
|
||||||
)
|
)
|
||||||
|
|
||||||
# exclude gui specific files
|
|
||||||
set(EXCLUDE_DIR "./eez/gui")
|
|
||||||
|
|
||||||
foreach(TMP_PATH ${src_eez})
|
|
||||||
string(FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
|
||||||
|
|
||||||
if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
|
||||||
list(REMOVE_ITEM src_eez ${TMP_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach(TMP_PATH)
|
|
||||||
|
|
||||||
# exclude fs specific files
|
|
||||||
set(EXCLUDE_DIR "./eez/fs")
|
|
||||||
|
|
||||||
foreach(TMP_PATH ${src_eez})
|
|
||||||
string(FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
|
||||||
|
|
||||||
if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
|
||||||
list(REMOVE_ITEM src_eez ${TMP_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach(TMP_PATH)
|
|
||||||
|
|
||||||
# exclude STM32 platform specific files
|
|
||||||
set(EXCLUDE_DIR "./eez/platform/stm32")
|
|
||||||
|
|
||||||
foreach(TMP_PATH ${src_eez})
|
|
||||||
string(FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
|
||||||
|
|
||||||
if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
|
||||||
list(REMOVE_ITEM src_eez ${TMP_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach(TMP_PATH)
|
|
||||||
|
|
||||||
# exclude libscpi
|
|
||||||
set(EXCLUDE_DIR "./eez/libs/libscpi")
|
|
||||||
|
|
||||||
foreach(TMP_PATH ${src_eez})
|
|
||||||
string(FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
|
||||||
|
|
||||||
if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
|
||||||
list(REMOVE_ITEM src_eez ${TMP_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach(TMP_PATH)
|
|
||||||
|
|
||||||
# exclude agg
|
|
||||||
set(EXCLUDE_DIR "../eez/libs/agg")
|
|
||||||
|
|
||||||
foreach(TMP_PATH ${src_eez})
|
|
||||||
string(FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
|
||||||
|
|
||||||
if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
|
||||||
list(REMOVE_ITEM src_eez ${TMP_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach(TMP_PATH)
|
|
||||||
|
|
||||||
list(APPEND SOURCES ${src_eez})
|
list(APPEND SOURCES ${src_eez})
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|||||||
2
eez
2
eez
@ -1 +1 @@
|
|||||||
Subproject commit 1d2b26104c80c2ed0bc100b9f2f67f254a7d561f
|
Subproject commit 70ddce6d411ec7c82ca3f42dfcc14e70cb97dcc7
|
||||||
File diff suppressed because one or more lines are too long
@ -25,6 +25,7 @@ void create_screen_main() {
|
|||||||
objects.main = obj;
|
objects.main = obj;
|
||||||
lv_obj_set_pos(obj, 0, 0);
|
lv_obj_set_pos(obj, 0, 0);
|
||||||
lv_obj_set_size(obj, 800, 480);
|
lv_obj_set_size(obj, 800, 480);
|
||||||
|
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
{
|
{
|
||||||
lv_obj_t *parent_obj = obj;
|
lv_obj_t *parent_obj = obj;
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user