diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cb96e313e..1d473e0edc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,26 +15,6 @@ if(ESP_PLATFORM) target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_CONF_INCLUDE_SIMPLE") - if (CONFIG_LV_MEM_CUSTOM) - if (CONFIG_LV_MEM_CUSTOM_ALLOC) - target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_MEM_CUSTOM_ALLOC=${CONFIG_LV_MEM_CUSTOM_ALLOC}") - endif() - - if (CONFIG_LV_MEM_CUSTOM_FREE) - target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_MEM_CUSTOM_FREE=${CONFIG_LV_MEM_CUSTOM_FREE}") - endif() - endif() - - if (CONFIG_LV_TICK_CUSTOM) - if (CONFIG_LV_TICK_CUSTOM_SYS_TIME_EXPR) - target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_TICK_CUSTOM_SYS_TIME_EXPR=${CONFIG_LV_TICK_CUSTOM_SYS_TIME_EXPR}") - endif() - endif() - - if (CONFIG_LV_USER_DATA_FREE) - target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_USER_DATA_FREE=${CONFIG_LV_USER_DATA_FREE}") - endif() - if (CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM) target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_ATTRIBUTE_FAST_MEM=IRAM_ATTR") endif() @@ -49,16 +29,6 @@ elseif(ZEPHYR_BASE) zephyr_compile_definitions(LV_CONF_KCONFIG_EXTERNAL_INCLUDE=) - zephyr_compile_definitions_ifdef(CONFIG_LV_MEM_CUSTOM - LV_MEM_CUSTOM_ALLOC=${CONFIG_LV_MEM_CUSTOM_ALLOC} - ) - zephyr_compile_definitions_ifdef(CONFIG_LV_MEM_CUSTOM - LV_MEM_CUSTOM_FREE=${CONFIG_LV_MEM_CUSTOM_FREE} - ) - zephyr_compile_definitions_ifdef(CONFIG_LV_TICK_CUSTOM - LV_TICK_CUSTOM_SYS_TIME_EXPR=${CONFIG_LV_TICK_CUSTOM_SYS_TIME_EXPR} - ) - zephyr_library() file(GLOB_RECURSE SOURCES src/*.c) diff --git a/Kconfig b/Kconfig index 5bf5ec86d7..4ce45815ca 100644 --- a/Kconfig +++ b/Kconfig @@ -322,24 +322,6 @@ menu "LVGL configuration" config LV_USE_LARGE_COORD bool "Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t" endmenu - - config LV_USE_USER_DATA_FREE - bool "Free the user data field upon object deletion" - depends on LV_USE_USER_DATA - config LV_USER_DATA_FREE_INCLUDE - string "Header for user data free function" - default "something.h" - depends on LV_USE_USER_DATA_FREE - config LV_USER_DATA_FREE - string "Invoking for user data free function. It has the lv_obj_t pointer as single parameter." - default "(user_data_free)" - depends on LV_USE_USER_DATA_FREE - config LV_USE_API_EXTENSION_V6 - bool "Use the functions and types from the older (v6) API if possible." - default y if !LV_CONF_MINIMAL - config LV_USE_API_EXTENSION_V7 - bool "Use the functions and types from the older (v7) API if possible." - default y if !LV_CONF_MINIMAL endmenu menu "Font usage" diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index efe5395b4d..ee494a8c69 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -19,10 +19,6 @@ *********************/ #define MY_CLASS &lv_obj_class -#if defined(LV_USER_DATA_FREE_INCLUDE) - #include LV_USER_DATA_FREE_INCLUDE -#endif /*LV_USE_USER_DATA_FREE*/ - /********************** * TYPEDEFS **********************/