From c190a87dce2d9a10e99676de9a6eddd4a85bd37f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 25 Feb 2022 12:00:48 +0100 Subject: [PATCH 1/5] pkg: move lvgl v7 to separate directory and deprecate --- dist/tools/doccheck/exclude_patterns | 178 +++++++ pkg/lvgl7/Kconfig | 91 ++++ pkg/lvgl7/Makefile | 25 + pkg/lvgl7/Makefile.dep | 26 + pkg/lvgl7/Makefile.include | 21 + pkg/lvgl7/Makefile.lvgl_module | 10 + pkg/lvgl7/contrib/Makefile | 3 + pkg/lvgl7/contrib/lvgl.c | 158 ++++++ pkg/lvgl7/doc.txt | 31 ++ pkg/lvgl7/include/lv_conf.h | 749 +++++++++++++++++++++++++++ pkg/lvgl7/include/lvgl_riot.h | 59 +++ pkg/lvgl7/include/lvgl_riot_conf.h | 39 ++ 12 files changed, 1390 insertions(+) create mode 100644 pkg/lvgl7/Kconfig create mode 100644 pkg/lvgl7/Makefile create mode 100644 pkg/lvgl7/Makefile.dep create mode 100644 pkg/lvgl7/Makefile.include create mode 100644 pkg/lvgl7/Makefile.lvgl_module create mode 100644 pkg/lvgl7/contrib/Makefile create mode 100644 pkg/lvgl7/contrib/lvgl.c create mode 100644 pkg/lvgl7/doc.txt create mode 100644 pkg/lvgl7/include/lv_conf.h create mode 100644 pkg/lvgl7/include/lvgl_riot.h create mode 100644 pkg/lvgl7/include/lvgl_riot_conf.h diff --git a/dist/tools/doccheck/exclude_patterns b/dist/tools/doccheck/exclude_patterns index 17f8181c8b..cb824d30a3 100644 --- a/dist/tools/doccheck/exclude_patterns +++ b/dist/tools/doccheck/exclude_patterns @@ -14709,3 +14709,181 @@ drivers/ft5x06/include/ft5x06_constants\.h:[0-9]+: warning: Member FT5X06_G_MODE drivers/ft5x06/include/ft5x06_params\.h:[0-9]+: warning: Member FT5X06_PARAM_TYPE \(macro definition\) of file ft5x06_params\.h is not documented\. boards/arduino\-uno/include/board\.h:[0-9]+: warning: Member CONFIG_ZTIMER_USEC_ADJUST_SET \(macro definition\) of file board\.h is not documented\. boards/arduino\-uno/include/board\.h:[0-9]+: warning: Member CONFIG_ZTIMER_USEC_ADJUST_SLEEP \(macro definition\) of file board\.h is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_VER_RES_MAX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_COLOR_DEPTH \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_COLOR_16_SWAP \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_COLOR_SCREEN_TRANSP \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_COLOR_TRANSP \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ANTIALIAS \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DISP_DEF_REFR_PERIOD \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DPI \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DISP_SMALL_LIMIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DISP_MEDIUM_LIMIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DISP_LARGE_LIMIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEM_CUSTOM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEM_SIZE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEM_ATTR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEM_ADR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEM_AUTO_DEFRAG \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_MEMCPY_MEMSET_STD \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ENABLE_GC \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_READ_PERIOD \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_DRAG_LIMIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_DRAG_THROW \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_LONG_PRESS_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_LONG_PRESS_REP_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_GESTURE_LIMIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_INDEV_DEF_GESTURE_MIN_VELOCITY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_ANIMATION \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_SHADOW \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_OUTLINE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_PATTERN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_VALUE_STR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_BLEND_MODES \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_OPA_SCALE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_IMG_TRANSFORM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_GROUP \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_GPU \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_GPU_STM32_DMA2D \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_FILESYSTEM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_USER_DATA \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_PERF_MONITOR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_API_EXTENSION_V6 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_API_EXTENSION_V7 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_IMG_CF_INDEXED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_IMG_CF_ALPHA \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_IMG_CACHE_DEF_SIZE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_BIG_ENDIAN_SYSTEM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_TICK_INC \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_TASK_HANDLER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_FLUSH_READY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_MEM_ALIGN_SIZE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_MEM_ALIGN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_LARGE_CONST \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_FAST_MEM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_EXPORT_CONST_INT\(int_value\) \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ATTRIBUTE_DMA \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LOG \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_DEBUG \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_12 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_14 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_16 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_18 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_20 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_22 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_24 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_26 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_28 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_30 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_32 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_34 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_36 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_38 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_40 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_42 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_44 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_46 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_48 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_12_SUBPX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_MONTSERRAT_28_COMPRESSED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_DEJAVU_16_PERSIAN_HEBREW \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_SIMSUN_16_CJK \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_UNSCII_8 \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_CUSTOM_DECLARE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_FMT_TXT_LARGE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_FONT_COMPRESSED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_FONT_SUBPX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_FONT_SUBPX_BGR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_THEME_EMPTY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_THEME_TEMPLATE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_THEME_MATERIAL \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_THEME_MONO \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_INCLUDE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_INIT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_COLOR_PRIMARY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_COLOR_SECONDARY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_FLAG \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_FONT_SMALL \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_FONT_NORMAL \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_FONT_SUBTITLE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_THEME_DEFAULT_FONT_TITLE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_ENC \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_BREAK_CHARS \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_LINE_BREAK_LONG_LEN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TXT_COLOR_CMD \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_BIDI \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_ARABIC_PERSIAN_CHARS \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_SPRINTF_CUSTOM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_OBJ_REALIGN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_EXT_CLICK_AREA \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_ARC \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_BAR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_BTN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_BTNMATRIX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CALENDAR \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_CALENDAR_WEEK_STARTS_MONDAY \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CANVAS \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CHECKBOX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CHART \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_CHART_AXIS_TICK_LABEL_MAX_LEN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CONT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_CPICKER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_DROPDOWN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_DROPDOWN_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_GAUGE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_IMG \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_IMGBTN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_IMGBTN_TILED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_KEYBOARD \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LABEL \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LABEL_DEF_SCROLL_SPEED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LABEL_WAIT_CHAR_COUNT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LABEL_TEXT_SEL \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LABEL_LONG_TXT_HINT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LED \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LED_BRIGHT_MIN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LED_BRIGHT_MAX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LINE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LIST \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LIST_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_LINEMETER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_LINEMETER_PRECISE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_OBJMASK \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_MSGBOX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_PAGE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_PAGE_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_SPINNER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_SPINNER_DEF_ARC_LENGTH \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_SPINNER_DEF_SPIN_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_SPINNER_DEF_ANIM \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_ROLLER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ROLLER_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_ROLLER_INF_PAGES \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_SLIDER \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_SPINBOX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_SWITCH \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_TEXTAREA \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TEXTAREA_DEF_CURSOR_BLINK_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TEXTAREA_DEF_PWD_SHOW_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_TABLE \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TABLE_COL_MAX \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TABLE_CELL_STYLE_CNT \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_TABVIEW \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TABVIEW_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_TILEVIEW \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_TILEVIEW_DEF_ANIM_TIME \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member LV_USE_WIN \(macro definition\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_anim_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_group_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_img_decoder_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_disp_drv_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_indev_drv_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lv_conf\.h:[0-9]+: warning: Member lv_font_user_data_t \(typedef\) of group pkg_lvgl7 is not documented\. +pkg/lvgl7/include/lvgl_riot\.h:[0-9]+: warning: end of file with unbalanced grouping commands +pkg/lvgl7/include/lvgl_riot_conf\.h:[0-9]+: warning: end of file with unbalanced grouping commands +pkg/lvgl7/include/lvgl_riot_conf\.h:[0-9]+: warning: Member LV_TICK_CUSTOM \(macro definition\) of file lvgl_riot_conf\.h is not documented\. +pkg/lvgl7/include/lvgl_riot_conf\.h:[0-9]+: warning: Member LV_TICK_CUSTOM_INCLUDE \(macro definition\) of file lvgl_riot_conf\.h is not documented\. +pkg/lvgl7/include/lvgl_riot_conf\.h:[0-9]+: warning: Member LV_TICK_CUSTOM_SYS_TIME_EXPR \(macro definition\) of file lvgl_riot_conf\.h is not documented\. +pkg/lvgl7/include/lvgl_riot_conf\.h:[0-9]+: warning: Member lv_coord_t \(typedef\) of file lvgl_riot_conf\.h is not documented\. diff --git a/pkg/lvgl7/Kconfig b/pkg/lvgl7/Kconfig new file mode 100644 index 0000000000..2474dbf0a6 --- /dev/null +++ b/pkg/lvgl7/Kconfig @@ -0,0 +1,91 @@ +# Copyright (c) 2021 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +if TEST_KCONFIG + +menuconfig PACKAGE_LVGL + bool "LVGL package" + imply MODULE_AUTO_INIT_SCREEN + select MODULE_LVGL + select MODULE_LVGL_CORE + select MODULE_LVGL_DRAW + select MODULE_LVGL_FONT + select MODULE_LVGL_HAL + select MODULE_LVGL_MISC + select MODULE_LVGL_THEMES + select MODULE_LVGL_WIDGETS + + # lvgl is not compatible with non 32bit platforms + # Building lv_misc triggers the error: + # "left shift count >= width of type [-Werror=shift-count-overflow]" + depends on !HAS_ARCH_8BIT + depends on !HAS_ARCH_16BIT + +if PACKAGE_LVGL + +config MODULE_LVGL_CONTRIB + bool "Contrib" + select MODULE_DISP_DEV + select MODULE_CORE_THREAD_FLAGS + select MODULE_ZTIMER + select MODULE_ZTIMER_MSEC + +config MODULE_LVGL_CONTRIB_TOUCH + bool "Touch support" + select MODULE_TOUCH_DEV + +endif # PACKAGE_LVGL + +config MODULE_LVGL + bool + +config MODULE_LVGL_CORE + bool + +config MODULE_LVGL_DRAW + bool + +config MODULE_LVGL_FONT + bool + +config MODULE_LVGL_HAL + bool + +config MODULE_LVGL_MISC + bool + +config MODULE_LVGL_THEMES + bool + +config MODULE_LVGL_WIDGETS + bool + +endif # TEST_KCONFIG + +menuconfig KCONFIG_USEPKG_LVGL + bool "Configure LVGL" + depends on USEPKG_LVGL + help + Configure LVGL package via Kconfig. + +if KCONFIG_USEPKG_LVGL + +menu "LVGL RIOT configuration" + + config LVGL_INACTIVITY_PERIOD_MS + int "Inactivity period before blocking the LVGL thread (in ms)" + default 5000 + + config LVGL_TASK_HANDLER_DELAY_US + int "Delay between calls to the lvgl task handler (in us)" + default 5000 + +endmenu + +osource "$(RIOTBASE)/build/pkg/lvgl/Kconfig" + +endif diff --git a/pkg/lvgl7/Makefile b/pkg/lvgl7/Makefile new file mode 100644 index 0000000000..bf657216d8 --- /dev/null +++ b/pkg/lvgl7/Makefile @@ -0,0 +1,25 @@ +PKG_NAME=lvgl +PKG_URL=https://github.com/littlevgl/lvgl +PKG_VERSION=ec9de515b36641be565d7bace5863ab631ce3b69 # v7.11.0 +PKG_LICENSE=MIT + +include $(RIOTBASE)/pkg/pkg.mk + +LVGL_MODULES = \ + lvgl_core \ + lvgl_draw \ + lvgl_font \ + lvgl_hal \ + lvgl_misc \ + lvgl_themes \ + lvgl_widgets \ + # + +CFLAGS += -Wno-cast-align + +.PHONY: lvgl_% + +all: $(LVGL_MODULES) + +lvgl_%: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/lv_$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ diff --git a/pkg/lvgl7/Makefile.dep b/pkg/lvgl7/Makefile.dep new file mode 100644 index 0000000000..ed7d7dbff4 --- /dev/null +++ b/pkg/lvgl7/Makefile.dep @@ -0,0 +1,26 @@ +USEMODULE += lvgl +USEMODULE += lvgl7 +USEMODULE += lvgl_core +USEMODULE += lvgl_draw +USEMODULE += lvgl_font +USEMODULE += lvgl_hal +USEMODULE += lvgl_misc +USEMODULE += lvgl_themes +USEMODULE += lvgl_widgets + +ifneq (,$(filter lvgl_contrib,$(USEMODULE))) + USEMODULE += disp_dev + USEMODULE += core_thread_flags + USEMODULE += ztimer + USEMODULE += ztimer_msec +endif + +ifneq (,$(filter lvgl_contrib_touch,$(USEMODULE))) + USEMODULE += touch_dev +endif + +# lvgl is not compatible with non 32bit platforms +# Building lv_misc triggers the error: +# "left shift count >= width of type [-Werror=shift-count-overflow]" +FEATURES_BLACKLIST += arch_8bit +FEATURES_BLACKLIST += arch_16bit diff --git a/pkg/lvgl7/Makefile.include b/pkg/lvgl7/Makefile.include new file mode 100644 index 0000000000..e4ee3855cf --- /dev/null +++ b/pkg/lvgl7/Makefile.include @@ -0,0 +1,21 @@ +$(warning LVGL v7 is deprecated, migrate to LVGL v8 as soon as possible) + +INCLUDES += -I$(RIOTBASE)/pkg/lvgl7/include +INCLUDES += -I$(PKGDIRBASE) + +# Don't use relative includes in lvgl +CFLAGS += -DLV_CONF_INCLUDE_SIMPLE + +ifneq (,$(filter lvgl_contrib,$(USEMODULE))) + DIRS += $(RIOTBASE)/pkg/lvgl7/contrib +endif + +# Configure the lvgl_riot_conf.h header for lvgl kconfig management +CFLAGS += -DLV_CONF_KCONFIG_EXTERNAL_INCLUDE=\""lvgl_riot_conf.h"\" + +# lvgl module is not a concrete module, so declare it as a pseudomodule +PSEUDOMODULES += lvgl +PSEUDOMODULES += lvgl7 + +# touch capabilities are available via a pseudomodule +PSEUDOMODULES += lvgl_contrib_touch diff --git a/pkg/lvgl7/Makefile.lvgl_module b/pkg/lvgl7/Makefile.lvgl_module new file mode 100644 index 0000000000..eb44812a13 --- /dev/null +++ b/pkg/lvgl7/Makefile.lvgl_module @@ -0,0 +1,10 @@ +CFLAGS += -Wno-unused-parameter +CFLAGS += -Wno-sign-compare +CFLAGS += -Wno-unused-function +CFLAGS += -Wno-maybe-uninitialized + +ifeq (llvm,$(TOOLCHAIN)) + CFLAGS += -Wno-missing-braces +endif + +include $(RIOTBASE)/Makefile.base diff --git a/pkg/lvgl7/contrib/Makefile b/pkg/lvgl7/contrib/Makefile new file mode 100644 index 0000000000..d5fb241738 --- /dev/null +++ b/pkg/lvgl7/contrib/Makefile @@ -0,0 +1,3 @@ +MODULE = lvgl_contrib + +include $(RIOTBASE)/Makefile.base diff --git a/pkg/lvgl7/contrib/lvgl.c b/pkg/lvgl7/contrib/lvgl.c new file mode 100644 index 0000000000..7b8b6f0f51 --- /dev/null +++ b/pkg/lvgl7/contrib/lvgl.c @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2019-2020 Inria + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup pkg_lvgl7 + * @{ + * + * @file + * @brief LittlevGL glue code + * + * @author Alexandre Abadie + * @} + */ + +#include + +#include "kernel_defines.h" +#include "thread.h" + +#include "timex.h" +#include "ztimer.h" +#include "log.h" + +#include "lvgl/lvgl.h" +#include "lvgl_riot.h" + +#include "screen_dev.h" + +#ifndef LVGL_COLOR_BUF_SIZE +#define LVGL_COLOR_BUF_SIZE (LV_HOR_RES_MAX * 5) +#endif + +#ifndef CONFIG_LVGL_INACTIVITY_PERIOD_MS +#define CONFIG_LVGL_INACTIVITY_PERIOD_MS (5 * MS_PER_SEC) /* 5s */ +#endif + +#ifndef CONFIG_LVGL_TASK_HANDLER_DELAY_MS +#define CONFIG_LVGL_TASK_HANDLER_DELAY_MS (5) /* 5ms */ +#endif + +#ifndef LVGL_THREAD_FLAG +#define LVGL_THREAD_FLAG (1 << 7) +#endif + +static kernel_pid_t _task_thread_pid; + +static lv_disp_buf_t disp_buf; +static lv_color_t buf[LVGL_COLOR_BUF_SIZE]; + +static screen_dev_t *_screen_dev = NULL; + +static void _disp_map(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_p) +{ + if (!_screen_dev->display) { + return; + } + + disp_dev_map(_screen_dev->display, area->x1, area->x2, area->y1, area->y2, + (const uint16_t *)color_p); + + LOG_DEBUG("[lvgl] flush display\n"); + + lv_disp_flush_ready(drv); +} + +#if IS_USED(MODULE_TOUCH_DEV) +/* adapted from https://github.com/lvgl/lvgl/tree/v6.1.2#add-littlevgl-to-your-project */ +static bool _touch_read(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) +{ + if (!_screen_dev->touch) { + return false; + } + + (void)indev_driver; + static lv_coord_t last_x = 0; + static lv_coord_t last_y = 0; + + touch_t positions[1]; + uint8_t touches = touch_dev_touches(_screen_dev->touch, positions, 1); + + /* Save the state and save the pressed coordinates */ + data->state = (touches > 0) ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; + if (data->state == LV_INDEV_STATE_PR) { + last_x = positions[0].x; + last_y = positions[0].y; + } + + /* Set the coordinates (if released use the last pressed coordinates) */ + data->point.x = last_x; + data->point.y = last_y; + + return false; +} +#endif + +void lvgl_init(screen_dev_t *screen_dev) +{ + lv_init(); + _screen_dev = screen_dev; + assert(screen_dev->display); + + lv_disp_drv_t disp_drv; + lv_disp_drv_init(&disp_drv); + /* Configure horizontal and vertical resolutions based on the + underlying display device parameters */ + disp_drv.hor_res = disp_dev_width(screen_dev->display); + disp_drv.ver_res = disp_dev_height(screen_dev->display); + + disp_drv.flush_cb = _disp_map; + disp_drv.buffer = &disp_buf; + lv_disp_drv_register(&disp_drv); + lv_disp_buf_init(&disp_buf, buf, NULL, LVGL_COLOR_BUF_SIZE); + +#if IS_USED(MODULE_TOUCH_DEV) + if (screen_dev->touch) { + lv_indev_drv_t indev_drv; + lv_indev_drv_init(&indev_drv); + indev_drv.type = LV_INDEV_TYPE_POINTER; + indev_drv.read_cb = _touch_read; + lv_indev_drv_register(&indev_drv); + } +#endif +} + +void lvgl_run(void) +{ + _task_thread_pid = thread_getpid(); + + lv_task_handler(); + + while (1) { + /* Normal operation (no sleep) in < CONFIG_LVGL_INACTIVITY_PERIOD_MS msec + inactivity */ + if (lv_disp_get_inactive_time(NULL) < CONFIG_LVGL_INACTIVITY_PERIOD_MS) { + lv_task_handler(); + } + else { + /* Block after LVGL_ACTIVITY_PERIOD msec inactivity */ + thread_flags_wait_one(LVGL_THREAD_FLAG); + + /* trigger an activity so the task handler is called on the next loop */ + lv_disp_trig_activity(NULL); + } + + ztimer_sleep(ZTIMER_MSEC, CONFIG_LVGL_TASK_HANDLER_DELAY_MS); + } +} + +void lvgl_wakeup(void) +{ + thread_t *tcb = thread_get(_task_thread_pid); + thread_flags_set(tcb, LVGL_THREAD_FLAG); +} diff --git a/pkg/lvgl7/doc.txt b/pkg/lvgl7/doc.txt new file mode 100644 index 0000000000..061c2a9667 --- /dev/null +++ b/pkg/lvgl7/doc.txt @@ -0,0 +1,31 @@ +/** +@defgroup pkg_lvgl7 LittlevGL - Open-Source Embedded GUI Library +@ingroup pkg +@brief LittlevGL package for RIOT + +@see https://github.com/littlevgl/lvgl +@deprecated LVGL v7 Will not be available after the 2022.04, please migrate to + LVGL v8. + +## Configuration options + +The package can be configured with using several variables. These variables can +either be configured using CFLAGS or using Kconfig (via `make menuconfig`). +LVGL_TASK_THREAD_PRIO cannot be configured via Kconfig. + +### Engine settings + +- `CONFIG_LVGL_INACTIVITY_PERIOD_MS`: maximum inactivity period before going to sleep in ms. + (default: 5s) +- `CONFIG_LVGL_TASK_HANDLER_DELAY_MS`: delay between lvgl task handle call in us. + (default: 5ms) +- `LVGL_TASK_THREAD_PRIO`: lvgl task handler thread priority. + (default: THREAD_PRIORITY_MAIN - 1) + +Example of command line for changing the max activity period to 5s: + +``` +CFLAGS=-DCONFIG_LVGL_ACTIVITY_PERIOD=5000 make -C tests/pkg_lvgl +``` + + */ diff --git a/pkg/lvgl7/include/lv_conf.h b/pkg/lvgl7/include/lv_conf.h new file mode 100644 index 0000000000..7c0e9ce4c9 --- /dev/null +++ b/pkg/lvgl7/include/lv_conf.h @@ -0,0 +1,749 @@ +/* + * Copyright (C) 2019 Inria + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup pkg_lvgl7 + * @brief LittlevGL configuration macros + * @{ + * + * @author Alexandre Abadie + */ + +#ifndef LV_CONF_H +#define LV_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include "kernel_defines.h" +#include "lvgl_riot_conf.h" + +/*==================== + Graphical settings + *====================*/ + +/* Maximal horizontal and vertical resolution to support by the library.*/ +#ifndef LV_HOR_RES_MAX +#define LV_HOR_RES_MAX (320) +#endif + +#ifndef LV_VER_RES_MAX +#define LV_VER_RES_MAX (240) +#endif + +/* Color depth: + * - 1: 1 byte per pixel + * - 8: RGB233 + * - 16: RGB565 + * - 32: ARGB8888 + */ +#ifndef LV_COLOR_DEPTH +#define LV_COLOR_DEPTH 16 +#endif + +/* Swap the 2 bytes of RGB565 color. + * Useful if the display has a 8 bit interface (e.g. SPI)*/ +#ifndef LV_COLOR_16_SWAP +#if IS_USED(MODULE_ILI9341) +#define LV_COLOR_16_SWAP 1 +#else +#define LV_COLOR_16_SWAP 0 +#endif +#endif + +/* 1: Enable screen transparency. + * Useful for OSD or other overlapping GUIs. + * Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`*/ +#define LV_COLOR_SCREEN_TRANSP 0 + +/*Images pixels with this color will not be drawn (with chroma keying)*/ +#define LV_COLOR_TRANSP LV_COLOR_LIME /*LV_COLOR_LIME: pure green*/ + +/* Enable anti-aliasing (lines, and radiuses will be smoothed) */ +#define LV_ANTIALIAS 1 + +/* Default display refresh period. + * Can be changed in the display driver (`lv_disp_drv_t`).*/ +#define LV_DISP_DEF_REFR_PERIOD 10 /*[ms]*/ + +/* Dot Per Inch: used to initialize default sizes. + * E.g. a button with width = LV_DPI / 2 -> half inch wide + * (Not so important, you can adjust it to modify default sizes and spaces)*/ +#define LV_DPI 100 /*[px]*/ + +/* The the real width of the display changes some default values: + * default object sizes, layout of examples, etc. + * According to the width of the display (hor. res. / dpi) + * the displays fall in 4 categories. + * The 4th is extra large which has no upper limit so not listed here + * The upper limit of the categories are set below in 0.1 inch unit. + */ +#define LV_DISP_SMALL_LIMIT 30 +#define LV_DISP_MEDIUM_LIMIT 50 +#define LV_DISP_LARGE_LIMIT 70 + +/*========================= + Memory manager settings + *=========================*/ + +/* LittelvGL's internal memory manager's settings. + * The graphical objects and other related data are stored here. */ + +/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */ +#define LV_MEM_CUSTOM 0 +#if LV_MEM_CUSTOM == 0 +/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ +#ifndef LV_MEM_SIZE +#define LV_MEM_SIZE (5U * 1024U) +#endif + +/* Compiler prefix for a big array declaration */ +#define LV_MEM_ATTR + +/* Set an address for the memory pool instead of allocating it as an array. + * Can be in external SRAM too. */ +#define LV_MEM_ADR 0 + +/* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */ +#define LV_MEM_AUTO_DEFRAG 1 +#else /*LV_MEM_CUSTOM*/ +#define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ +#define LV_MEM_CUSTOM_ALLOC malloc /*Wrapper to malloc*/ +#define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/ +#endif /*LV_MEM_CUSTOM*/ + +/* Use the standard memcpy and memset instead of LVGL's own functions. + * The standard functions might or might not be faster depending on their implementation. */ +#define LV_MEMCPY_MEMSET_STD 0 + +/* Garbage Collector settings + * Used if lvgl is binded to higher level language and the memory is managed by that language */ +#define LV_ENABLE_GC 0 +#if LV_ENABLE_GC != 0 +#define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ +#define LV_MEM_CUSTOM_REALLOC your_realloc /*Wrapper to realloc*/ +#define LV_MEM_CUSTOM_GET_SIZE your_mem_get_size /*Wrapper to lv_mem_get_size*/ +#endif /* LV_ENABLE_GC */ + +/*======================= + Input device settings + *=======================*/ + +/* Input device default settings. + * Can be changed in the Input device driver (`lv_indev_drv_t`)*/ + +/* Input device read period in milliseconds */ +#define LV_INDEV_DEF_READ_PERIOD 30 + +/* Drag threshold in pixels */ +#define LV_INDEV_DEF_DRAG_LIMIT 10 + +/* Drag throw slow-down in [%]. Greater value -> faster slow-down */ +#define LV_INDEV_DEF_DRAG_THROW 20 + +/* Long press time in milliseconds. + * Time to send `LV_EVENT_LONG_PRESSSED`) */ +#define LV_INDEV_DEF_LONG_PRESS_TIME 400 + +/* Repeated trigger period in long press [ms] + * Time between `LV_EVENT_LONG_PRESSED_REPEAT */ +#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 + +/* Gesture threshold in pixels */ +#define LV_INDEV_DEF_GESTURE_LIMIT 50 + +/* Gesture min velocity at release before swipe (pixels)*/ +#define LV_INDEV_DEF_GESTURE_MIN_VELOCITY 3 + +/*================== + * Feature usage + *==================*/ + +/*1: Enable the Animations */ +#define LV_USE_ANIMATION 1 +#if LV_USE_ANIMATION + +/*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_anim_user_data_t; +#endif + +/* 1: Enable shadow drawing*/ +#define LV_USE_SHADOW 0 +#if LV_USE_SHADOW +/* Allow buffering some shadow calculation + * LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, + * where shadow size is `shadow_width + radius` + * Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/ +#define LV_SHADOW_CACHE_SIZE 0 +#endif + +/*1: enable outline drawing on rectangles*/ +#define LV_USE_OUTLINE 0 + +/*1: enable pattern drawing on rectangles*/ +#define LV_USE_PATTERN 0 + +/*1: enable value string drawing on rectangles*/ +#define LV_USE_VALUE_STR 0 + +/* 1: Use other blend modes than normal (`LV_BLEND_MODE_...`)*/ +#define LV_USE_BLEND_MODES 0 + +/* 1: Use the `opa_scale` style property to set the opacity of an object and its children at once*/ +#define LV_USE_OPA_SCALE 0 + +/* 1: Use image zoom and rotation*/ +#define LV_USE_IMG_TRANSFORM 0 + +/* 1: Enable object groups (for keyboard/encoder navigation) */ +#define LV_USE_GROUP 1 +#if LV_USE_GROUP +typedef void * lv_group_user_data_t; +#endif /*LV_USE_GROUP*/ + +/* 1: Enable GPU interface*/ +#define LV_USE_GPU 0 /*Only enables `gpu_fill_cb` and `gpu_blend_cb` in the disp. drv- */ +#define LV_USE_GPU_STM32_DMA2D 0 +/*If enabling LV_USE_GPU_STM32_DMA2D, LV_GPU_DMA2D_CMSIS_INCLUDE must be defined to include path of CMSIS header of target processor +e.g. "stm32f769xx.h" or "stm32f429xx.h" */ +#define LV_GPU_DMA2D_CMSIS_INCLUDE + +/* 1: Enable file system (might be required for images */ +#define LV_USE_FILESYSTEM 0 +#if LV_USE_FILESYSTEM +/*Declare the type of the user data of file system drivers (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_fs_drv_user_data_t; +#endif + +/*1: Add a `user_data` to drivers and objects*/ +#define LV_USE_USER_DATA 0 + +/*1: Show CPU usage and FPS count in the right bottom corner*/ +#define LV_USE_PERF_MONITOR 0 + +/*1: Use the functions and types from the older API if possible */ +#define LV_USE_API_EXTENSION_V6 1 +#define LV_USE_API_EXTENSION_V7 1 + +/*======================== + * Image decoder and cache + *========================*/ + +/* 1: Enable indexed (palette) images */ +#define LV_IMG_CF_INDEXED 1 + +/* 1: Enable alpha indexed images */ +#define LV_IMG_CF_ALPHA 1 + +/* Default image cache size. Image caching keeps the images opened. + * If only the built-in image formats are used there is no real advantage of caching. + * (I.e. no new image decoder is added) + * With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images. + * However the opened images might consume additional RAM. + * LV_IMG_CACHE_DEF_SIZE must be >= 1 */ +#define LV_IMG_CACHE_DEF_SIZE 1 + +/*Declare the type of the user data of image decoder (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_img_decoder_user_data_t; + +/*===================== + * Compiler settings + *====================*/ + +/* For big endian systems set to 1 */ +#define LV_BIG_ENDIAN_SYSTEM 0 + +/* Define a custom attribute to `lv_tick_inc` function */ +#define LV_ATTRIBUTE_TICK_INC + +/* Define a custom attribute to `lv_task_handler` function */ +#define LV_ATTRIBUTE_TASK_HANDLER + +/* Define a custom attribute to `lv_disp_flush_ready` function */ +#define LV_ATTRIBUTE_FLUSH_READY + +/* Required alignment size for buffers */ +#define LV_ATTRIBUTE_MEM_ALIGN_SIZE + +/* With size optimization (-Os) the compiler might not align data to + * 4 or 8 byte boundary. This alignment will be explicitly applied where needed. + * E.g. __attribute__((aligned(4))) */ +#define LV_ATTRIBUTE_MEM_ALIGN + +/* Attribute to mark large constant arrays for example + * font's bitmaps */ +#define LV_ATTRIBUTE_LARGE_CONST + +/* Prefix performance critical functions to place them into a faster memory (e.g RAM) + * Uses 15-20 kB extra memory */ +#define LV_ATTRIBUTE_FAST_MEM + +/* Export integer constant to binding. + * This macro is used with constants in the form of LV_ that + * should also appear on lvgl binding API such as Micropython + * + * The default value just prevents a GCC warning. + */ +#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning + +/* Prefix variables that are used in GPU accelerated operations, often these need to be + * placed in RAM sections that are DMA accessible */ +#define LV_ATTRIBUTE_DMA + +/*=================== + * HAL settings + *==================*/ + +typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/ +typedef void * lv_indev_drv_user_data_t; /*Type of user data in the input device driver*/ + +/*================ + * Log settings + *===============*/ + +/*1: Enable the log module*/ +#define LV_USE_LOG 0 +#if LV_USE_LOG +/* How important log should be added: + * LV_LOG_LEVEL_TRACE A lot of logs to give detailed information + * LV_LOG_LEVEL_INFO Log important events + * LV_LOG_LEVEL_WARN Log if something unwanted happened but didn't cause a problem + * LV_LOG_LEVEL_ERROR Only critical issue, when the system may fail + * LV_LOG_LEVEL_NONE Do not log anything + */ +#define LV_LOG_LEVEL LV_LOG_LEVEL_WARN + +/* 1: Print the log with 'printf'; + * 0: user need to register a callback with `lv_log_register_print_cb`*/ +#define LV_LOG_PRINTF 0 +#endif /*LV_USE_LOG*/ + +/*================= + * Debug settings + *================*/ + +/* If Debug is enabled LittelvGL validates the parameters of the functions. + * If an invalid parameter is found an error log message is printed and + * the MCU halts at the error. (`LV_USE_LOG` should be enabled) + * If you are debugging the MCU you can pause + * the debugger to see exactly where the issue is. + * + * The behavior of asserts can be overwritten by redefining them here. + * E.g. #define LV_ASSERT_MEM(p) + */ +#define LV_USE_DEBUG 0 +#if LV_USE_DEBUG + +/*Check if the parameter is NULL. (Quite fast) */ +#define LV_USE_ASSERT_NULL 1 + +/*Checks is the memory is successfully allocated or no. (Quite fast)*/ +#define LV_USE_ASSERT_MEM 1 + +/*Check the integrity of `lv_mem` after critical operations. (Slow)*/ +#define LV_USE_ASSERT_MEM_INTEGRITY 0 + +/* Check the strings. + * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow) + * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */ +#define LV_USE_ASSERT_STR 0 + +/* Check NULL, the object's type and existence (e.g. not deleted). (Quite slow) + * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */ +#define LV_USE_ASSERT_OBJ 0 + +/*Check if the styles are properly initialized. (Fast)*/ +#define LV_USE_ASSERT_STYLE 1 + +#endif /*LV_USE_DEBUG*/ + +/*================== + * FONT USAGE + *===================*/ + +/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. + * The symbols are available via `LV_SYMBOL_...` defines + * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html + * To create a new font go to: https://lvgl.com/ttf-font-to-c-array + */ + +/* Montserrat fonts with bpp = 4 + * https://fonts.google.com/specimen/Montserrat */ +#define LV_FONT_MONTSERRAT_12 1 +#define LV_FONT_MONTSERRAT_14 0 +#define LV_FONT_MONTSERRAT_16 0 +#define LV_FONT_MONTSERRAT_18 0 +#define LV_FONT_MONTSERRAT_20 0 +#define LV_FONT_MONTSERRAT_22 0 +#define LV_FONT_MONTSERRAT_24 0 +#define LV_FONT_MONTSERRAT_26 0 +#define LV_FONT_MONTSERRAT_28 0 +#define LV_FONT_MONTSERRAT_30 0 +#define LV_FONT_MONTSERRAT_32 0 +#define LV_FONT_MONTSERRAT_34 0 +#define LV_FONT_MONTSERRAT_36 0 +#define LV_FONT_MONTSERRAT_38 0 +#define LV_FONT_MONTSERRAT_40 0 +#define LV_FONT_MONTSERRAT_42 0 +#define LV_FONT_MONTSERRAT_44 0 +#define LV_FONT_MONTSERRAT_46 0 +#define LV_FONT_MONTSERRAT_48 0 + +/* Demonstrate special features */ +#define LV_FONT_MONTSERRAT_12_SUBPX 0 +#define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ +#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, PErisan letters and all their forms*/ +#define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ + +/*Pixel perfect monospace font + * http://pelulamu.net/unscii/ */ +#define LV_FONT_UNSCII_8 0 + +/* Optionally declare your custom fonts here. + * You can use these fonts as default font too + * and they will be available globally. E.g. + * #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \ + * LV_FONT_DECLARE(my_font_2) + */ +#define LV_FONT_CUSTOM_DECLARE + +/* Enable it if you have fonts with a lot of characters. + * The limit depends on the font size, font face and bpp + * but with > 10,000 characters if you see issues probably you need to enable it.*/ +#define LV_FONT_FMT_TXT_LARGE 0 + +/* Enables/disables support for compressed fonts. If it's disabled, compressed + * glyphs cannot be processed by the library and won't be rendered. + */ +#define LV_USE_FONT_COMPRESSED 0 + +/* Enable subpixel rendering */ +#define LV_USE_FONT_SUBPX 1 +#if LV_USE_FONT_SUBPX +/* Set the pixel order of the display. + * Important only if "subpx fonts" are used. + * With "normal" font it doesn't matter. + */ +#define LV_FONT_SUBPX_BGR 0 +#endif + +/*Declare the type of the user data of fonts (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_font_user_data_t; + +/*================ + * THEME USAGE + *================*/ +/*Always enable at least on theme*/ + +/* No theme, you can apply your styles as you need + * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ + #define LV_USE_THEME_EMPTY 1 + +/*Simple to the create your theme based on it + * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ + #define LV_USE_THEME_TEMPLATE 1 + +/* A fast and impressive theme. + * Flags: + * LV_THEME_MATERIAL_FLAG_LIGHT: light theme + * LV_THEME_MATERIAL_FLAG_DARK: dark theme + * LV_THEME_MATERIAL_FLAG_NO_TRANSITION: disable transitions (state change animations) + * LV_THEME_MATERIAL_FLAG_NO_FOCUS: disable indication of focused state) + * */ + #define LV_USE_THEME_MATERIAL 1 + +/* Mono-color theme for monochrome displays. + * If LV_THEME_DEFAULT_COLOR_PRIMARY is LV_COLOR_BLACK the + * texts and borders will be black and the background will be + * white. Else the colors are inverted. + * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ + #define LV_USE_THEME_MONO 1 + +#define LV_THEME_DEFAULT_INCLUDE /*Include a header for the init. function*/ +#define LV_THEME_DEFAULT_INIT lv_theme_material_init +#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) +#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) +#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_DARK +#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 +#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 +#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 +#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 + +/*================= + * Text settings + *=================*/ + +/* Select a character encoding for strings. + * Your IDE or editor should have the same character encoding + * - LV_TXT_ENC_UTF8 + * - LV_TXT_ENC_ASCII + * */ +#define LV_TXT_ENC LV_TXT_ENC_UTF8 + + /*Can break (wrap) texts on these chars*/ +#define LV_TXT_BREAK_CHARS " ,.;:-_" + +/* If a word is at least this long, will break wherever "prettiest" + * To disable, set to a value <= 0 */ +#define LV_TXT_LINE_BREAK_LONG_LEN 0 + +/* Minimum number of characters in a long word to put on a line before a break. + * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */ +#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 + +/* Minimum number of characters in a long word to put on a line after a break. + * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */ +#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 + +/* The control character to use for signalling text recoloring. */ +#define LV_TXT_COLOR_CMD "#" + +/* Support bidirectional texts. + * Allows mixing Left-to-Right and Right-to-Left texts. + * The direction will be processed according to the Unicode Bidirectioanl Algorithm: + * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ +#define LV_USE_BIDI 0 +#if LV_USE_BIDI +/* Set the default direction. Supported values: + * `LV_BIDI_DIR_LTR` Left-to-Right + * `LV_BIDI_DIR_RTL` Right-to-Left + * `LV_BIDI_DIR_AUTO` detect texts base direction */ +#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO +#endif + +/* Enable Arabic/Persian processing + * In these languages characters should be replaced with + * an other form based on their position in the text */ +#define LV_USE_ARABIC_PERSIAN_CHARS 0 + +/*Change the built in (v)snprintf functions*/ +#define LV_SPRINTF_CUSTOM 0 +#if LV_SPRINTF_CUSTOM +#define LV_SPRINTF_INCLUDE +#define lv_snprintf snprintf +#define lv_vsnprintf vsnprintf +#else /*!LV_SPRINTF_CUSTOM*/ +#define LV_SPRINTF_DISABLE_FLOAT 1 +#endif /*LV_SPRINTF_CUSTOM*/ + +/*=================== + * LV_OBJ SETTINGS + *==================*/ + +#if LV_USE_USER_DATA +/*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ +typedef void * lv_obj_user_data_t; +/*Provide a function to free user data*/ +#define LV_USE_USER_DATA_FREE 0 +#if LV_USE_USER_DATA_FREE +# define LV_USER_DATA_FREE_INCLUDE "something.h" /*Header for user data free function*/ +/* Function prototype : void user_data_free(lv_obj_t * obj); */ +# define LV_USER_DATA_FREE (user_data_free) /*Invoking for user data free function*/ +#endif +#endif + +/*1: enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/ +#define LV_USE_OBJ_REALIGN 1 + +/* Enable to make the object clickable on a larger area. + * LV_EXT_CLICK_AREA_OFF or 0: Disable this feature + * LV_EXT_CLICK_AREA_TINY: The extra area can be adjusted horizontally and vertically (0..255 px) + * LV_EXT_CLICK_AREA_FULL: The extra area can be adjusted in all 4 directions (-32k..+32k px) + */ +#define LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY + +/*================== + * LV OBJ X USAGE + *================*/ +/* + * Documentation of the object types: https://docs.lvgl.com/#Object-types + */ + +/*Arc (dependencies: -)*/ +#define LV_USE_ARC 1 + +/*Bar (dependencies: -)*/ +#define LV_USE_BAR 1 + +/*Button (dependencies: lv_cont*/ +#define LV_USE_BTN 1 + +/*Button matrix (dependencies: -)*/ +#define LV_USE_BTNMATRIX 1 + +/*Calendar (dependencies: -)*/ +#define LV_USE_CALENDAR 1 +#if LV_USE_CALENDAR +# define LV_CALENDAR_WEEK_STARTS_MONDAY 0 +#endif + +/*Canvas (dependencies: lv_img)*/ +#define LV_USE_CANVAS 1 + +/*Check box (dependencies: lv_btn, lv_label)*/ +#define LV_USE_CHECKBOX 1 + +/*Chart (dependencies: -)*/ +#define LV_USE_CHART 1 +#if LV_USE_CHART +# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 256 +#endif + +/*Container (dependencies: -*/ +#define LV_USE_CONT 1 + +/*Color picker (dependencies: -*/ +#define LV_USE_CPICKER 1 + +/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/ +#define LV_USE_DROPDOWN 1 +#if LV_USE_DROPDOWN != 0 +/*Open and close default animation time [ms] (0: no animation)*/ +# define LV_DROPDOWN_DEF_ANIM_TIME 200 +#endif + +/*Gauge (dependencies:lv_bar, lv_linemeter)*/ +#define LV_USE_GAUGE 1 + +/*Image (dependencies: lv_label*/ +#define LV_USE_IMG 1 + +/*Image Button (dependencies: lv_btn*/ +#define LV_USE_IMGBTN 1 +#if LV_USE_IMGBTN +/*1: The imgbtn requires left, mid and right parts and the width can be set freely*/ +# define LV_IMGBTN_TILED 0 +#endif + +/*Keyboard (dependencies: lv_btnm)*/ +#define LV_USE_KEYBOARD 1 + +/*Label (dependencies: -*/ +#define LV_USE_LABEL 1 +#if LV_USE_LABEL != 0 +/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/ +# define LV_LABEL_DEF_SCROLL_SPEED 25 + +/* Waiting period at beginning/end of animation cycle */ +# define LV_LABEL_WAIT_CHAR_COUNT 3 + +/*Enable selecting text of the label */ +# define LV_LABEL_TEXT_SEL 0 + +/*Store extra some info in labels (12 bytes) to speed up drawing of very long texts*/ +# define LV_LABEL_LONG_TXT_HINT 0 +#endif + +/*LED (dependencies: -)*/ +#define LV_USE_LED 1 +#if LV_USE_LED +# define LV_LED_BRIGHT_MIN 120 /*Minimal brightness*/ +# define LV_LED_BRIGHT_MAX 255 /*Maximal brightness*/ +#endif + +/*Line (dependencies: -*/ +#define LV_USE_LINE 1 + +/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/ +#define LV_USE_LIST 1 +#if LV_USE_LIST != 0 +/*Default animation time of focusing to a list element [ms] (0: no animation) */ +# define LV_LIST_DEF_ANIM_TIME 100 +#endif + +/*Line meter (dependencies: *;)*/ +#define LV_USE_LINEMETER 1 +#if LV_USE_LINEMETER +/* Draw line more precisely at cost of performance. + * Useful if there are lot of lines any minor are visible + * 0: No extra precision + * 1: Some extra precision + * 2: Best precision + */ +# define LV_LINEMETER_PRECISE 0 +#endif + +/*Mask (dependencies: -)*/ +#define LV_USE_OBJMASK 1 + +/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ +#define LV_USE_MSGBOX 1 + +/*Page (dependencies: lv_cont)*/ +#define LV_USE_PAGE 1 +#if LV_USE_PAGE != 0 +/*Focus default animation time [ms] (0: no animation)*/ +# define LV_PAGE_DEF_ANIM_TIME 400 +#endif + +/*Preload (dependencies: lv_arc, lv_anim)*/ +#define LV_USE_SPINNER 1 +#if LV_USE_SPINNER != 0 +# define LV_SPINNER_DEF_ARC_LENGTH 60 /*[deg]*/ +# define LV_SPINNER_DEF_SPIN_TIME 1000 /*[ms]*/ +# define LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC +#endif + +/*Roller (dependencies: lv_ddlist)*/ +#define LV_USE_ROLLER 1 +#if LV_USE_ROLLER != 0 +/*Focus animation time [ms] (0: no animation)*/ +# define LV_ROLLER_DEF_ANIM_TIME 200 + +/*Number of extra "pages" when the roller is infinite*/ +# define LV_ROLLER_INF_PAGES 7 +#endif + +/*Slider (dependencies: lv_bar)*/ +#define LV_USE_SLIDER 1 + +/*Spinbox (dependencies: lv_ta)*/ +#define LV_USE_SPINBOX 1 + +/*Switch (dependencies: lv_slider)*/ +#define LV_USE_SWITCH 1 + +/*Text area (dependencies: lv_label, lv_page)*/ +#define LV_USE_TEXTAREA 1 +#if LV_USE_TEXTAREA != 0 +# define LV_TEXTAREA_DEF_CURSOR_BLINK_TIME 400 /*ms*/ +# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/ +#endif + +/*Table (dependencies: lv_label)*/ +#define LV_USE_TABLE 1 +#if LV_USE_TABLE +# define LV_TABLE_COL_MAX 12 +# define LV_TABLE_CELL_STYLE_CNT 4 +#endif + +/*Tab (dependencies: lv_page, lv_btnm)*/ +#define LV_USE_TABVIEW 1 +#if LV_USE_TABVIEW != 0 +/*Time of slide animation [ms] (0: no animation)*/ +# define LV_TABVIEW_DEF_ANIM_TIME 300 +#endif + +/*Tileview (dependencies: lv_page) */ +#define LV_USE_TILEVIEW 1 +#if LV_USE_TILEVIEW +/*Time of slide animation [ms] (0: no animation)*/ +# define LV_TILEVIEW_DEF_ANIM_TIME 300 +#endif + +/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ +#define LV_USE_WIN 1 + +#ifdef __cplusplus +} +#endif + +#endif /* LV_CONF_H */ +/** @} */ diff --git a/pkg/lvgl7/include/lvgl_riot.h b/pkg/lvgl7/include/lvgl_riot.h new file mode 100644 index 0000000000..66cc44a88d --- /dev/null +++ b/pkg/lvgl7/include/lvgl_riot.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2019 Inria + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup pkg_lvgl7 + * @{ + * + * @file + * @brief Definition for the LittlevGL engine initialization + * + * @author Alexandre Abadie + */ + +#ifndef LVGL_RIOT_H +#define LVGL_RIOT_H + +#include "screen_dev.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Initialize the lvgl display engine + * + * @param[in] screen_dev Pointer to the generic screen device + */ +void lvgl_init(screen_dev_t *screen_dev); + +/** + * @brief Run the lvgl task handler + * + * In order to run the lvgl internal task handler in an endless loop, this + * function must be called manually either from the main thread or from a + * custom thread. + * In case of CONFIG_LVGL_INACTIVITY_PERIOD_MS ms of inactivity, the loop stops + * the thread running the lvgl task handler until @ref lvgl_wakeup is called. + */ +void lvgl_run(void); + +/** + * @brief Wakeup lvgl when inactive + * + * This function unblocks the lvgl task handler thread and will indirectly + * trigger an activity. After calling this function, lvgl remains awake during + * the next LVGL_INACTIVITY_PERIOD_MS ms. + */ +void lvgl_wakeup(void); + +#ifdef __cplusplus +} +#endif + +#endif /* LVGL_RIOT_H */ diff --git a/pkg/lvgl7/include/lvgl_riot_conf.h b/pkg/lvgl7/include/lvgl_riot_conf.h new file mode 100644 index 0000000000..7596013003 --- /dev/null +++ b/pkg/lvgl7/include/lvgl_riot_conf.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 Inria + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup pkg_lvgl7 + * @{ + * + * @file + * @brief Definitions specific to RIOT for the LittlevGL engine + * + * @author Alexandre Abadie + */ + +#ifndef LVGL_RIOT_CONF_H +#define LVGL_RIOT_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */ +typedef int16_t lv_coord_t; + +#define LV_TICK_CUSTOM 1 +#if LV_TICK_CUSTOM == 1 +#define LV_TICK_CUSTOM_INCLUDE "ztimer.h" /*Header for the sys time function*/ +#define LV_TICK_CUSTOM_SYS_TIME_EXPR (ztimer_now(ZTIMER_MSEC)) /*Expression evaluating to current systime in ms*/ +#endif /*LV_TICK_CUSTOM*/ + +#ifdef __cplusplus +} +#endif + +#endif /* LVGL_RIOT_CONF_H */ From 0a33a08f21a5bf9eb999a46a3eccdd8a02e95575 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 4 Jun 2021 13:57:55 +0200 Subject: [PATCH 2/5] pkg/lvgl: bump to v8.2.0 Co-authored-by: Kaspar Schleiser Co-authored-by: Koen Zandberg --- pkg/lvgl/Kconfig | 132 +++- pkg/lvgl/Makefile | 74 +- pkg/lvgl/Makefile.dep | 20 +- pkg/lvgl/Makefile.include | 24 + pkg/lvgl/contrib/lvgl.c | 44 +- pkg/lvgl/include/lv_conf.h | 938 ++++++++++--------------- pkg/lvgl/include/lvgl_riot_conf.h | 26 +- tests/pkg_lvgl/app.config.sample | 5 - tests/pkg_lvgl_touch/app.config.sample | 5 - 9 files changed, 649 insertions(+), 619 deletions(-) delete mode 100644 tests/pkg_lvgl/app.config.sample delete mode 100644 tests/pkg_lvgl_touch/app.config.sample diff --git a/pkg/lvgl/Kconfig b/pkg/lvgl/Kconfig index 2474dbf0a6..281300a787 100644 --- a/pkg/lvgl/Kconfig +++ b/pkg/lvgl/Kconfig @@ -13,10 +13,11 @@ menuconfig PACKAGE_LVGL select MODULE_LVGL select MODULE_LVGL_CORE select MODULE_LVGL_DRAW + select MODULE_LVGL_DRAW_SW + select MODULE_LVGL_EXTRA select MODULE_LVGL_FONT select MODULE_LVGL_HAL select MODULE_LVGL_MISC - select MODULE_LVGL_THEMES select MODULE_LVGL_WIDGETS # lvgl is not compatible with non 32bit platforms @@ -49,6 +50,12 @@ config MODULE_LVGL_CORE config MODULE_LVGL_DRAW bool +config MODULE_LVGL_DRAW_SW + bool + +config MODULE_LVGL_EXTRA + bool + config MODULE_LVGL_FONT bool @@ -58,17 +65,132 @@ config MODULE_LVGL_HAL config MODULE_LVGL_MISC bool -config MODULE_LVGL_THEMES - bool - config MODULE_LVGL_WIDGETS bool +config MODULE_LVGL_WIDGET_ARC + bool "Arc widget" + +config MODULE_LVGL_WIDGET_BAR + bool "Bar widget" + +config MODULE_LVGL_WIDGET_BTN + bool "Button widget" + +config MODULE_LVGL_WIDGET_BTNMATRIX + bool "Button matrix widget" + +config MODULE_LVGL_WIDGET_CANVAS + bool "Canvas widget" + +config MODULE_LVGL_WIDGET_CHECKBOX + bool "Checkbox widget" + +config MODULE_LVGL_WIDGET_DROPDOWN + bool "Dropdown widget" + select MODULE_LVGL_WIDGET_LABEL + +config MODULE_LVGL_WIDGET_IMG + bool "Image widget" + select MODULE_LVGL_WIDGET_LABEL + +config MODULE_LVGL_WIDGET_LABEL + bool "Label widget" + +config MODULE_LVGL_WIDGET_LINE + bool "Line widget" + +config MODULE_LVGL_WIDGET_ROLLER + bool "Roller widget" + select MODULE_LVGL_WIDGET_LABEL + +config MODULE_LVGL_WIDGET_SLIDER + bool "Slider widget" + select MODULE_LVGL_WIDGET_BAR + +config MODULE_LVGL_WIDGET_SWITCH + bool "Switch widget" + +config MODULE_LVGL_WIDGET_TEXTAREA + bool "Textarea widget" + select MODULE_LVGL_WIDGET_LABEL + +config MODULE_LVGL_WIDGET_TABLE + bool "Table widget" + +config MODULE_LVGL_EXTRA_LAYOUT_FLEX + bool "Flex extra layout" + +config MODULE_LVGL_EXTRA_LAYOUT_GRID + bool "Grid extra layout" + +config MODULE_LVGL_EXTRA_THEME_BASIC + bool "Extra theme basic" + +config MODULE_LVGL_EXTRA_THEME_DEFAULT + bool "Extra theme default" + +config MODULE_LVGL_EXTRA_THEME_DEFAULT_DARK + bool "Extra theme default in dark mode" + +config MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW + bool "Extra theme default with button grow mode" + +config MODULE_LVGL_EXTRA_THEME_MONO + bool "Extra theme mono" + +config MODULE_LVGL_EXTRA_WIDGET_ANIMING + bool "Animing extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_CALENDAR + bool "Calendar extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_CHART + bool "Chart extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_COLORWHEEL + bool "Colorwheel extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_IMGBIN + bool "Imgbin extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_LED + bool "Led extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_LIST + bool "List extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_MENU + bool "Menu extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_METER + bool "Meter extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_MSGBOX + bool "Message box extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_SPINBOX + bool "Spinbox extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_SPINNER + bool "Spinner extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_TABVIEW + bool "Tabview extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_TILEVIEW + bool "Tileview extra widget" + +config MODULE_LVGL_EXTRA_WIDGET_WIN + bool "Window extra widget" + select MODULE_LVGL_WIDGET_BTN + select MODULE_LVGL_WIDGET_IMG + select MODULE_LVGL_WIDGET_LABEL + endif # TEST_KCONFIG menuconfig KCONFIG_USEPKG_LVGL bool "Configure LVGL" - depends on USEPKG_LVGL help Configure LVGL package via Kconfig. diff --git a/pkg/lvgl/Makefile b/pkg/lvgl/Makefile index bf657216d8..2c7bd5d0dd 100644 --- a/pkg/lvgl/Makefile +++ b/pkg/lvgl/Makefile @@ -1,25 +1,75 @@ PKG_NAME=lvgl PKG_URL=https://github.com/littlevgl/lvgl -PKG_VERSION=ec9de515b36641be565d7bace5863ab631ce3b69 # v7.11.0 +PKG_VERSION=0b5a1d4b23975b920ff841ea9cd038802f51711b # v8.2.0 PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk -LVGL_MODULES = \ - lvgl_core \ - lvgl_draw \ - lvgl_font \ - lvgl_hal \ - lvgl_misc \ - lvgl_themes \ - lvgl_widgets \ +CFLAGS += -Wno-empty-body + +LVGL_DEFAULT_MODULES = \ + lvgl_core \ + lvgl_draw \ + lvgl_draw_sw \ + lvgl_extra \ + lvgl_font \ + lvgl_hal \ + lvgl_misc \ + lvgl_widgets \ # -CFLAGS += -Wno-cast-align +LVGL_EXTRA_LAYOUTS_MODULES = \ + lvgl_extra_layout_flex \ + lvgl_extra_layout_grid \ + # + +LVGL_EXTRA_THEMES_MODULES = \ + lvgl_extra_theme_basic \ + lvgl_extra_theme_default \ + lvgl_extra_theme_mono \ + # + +LVGL_EXTRA_WIDGETS_MODULES = \ + lvgl_extra_widget_animimg \ + lvgl_extra_widget_calendar \ + lvgl_extra_widget_chart \ + lvgl_extra_widget_colorwheel \ + lvgl_extra_widget_imgbtn \ + lvgl_extra_widget_keyboard \ + lvgl_extra_widget_led \ + lvgl_extra_widget_list \ + lvgl_extra_widget_menu \ + lvgl_extra_widget_meter \ + lvgl_extra_widget_msgbox \ + lvgl_extra_widget_span \ + lvgl_extra_widget_spinbox \ + lvgl_extra_widget_spinner \ + lvgl_extra_widget_tabview \ + lvgl_extra_widget_tileview \ + lvgl_extra_widget_win \ + # + +LVGL_MODULES = $(LVGL_DEFAULT_MODULES) $(LVGL_EXTRA_LAYOUTS_MODULES) $(LVGL_EXTRA_THEMES_MODULES) $(LVGL_EXTRA_WIDGETS_MODULES) +LVGL_MODULES_USED = $(filter $(LVGL_MODULES),$(USEMODULE)) .PHONY: lvgl_% -all: $(LVGL_MODULES) +all: $(LVGL_MODULES_USED) + +lvgl_extra_layout_%: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/extra/layouts/$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ + +lvgl_extra_theme_%: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/extra/themes/$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ + +lvgl_extra_widget_%: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/extra/widgets/$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ + +lvgl_extra: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/extra -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ + +lvgl_draw_sw: + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/draw/sw -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ lvgl_%: - $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/lv_$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ + $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/$* -f $(CURDIR)/Makefile.lvgl_module MODULE=$@ diff --git a/pkg/lvgl/Makefile.dep b/pkg/lvgl/Makefile.dep index d96d1de6d1..5c5a30c50c 100644 --- a/pkg/lvgl/Makefile.dep +++ b/pkg/lvgl/Makefile.dep @@ -1,12 +1,30 @@ USEMODULE += lvgl USEMODULE += lvgl_core USEMODULE += lvgl_draw +USEMODULE += lvgl_draw_sw +USEMODULE += lvgl_extra USEMODULE += lvgl_font USEMODULE += lvgl_hal USEMODULE += lvgl_misc -USEMODULE += lvgl_themes USEMODULE += lvgl_widgets +ifneq (,$(filter lvgl_extra_widget_spinner,$(USEMODULE))) + USEMODULE += lvgl_widget_arc +endif + +ifneq (,$(filter lvgl_extra_widget_win,$(USEMODULE))) + USEMODULE += lvgl_widget_btn + USEMODULE += lvgl_widget_img +endif + +ifneq (,$(filter lvgl_widget_textarea lvgl_widget_roller lvgl_widget_img lvgl_widget_dropdown lvgl_extra_widget_win,$(USEMODULE))) + USEMODULE += lvgl_widget_label +endif + +ifneq (,$(filter lvgl_widget_slider,$(USEMODULE))) + USEMODULE += lvgl_widget_bar +endif + ifneq (,$(filter lvgl_contrib,$(USEMODULE))) USEMODULE += disp_dev USEMODULE += core_thread_flags diff --git a/pkg/lvgl/Makefile.include b/pkg/lvgl/Makefile.include index 22d027aab3..f900ae4af1 100644 --- a/pkg/lvgl/Makefile.include +++ b/pkg/lvgl/Makefile.include @@ -4,6 +4,9 @@ INCLUDES += -I$(PKGDIRBASE) # Don't use relative includes in lvgl CFLAGS += -DLV_CONF_INCLUDE_SIMPLE +# fix "cast increases required alignment of target type" raised from a header file +CFLAGS += -Wno-cast-align + ifneq (,$(filter lvgl_contrib,$(USEMODULE))) DIRS += $(RIOTBASE)/pkg/lvgl/contrib endif @@ -16,3 +19,24 @@ PSEUDOMODULES += lvgl # touch capabilities are available via a pseudomodule PSEUDOMODULES += lvgl_contrib_touch + +# extra modes for the default theme +PSEUDOMODULES += lvgl_extra_theme_default_dark +PSEUDOMODULES += lvgl_extra_theme_default_grow + +# extra lvgl widgets defined as pseudomodules +PSEUDOMODULES += lvgl_widget_arc +PSEUDOMODULES += lvgl_widget_bar +PSEUDOMODULES += lvgl_widget_btn +PSEUDOMODULES += lvgl_widget_btnmatrix +PSEUDOMODULES += lvgl_widget_canvas +PSEUDOMODULES += lvgl_widget_checkbox +PSEUDOMODULES += lvgl_widget_dropdown +PSEUDOMODULES += lvgl_widget_img +PSEUDOMODULES += lvgl_widget_label +PSEUDOMODULES += lvgl_widget_line +PSEUDOMODULES += lvgl_widget_roller +PSEUDOMODULES += lvgl_widget_slider +PSEUDOMODULES += lvgl_widget_switch +PSEUDOMODULES += lvgl_widget_textarea +PSEUDOMODULES += lvgl_widget_table diff --git a/pkg/lvgl/contrib/lvgl.c b/pkg/lvgl/contrib/lvgl.c index 402bae1043..4935be8632 100644 --- a/pkg/lvgl/contrib/lvgl.c +++ b/pkg/lvgl/contrib/lvgl.c @@ -32,27 +32,31 @@ #include "screen_dev.h" #ifndef LVGL_COLOR_BUF_SIZE -#define LVGL_COLOR_BUF_SIZE (LV_HOR_RES_MAX * 5) +#define LVGL_COLOR_BUF_SIZE (LV_HOR_RES_MAX * 10) #endif #ifndef CONFIG_LVGL_INACTIVITY_PERIOD_MS -#define CONFIG_LVGL_INACTIVITY_PERIOD_MS (5 * MS_PER_SEC) /* 5s */ +#define CONFIG_LVGL_INACTIVITY_PERIOD_MS (5 * MS_PER_SEC) /* 5s */ #endif #ifndef CONFIG_LVGL_TASK_HANDLER_DELAY_MS -#define CONFIG_LVGL_TASK_HANDLER_DELAY_MS (5) /* 5ms */ +#define CONFIG_LVGL_TASK_HANDLER_DELAY_MS (5) /* 5ms */ #endif #ifndef LVGL_THREAD_FLAG -#define LVGL_THREAD_FLAG (1 << 7) +#define LVGL_THREAD_FLAG (1 << 7) #endif static kernel_pid_t _task_thread_pid; -static lv_disp_buf_t disp_buf; -static lv_color_t buf[LVGL_COLOR_BUF_SIZE]; +static lv_disp_draw_buf_t disp_buf; +static lv_color_t draw_buf[LVGL_COLOR_BUF_SIZE]; static screen_dev_t *_screen_dev = NULL; +static lv_disp_drv_t disp_drv; +#if IS_USED(MODULE_TOUCH_DEV) +static lv_indev_drv_t indev_drv; +#endif static void _disp_map(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_p) { @@ -60,6 +64,10 @@ static void _disp_map(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *col return; } + if (!area) { + return; + } + disp_dev_map(_screen_dev->display, area->x1, area->x2, area->y1, area->y2, (const uint16_t *)color_p); @@ -70,10 +78,14 @@ static void _disp_map(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *col #if IS_USED(MODULE_TOUCH_DEV) /* adapted from https://github.com/lvgl/lvgl/tree/v6.1.2#add-littlevgl-to-your-project */ -static bool _touch_read(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) +static void _touch_read(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) { if (!_screen_dev->touch) { - return false; + return; + } + + if (!data) { + return; } (void)indev_driver; @@ -94,7 +106,7 @@ static bool _touch_read(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) data->point.x = last_x; data->point.y = last_y; - return false; + return; } #endif @@ -104,21 +116,20 @@ void lvgl_init(screen_dev_t *screen_dev) _screen_dev = screen_dev; assert(screen_dev->display); - lv_disp_drv_t disp_drv; + lv_disp_draw_buf_init(&disp_buf, draw_buf, NULL, LVGL_COLOR_BUF_SIZE); + lv_disp_drv_init(&disp_drv); + disp_drv.draw_buf = &disp_buf; + disp_drv.flush_cb = _disp_map; /* Configure horizontal and vertical resolutions based on the underlying display device parameters */ disp_drv.hor_res = disp_dev_width(screen_dev->display); disp_drv.ver_res = disp_dev_height(screen_dev->display); - disp_drv.flush_cb = _disp_map; - disp_drv.buffer = &disp_buf; lv_disp_drv_register(&disp_drv); - lv_disp_buf_init(&disp_buf, buf, NULL, LVGL_COLOR_BUF_SIZE); #if IS_USED(MODULE_TOUCH_DEV) if (screen_dev->touch) { - lv_indev_drv_t indev_drv; lv_indev_drv_init(&indev_drv); indev_drv.type = LV_INDEV_TYPE_POINTER; indev_drv.read_cb = _touch_read; @@ -131,18 +142,15 @@ void lvgl_run(void) { _task_thread_pid = thread_getpid(); - lv_task_handler(); - while (1) { /* Normal operation (no sleep) in < CONFIG_LVGL_INACTIVITY_PERIOD_MS msec inactivity */ if (lv_disp_get_inactive_time(NULL) < CONFIG_LVGL_INACTIVITY_PERIOD_MS) { - lv_task_handler(); + lv_timer_handler(); } else { /* Block after LVGL_ACTIVITY_PERIOD msec inactivity */ thread_flags_wait_one(LVGL_THREAD_FLAG); - /* trigger an activity so the task handler is called on the next loop */ lv_disp_trig_activity(NULL); } diff --git a/pkg/lvgl/include/lv_conf.h b/pkg/lvgl/include/lv_conf.h index 3756e7ed00..f635ec6205 100644 --- a/pkg/lvgl/include/lv_conf.h +++ b/pkg/lvgl/include/lv_conf.h @@ -26,18 +26,9 @@ extern "C" { #include "lvgl_riot_conf.h" /*==================== - Graphical settings + COLOR SETTINGS *====================*/ -/* Maximal horizontal and vertical resolution to support by the library.*/ -#ifndef LV_HOR_RES_MAX -#define LV_HOR_RES_MAX (320) -#endif - -#ifndef LV_VER_RES_MAX -#define LV_VER_RES_MAX (240) -#endif - /* Color depth: * - 1: 1 byte per pixel * - 8: RGB233 @@ -58,688 +49,493 @@ extern "C" { #endif #endif -/* 1: Enable screen transparency. - * Useful for OSD or other overlapping GUIs. - * Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`*/ +/*Enable more complex drawing routines to manage screens transparency. + *Can be used if the UI is above another layer, e.g. an OSD menu or video player. + *Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value*/ #define LV_COLOR_SCREEN_TRANSP 0 -/*Images pixels with this color will not be drawn (with chroma keying)*/ -#define LV_COLOR_TRANSP LV_COLOR_LIME /*LV_COLOR_LIME: pure green*/ - -/* Enable anti-aliasing (lines, and radiuses will be smoothed) */ -#define LV_ANTIALIAS 1 - -/* Default display refresh period. - * Can be changed in the display driver (`lv_disp_drv_t`).*/ -#define LV_DISP_DEF_REFR_PERIOD 10 /*[ms]*/ - -/* Dot Per Inch: used to initialize default sizes. - * E.g. a button with width = LV_DPI / 2 -> half inch wide - * (Not so important, you can adjust it to modify default sizes and spaces)*/ -#define LV_DPI 100 /*[px]*/ - -/* The the real width of the display changes some default values: - * default object sizes, layout of examples, etc. - * According to the width of the display (hor. res. / dpi) - * the displays fall in 4 categories. - * The 4th is extra large which has no upper limit so not listed here - * The upper limit of the categories are set below in 0.1 inch unit. - */ -#define LV_DISP_SMALL_LIMIT 30 -#define LV_DISP_MEDIUM_LIMIT 50 -#define LV_DISP_LARGE_LIMIT 70 +/**Images pixels with this color will not be drawn if they are chroma keyed)*/ +#define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/ /*========================= - Memory manager settings + MEMORY SETTINGS *=========================*/ -/* LittelvGL's internal memory manager's settings. - * The graphical objects and other related data are stored here. */ - -/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */ +/*1: use custom malloc/free, 0: use the built-in `lv_mem_alloc()` and `lv_mem_free()`*/ #define LV_MEM_CUSTOM 0 #if LV_MEM_CUSTOM == 0 -/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ -#ifndef LV_MEM_SIZE -#define LV_MEM_SIZE (5U * 1024U) +/*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/ +#if IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW) +# define LV_MEM_SIZE (6U * 1024U) /*[bytes]*/ +#else +# define LV_MEM_SIZE (5U * 1024U) /*[bytes]*/ #endif -/* Compiler prefix for a big array declaration */ -#define LV_MEM_ATTR - -/* Set an address for the memory pool instead of allocating it as an array. - * Can be in external SRAM too. */ -#define LV_MEM_ADR 0 - -/* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */ -#define LV_MEM_AUTO_DEFRAG 1 +/*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/ +# define LV_MEM_ADR 0 /*0: unused*/ #else /*LV_MEM_CUSTOM*/ -#define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ -#define LV_MEM_CUSTOM_ALLOC malloc /*Wrapper to malloc*/ -#define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/ +# define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ +# define LV_MEM_CUSTOM_ALLOC malloc +# define LV_MEM_CUSTOM_FREE free #endif /*LV_MEM_CUSTOM*/ -/* Use the standard memcpy and memset instead of LVGL's own functions. - * The standard functions might or might not be faster depending on their implementation. */ -#define LV_MEMCPY_MEMSET_STD 0 +/** Number of the intermediate memory buffer used during rendering and other internal processing mechanisms. + *You will see an error log message if there wasn't enough buffers. */ +#define LV_MEM_BUF_MAX_NUM 16 -/* Garbage Collector settings - * Used if lvgl is binded to higher level language and the memory is managed by that language */ -#define LV_ENABLE_GC 0 -#if LV_ENABLE_GC != 0 -#define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ -#define LV_MEM_CUSTOM_REALLOC your_realloc /*Wrapper to realloc*/ -#define LV_MEM_CUSTOM_GET_SIZE your_mem_get_size /*Wrapper to lv_mem_get_size*/ -#endif /* LV_ENABLE_GC */ +/*Use the standard `memcpy` and `memset` instead of LVGL's own functions. (Might or might not be faster).*/ +#define LV_MEMCPY_MEMSET_STD 1 + +/*==================== + HAL SETTINGS + *====================*/ + +/*Default display refresh period. LVG will redraw changed ares with this period time*/ +#define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ + +/*Input device read period in milliseconds*/ +#define LV_INDEV_DEF_READ_PERIOD 30 /*[ms]*/ + +/** Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings. + *(Not so important, you can adjust it to modify default sizes and spaces)*/ +#define LV_DPI_DEF 130 /*[px/inch]*/ /*======================= - Input device settings + * FEATURE CONFIGURATION *=======================*/ -/* Input device default settings. - * Can be changed in the Input device driver (`lv_indev_drv_t`)*/ +/*------------- + * Drawing + *-----------*/ -/* Input device read period in milliseconds */ -#define LV_INDEV_DEF_READ_PERIOD 30 +/** Enable complex draw engine. + *Required to draw shadow, gradient, rounded corners, circles, arc, skew lines, image transformations or any masks*/ +#define LV_DRAW_COMPLEX 1 +#if LV_DRAW_COMPLEX != 0 -/* Drag threshold in pixels */ -#define LV_INDEV_DEF_DRAG_LIMIT 10 - -/* Drag throw slow-down in [%]. Greater value -> faster slow-down */ -#define LV_INDEV_DEF_DRAG_THROW 20 - -/* Long press time in milliseconds. - * Time to send `LV_EVENT_LONG_PRESSSED`) */ -#define LV_INDEV_DEF_LONG_PRESS_TIME 400 - -/* Repeated trigger period in long press [ms] - * Time between `LV_EVENT_LONG_PRESSED_REPEAT */ -#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 - -/* Gesture threshold in pixels */ -#define LV_INDEV_DEF_GESTURE_LIMIT 50 - -/* Gesture min velocity at release before swipe (pixels)*/ -#define LV_INDEV_DEF_GESTURE_MIN_VELOCITY 3 - -/*================== - * Feature usage - *==================*/ - -/*1: Enable the Animations */ -#define LV_USE_ANIMATION 1 -#if LV_USE_ANIMATION - -/*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/ -typedef void * lv_anim_user_data_t; -#endif - -/* 1: Enable shadow drawing*/ -#define LV_USE_SHADOW 0 -#if LV_USE_SHADOW -/* Allow buffering some shadow calculation - * LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, - * where shadow size is `shadow_width + radius` - * Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/ +/** Allow buffering some shadow calculation. + *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius` + *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/ #define LV_SHADOW_CACHE_SIZE 0 -#endif +#endif /*LV_DRAW_COMPLEX*/ -/*1: enable outline drawing on rectangles*/ -#define LV_USE_OUTLINE 0 +/*Default image cache size. Image caching keeps the images opened. + *If only the built-in image formats are used there is no real advantage of caching. (I.e. if no new image decoder is added) + *With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images. + *However the opened images might consume additional RAM. + *0: to disable caching*/ +#define LV_IMG_CACHE_DEF_SIZE 0 -/*1: enable pattern drawing on rectangles*/ -#define LV_USE_PATTERN 0 +/** Number of stops allowed per gradient. Increase this to allow more stops. + *This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/ +#define LV_GRADIENT_MAX_STOPS 2 -/*1: enable value string drawing on rectangles*/ -#define LV_USE_VALUE_STR 0 +/**Default gradient buffer size. + *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again. + *LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes. + *If the cache is too small the map will be allocated only while it's required for the drawing. + *0 mean no caching.*/ +#define LV_GRAD_CACHE_DEF_SIZE 0 -/* 1: Use other blend modes than normal (`LV_BLEND_MODE_...`)*/ -#define LV_USE_BLEND_MODES 0 +/** Maximum buffer size to allocate for rotation. Only used if software rotation is enabled in the display driver.*/ +#define LV_DISP_ROT_MAX_BUF (10*1024) +/*------------- + * GPU + *-----------*/ -/* 1: Use the `opa_scale` style property to set the opacity of an object and its children at once*/ -#define LV_USE_OPA_SCALE 0 - -/* 1: Use image zoom and rotation*/ -#define LV_USE_IMG_TRANSFORM 0 - -/* 1: Enable object groups (for keyboard/encoder navigation) */ -#define LV_USE_GROUP 1 -#if LV_USE_GROUP -typedef void * lv_group_user_data_t; -#endif /*LV_USE_GROUP*/ - -/* 1: Enable GPU interface*/ -#define LV_USE_GPU 0 /*Only enables `gpu_fill_cb` and `gpu_blend_cb` in the disp. drv- */ +/*Use STM32's DMA2D (aka Chrom Art) GPU*/ #define LV_USE_GPU_STM32_DMA2D 0 -/*If enabling LV_USE_GPU_STM32_DMA2D, LV_GPU_DMA2D_CMSIS_INCLUDE must be defined to include path of CMSIS header of target processor -e.g. "stm32f769xx.h" or "stm32f429xx.h" */ +#if LV_USE_GPU_STM32_DMA2D +/*Must be defined to include path of CMSIS header of target processor +e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ #define LV_GPU_DMA2D_CMSIS_INCLUDE - -/* 1: Enable file system (might be required for images */ -#define LV_USE_FILESYSTEM 0 -#if LV_USE_FILESYSTEM -/*Declare the type of the user data of file system drivers (can be e.g. `void *`, `int`, `struct`)*/ -typedef void * lv_fs_drv_user_data_t; #endif -/*1: Add a `user_data` to drivers and objects*/ -#define LV_USE_USER_DATA 0 +/** Use NXP's PXP GPU iMX RTxxx platforms*/ +#define LV_USE_GPU_NXP_PXP 0 +#if LV_USE_GPU_NXP_PXP +/*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c) + * and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS + * has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected. + *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init() + */ +#define LV_USE_GPU_NXP_PXP_AUTO_INIT 0 +#endif + +/** Use NXP's VG-Lite GPU iMX RTxxx platforms*/ +#define LV_USE_GPU_NXP_VG_LITE 0 + +/*------------- + * Logging + *-----------*/ + +/*Enable the log module*/ +#define LV_USE_LOG 0 +#if LV_USE_LOG + +/*How important log should be added: + *LV_LOG_LEVEL_TRACE A lot of logs to give detailed information + *LV_LOG_LEVEL_INFO Log important events + *LV_LOG_LEVEL_WARN Log if something unwanted happened but didn't cause a problem + *LV_LOG_LEVEL_ERROR Only critical issue, when the system may fail + *LV_LOG_LEVEL_USER Only logs added by the user + *LV_LOG_LEVEL_NONE Do not log anything*/ +# define LV_LOG_LEVEL LV_LOG_LEVEL_WARN + +/*1: Print the log with 'printf'; + *0: User need to register a callback with `lv_log_register_print_cb()`*/ +# define LV_LOG_PRINTF 0 + +/*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/ +# define LV_LOG_TRACE_MEM 1 +# define LV_LOG_TRACE_TIMER 1 +# define LV_LOG_TRACE_INDEV 1 +# define LV_LOG_TRACE_DISP_REFR 1 +# define LV_LOG_TRACE_EVENT 1 +# define LV_LOG_TRACE_OBJ_CREATE 1 +# define LV_LOG_TRACE_LAYOUT 1 +# define LV_LOG_TRACE_ANIM 1 + +#endif /*LV_USE_LOG*/ + +/*------------- + * Asserts + *-----------*/ + +/*Enable asserts if an operation is failed or an invalid data is found. + *If LV_USE_LOG is enabled an error message will be printed on failure*/ +#define LV_USE_ASSERT_NULL 0 /**< Check if the parameter is NULL. (Very fast, recommended)*/ +#define LV_USE_ASSERT_MALLOC 0 /**< Checks is the memory is successfully allocated or no. (Very fast, recommended)*/ +#define LV_USE_ASSERT_STYLE 0 /**< Check if the styles are properly initialized. (Very fast, recommended)*/ +#define LV_USE_ASSERT_MEM_INTEGRITY 0 /**< Check the integrity of `lv_mem` after critical operations. (Slow)*/ +#define LV_USE_ASSERT_OBJ 0 /**< Check the object's type and existence (e.g. not deleted). (Slow)*/ + +/** Add a custom handler when assert happens e.g. to restart the MCU*/ +#define LV_ASSERT_HANDLER_INCLUDE +#define LV_ASSERT_HANDLER while(1); /**< Halt by default*/ + +/*------------- + * Others + *-----------*/ /*1: Show CPU usage and FPS count in the right bottom corner*/ #define LV_USE_PERF_MONITOR 0 -/*1: Use the functions and types from the older API if possible */ -#define LV_USE_API_EXTENSION_V6 1 -#define LV_USE_API_EXTENSION_V7 1 +/** 1: Show the used memory and the memory fragmentation in the left bottom corner + * Requires LV_MEM_CUSTOM = 0*/ +#define LV_USE_MEM_MONITOR 0 -/*======================== - * Image decoder and cache - *========================*/ +/** 1: Draw random colored rectangles over the redrawn areas*/ +#define LV_USE_REFR_DEBUG 0 -/* 1: Enable indexed (palette) images */ -#define LV_IMG_CF_INDEXED 1 +/** Change the built in (v)snprintf functions*/ +#define LV_SPRINTF_CUSTOM 0 +#if LV_SPRINTF_CUSTOM +# define LV_SPRINTF_INCLUDE +# define lv_snprintf snprintf +# define lv_vsnprintf vsnprintf +#else /*LV_SPRINTF_CUSTOM*/ +# define LV_SPRINTF_USE_FLOAT 0 /**< Don't use float with sprintf */ +#endif /*LV_SPRINTF_CUSTOM*/ -/* 1: Enable alpha indexed images */ -#define LV_IMG_CF_ALPHA 1 +#define LV_USE_USER_DATA 1 -/* Default image cache size. Image caching keeps the images opened. - * If only the built-in image formats are used there is no real advantage of caching. - * (I.e. no new image decoder is added) - * With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images. - * However the opened images might consume additional RAM. - * LV_IMG_CACHE_DEF_SIZE must be >= 1 */ -#define LV_IMG_CACHE_DEF_SIZE 1 - -/*Declare the type of the user data of image decoder (can be e.g. `void *`, `int`, `struct`)*/ -typedef void * lv_img_decoder_user_data_t; +/*Garbage Collector settings + *Used if lvgl is binded to higher level language and the memory is managed by that language*/ +#define LV_ENABLE_GC 0 +#if LV_ENABLE_GC != 0 +# define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ +#endif /*LV_ENABLE_GC*/ /*===================== - * Compiler settings + * COMPILER SETTINGS *====================*/ -/* For big endian systems set to 1 */ +/*For big endian systems set to 1*/ #define LV_BIG_ENDIAN_SYSTEM 0 -/* Define a custom attribute to `lv_tick_inc` function */ +/*Define a custom attribute to `lv_tick_inc` function*/ #define LV_ATTRIBUTE_TICK_INC -/* Define a custom attribute to `lv_task_handler` function */ -#define LV_ATTRIBUTE_TASK_HANDLER +/** Define a custom attribute to `lv_timer_handler` function*/ +#define LV_ATTRIBUTE_TIMER_HANDLER -/* Define a custom attribute to `lv_disp_flush_ready` function */ +/*Define a custom attribute to `lv_disp_flush_ready` function*/ #define LV_ATTRIBUTE_FLUSH_READY -/* Required alignment size for buffers */ -#define LV_ATTRIBUTE_MEM_ALIGN_SIZE +/*Required alignment size for buffers*/ +#define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 -/* With size optimization (-Os) the compiler might not align data to - * 4 or 8 byte boundary. This alignment will be explicitly applied where needed. - * E.g. __attribute__((aligned(4))) */ -#define LV_ATTRIBUTE_MEM_ALIGN - -/* Attribute to mark large constant arrays for example - * font's bitmaps */ +/*Attribute to mark large constant arrays for example font's bitmaps*/ #define LV_ATTRIBUTE_LARGE_CONST -/* Prefix performance critical functions to place them into a faster memory (e.g RAM) - * Uses 15-20 kB extra memory */ +/** Compiler prefix for a big array declaration in RAM*/ +#define LV_ATTRIBUTE_LARGE_RAM_ARRAY + +/*Place performance critical functions into a faster memory (e.g RAM)*/ #define LV_ATTRIBUTE_FAST_MEM -/* Export integer constant to binding. - * This macro is used with constants in the form of LV_ that - * should also appear on lvgl binding API such as Micropython - * - * The default value just prevents a GCC warning. - */ -#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning - -/* Prefix variables that are used in GPU accelerated operations, often these need to be - * placed in RAM sections that are DMA accessible */ +/*Prefix variables that are used in GPU accelerated operations, often these need to be placed in RAM sections that are DMA accessible*/ #define LV_ATTRIBUTE_DMA -/*=================== - * HAL settings - *==================*/ +/*Export integer constant to binding. This macro is used with constants in the form of LV_ that + *should also appear on LVGL binding API such as Micropython.*/ +#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ -typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/ -typedef void * lv_indev_drv_user_data_t; /*Type of user data in the input device driver*/ - -/*================ - * Log settings - *===============*/ - -/*1: Enable the log module*/ -#define LV_USE_LOG 0 -#if LV_USE_LOG -/* How important log should be added: - * LV_LOG_LEVEL_TRACE A lot of logs to give detailed information - * LV_LOG_LEVEL_INFO Log important events - * LV_LOG_LEVEL_WARN Log if something unwanted happened but didn't cause a problem - * LV_LOG_LEVEL_ERROR Only critical issue, when the system may fail - * LV_LOG_LEVEL_NONE Do not log anything - */ -#define LV_LOG_LEVEL LV_LOG_LEVEL_WARN - -/* 1: Print the log with 'printf'; - * 0: user need to register a callback with `lv_log_register_print_cb`*/ -#define LV_LOG_PRINTF 0 -#endif /*LV_USE_LOG*/ - -/*================= - * Debug settings - *================*/ - -/* If Debug is enabled LittelvGL validates the parameters of the functions. - * If an invalid parameter is found an error log message is printed and - * the MCU halts at the error. (`LV_USE_LOG` should be enabled) - * If you are debugging the MCU you can pause - * the debugger to see exactly where the issue is. - * - * The behavior of asserts can be overwritten by redefining them here. - * E.g. #define LV_ASSERT_MEM(p) - */ -#define LV_USE_DEBUG 0 -#if LV_USE_DEBUG - -/*Check if the parameter is NULL. (Quite fast) */ -#define LV_USE_ASSERT_NULL 1 - -/*Checks is the memory is successfully allocated or no. (Quite fast)*/ -#define LV_USE_ASSERT_MEM 1 - -/*Check the integrity of `lv_mem` after critical operations. (Slow)*/ -#define LV_USE_ASSERT_MEM_INTEGRITY 0 - -/* Check the strings. - * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow) - * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */ -#define LV_USE_ASSERT_STR 0 - -/* Check NULL, the object's type and existence (e.g. not deleted). (Quite slow) - * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */ -#define LV_USE_ASSERT_OBJ 0 - -/*Check if the styles are properly initialized. (Fast)*/ -#define LV_USE_ASSERT_STYLE 1 - -#endif /*LV_USE_DEBUG*/ +/** Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t*/ +#define LV_USE_LARGE_COORD 0 /*================== - * FONT USAGE + * FONT USAGE *===================*/ -/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. - * The symbols are available via `LV_SYMBOL_...` defines - * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html - * To create a new font go to: https://lvgl.com/ttf-font-to-c-array +/** @name Montserrat fonts with ASCII range and some symbols using bpp = 4 + *https://fonts.google.com/specimen/Montserrat + * @{ */ +#define LV_FONT_MONTSERRAT_8 0 /**< Montserrat font size 8 */ +#define LV_FONT_MONTSERRAT_10 0 /**< Montserrat font size 10 */ +#define LV_FONT_MONTSERRAT_12 1 /**< Montserrat font size 12 */ +#define LV_FONT_MONTSERRAT_14 0 /**< Montserrat font size 14 */ +#define LV_FONT_MONTSERRAT_16 0 /**< Montserrat font size 16 */ +#define LV_FONT_MONTSERRAT_18 0 /**< Montserrat font size 18 */ +#define LV_FONT_MONTSERRAT_20 0 /**< Montserrat font size 20 */ +#define LV_FONT_MONTSERRAT_22 0 /**< Montserrat font size 22 */ +#define LV_FONT_MONTSERRAT_24 0 /**< Montserrat font size 24 */ +#define LV_FONT_MONTSERRAT_26 0 /**< Montserrat font size 26 */ +#define LV_FONT_MONTSERRAT_28 0 /**< Montserrat font size 28 */ +#define LV_FONT_MONTSERRAT_30 0 /**< Montserrat font size 30 */ +#define LV_FONT_MONTSERRAT_32 0 /**< Montserrat font size 32 */ +#define LV_FONT_MONTSERRAT_34 0 /**< Montserrat font size 34 */ +#define LV_FONT_MONTSERRAT_36 0 /**< Montserrat font size 36 */ +#define LV_FONT_MONTSERRAT_38 0 /**< Montserrat font size 38 */ +#define LV_FONT_MONTSERRAT_40 0 /**< Montserrat font size 40 */ +#define LV_FONT_MONTSERRAT_42 0 /**< Montserrat font size 42 */ +#define LV_FONT_MONTSERRAT_44 0 /**< Montserrat font size 44 */ +#define LV_FONT_MONTSERRAT_46 0 /**< Montserrat font size 46 */ +#define LV_FONT_MONTSERRAT_48 0 /**< Montserrat font size 48 */ +/** @} */ -/* Montserrat fonts with bpp = 4 - * https://fonts.google.com/specimen/Montserrat */ -#define LV_FONT_MONTSERRAT_12 1 -#define LV_FONT_MONTSERRAT_14 0 -#define LV_FONT_MONTSERRAT_16 0 -#define LV_FONT_MONTSERRAT_18 0 -#define LV_FONT_MONTSERRAT_20 0 -#define LV_FONT_MONTSERRAT_22 0 -#define LV_FONT_MONTSERRAT_24 0 -#define LV_FONT_MONTSERRAT_26 0 -#define LV_FONT_MONTSERRAT_28 0 -#define LV_FONT_MONTSERRAT_30 0 -#define LV_FONT_MONTSERRAT_32 0 -#define LV_FONT_MONTSERRAT_34 0 -#define LV_FONT_MONTSERRAT_36 0 -#define LV_FONT_MONTSERRAT_38 0 -#define LV_FONT_MONTSERRAT_40 0 -#define LV_FONT_MONTSERRAT_42 0 -#define LV_FONT_MONTSERRAT_44 0 -#define LV_FONT_MONTSERRAT_46 0 -#define LV_FONT_MONTSERRAT_48 0 - -/* Demonstrate special features */ +/*Demonstrate special features*/ #define LV_FONT_MONTSERRAT_12_SUBPX 0 #define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ -#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, PErisan letters and all their forms*/ +#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, Perisan letters and all their forms*/ #define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ -/*Pixel perfect monospace font - * http://pelulamu.net/unscii/ */ -#define LV_FONT_UNSCII_8 0 - -/* Optionally declare your custom fonts here. - * You can use these fonts as default font too - * and they will be available globally. E.g. - * #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \ - * LV_FONT_DECLARE(my_font_2) +/** @name Pixel perfect monospace fonts + * @{ */ +#define LV_FONT_UNSCII_8 0 +#define LV_FONT_UNSCII_16 0 +/** @} */ + +/*Optionally declare custom fonts here. + *You can use these fonts as default font too and they will be available globally. + *E.g. #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) LV_FONT_DECLARE(my_font_2)*/ #define LV_FONT_CUSTOM_DECLARE -/* Enable it if you have fonts with a lot of characters. - * The limit depends on the font size, font face and bpp - * but with > 10,000 characters if you see issues probably you need to enable it.*/ +/*Always set a default font*/ +#define LV_FONT_DEFAULT &lv_font_montserrat_12 + +/*Enable handling large font and/or fonts with a lot of characters. + *The limit depends on the font size, font face and bpp. + *Compiler error will be triggered if a font needs it.*/ #define LV_FONT_FMT_TXT_LARGE 0 -/* Enables/disables support for compressed fonts. If it's disabled, compressed - * glyphs cannot be processed by the library and won't be rendered. - */ -#define LV_USE_FONT_COMPRESSED 0 +/*Enables/disables support for compressed fonts.*/ +#define LV_USE_FONT_COMPRESSED 0 -/* Enable subpixel rendering */ -#define LV_USE_FONT_SUBPX 1 +/*Enable subpixel rendering*/ +#define LV_USE_FONT_SUBPX 0 #if LV_USE_FONT_SUBPX -/* Set the pixel order of the display. - * Important only if "subpx fonts" are used. - * With "normal" font it doesn't matter. - */ -#define LV_FONT_SUBPX_BGR 0 +/*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/ +#define LV_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/ #endif -/*Declare the type of the user data of fonts (can be e.g. `void *`, `int`, `struct`)*/ -typedef void * lv_font_user_data_t; - -/*================ - * THEME USAGE - *================*/ -/*Always enable at least on theme*/ - -/* No theme, you can apply your styles as you need - * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ - #define LV_USE_THEME_EMPTY 1 - -/*Simple to the create your theme based on it - * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ - #define LV_USE_THEME_TEMPLATE 1 - -/* A fast and impressive theme. - * Flags: - * LV_THEME_MATERIAL_FLAG_LIGHT: light theme - * LV_THEME_MATERIAL_FLAG_DARK: dark theme - * LV_THEME_MATERIAL_FLAG_NO_TRANSITION: disable transitions (state change animations) - * LV_THEME_MATERIAL_FLAG_NO_FOCUS: disable indication of focused state) - * */ - #define LV_USE_THEME_MATERIAL 1 - -/* Mono-color theme for monochrome displays. - * If LV_THEME_DEFAULT_COLOR_PRIMARY is LV_COLOR_BLACK the - * texts and borders will be black and the background will be - * white. Else the colors are inverted. - * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ - #define LV_USE_THEME_MONO 1 - -#define LV_THEME_DEFAULT_INCLUDE /*Include a header for the init. function*/ -#define LV_THEME_DEFAULT_INIT lv_theme_material_init -#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) -#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) -#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 -#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 -#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 - /*================= - * Text settings + * TEXT SETTINGS *=================*/ -/* Select a character encoding for strings. +/** + * Select a character encoding for strings. * Your IDE or editor should have the same character encoding * - LV_TXT_ENC_UTF8 * - LV_TXT_ENC_ASCII - * */ -#define LV_TXT_ENC LV_TXT_ENC_UTF8 + */ +#define LV_TXT_ENC LV_TXT_ENC_ASCII /*Can break (wrap) texts on these chars*/ #define LV_TXT_BREAK_CHARS " ,.;:-_" -/* If a word is at least this long, will break wherever "prettiest" - * To disable, set to a value <= 0 */ +/*If a word is at least this long, will break wherever "prettiest" + *To disable, set to a value <= 0*/ #define LV_TXT_LINE_BREAK_LONG_LEN 0 -/* Minimum number of characters in a long word to put on a line before a break. - * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */ +/*Minimum number of characters in a long word to put on a line before a break. + *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/ #define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 -/* Minimum number of characters in a long word to put on a line after a break. - * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */ +/*Minimum number of characters in a long word to put on a line after a break. + *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/ #define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 -/* The control character to use for signalling text recoloring. */ +/*The control character to use for signalling text recoloring.*/ #define LV_TXT_COLOR_CMD "#" -/* Support bidirectional texts. - * Allows mixing Left-to-Right and Right-to-Left texts. - * The direction will be processed according to the Unicode Bidirectioanl Algorithm: - * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ -#define LV_USE_BIDI 0 +/*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts. + *The direction will be processed according to the Unicode Bidirectioanl Algorithm: + *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ +#define LV_USE_BIDI 0 #if LV_USE_BIDI -/* Set the default direction. Supported values: - * `LV_BIDI_DIR_LTR` Left-to-Right - * `LV_BIDI_DIR_RTL` Right-to-Left - * `LV_BIDI_DIR_AUTO` detect texts base direction */ -#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO +/*Set the default direction. Supported values: + *`LV_BASE_DIR_LTR` Left-to-Right + *`LV_BASE_DIR_RTL` Right-to-Left + *`LV_BASE_DIR_AUTO` detect texts base direction*/ +#define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO #endif -/* Enable Arabic/Persian processing - * In these languages characters should be replaced with - * an other form based on their position in the text */ +/*Enable Arabic/Persian processing + *In these languages characters should be replaced with an other form based on their position in the text*/ #define LV_USE_ARABIC_PERSIAN_CHARS 0 -/*Change the built in (v)snprintf functions*/ -#define LV_SPRINTF_CUSTOM 0 -#if LV_SPRINTF_CUSTOM -#define LV_SPRINTF_INCLUDE -#define lv_snprintf snprintf -#define lv_vsnprintf vsnprintf -#else /*!LV_SPRINTF_CUSTOM*/ -#define LV_SPRINTF_DISABLE_FLOAT 1 -#endif /*LV_SPRINTF_CUSTOM*/ - -/*=================== - * LV_OBJ SETTINGS - *==================*/ - -#if LV_USE_USER_DATA -/*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ -typedef void * lv_obj_user_data_t; -/*Provide a function to free user data*/ -#define LV_USE_USER_DATA_FREE 0 -#if LV_USE_USER_DATA_FREE -# define LV_USER_DATA_FREE_INCLUDE "something.h" /*Header for user data free function*/ -/* Function prototype : void user_data_free(lv_obj_t * obj); */ -# define LV_USER_DATA_FREE (user_data_free) /*Invoking for user data free function*/ -#endif -#endif - -/*1: enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/ -#define LV_USE_OBJ_REALIGN 1 - -/* Enable to make the object clickable on a larger area. - * LV_EXT_CLICK_AREA_OFF or 0: Disable this feature - * LV_EXT_CLICK_AREA_TINY: The extra area can be adjusted horizontally and vertically (0..255 px) - * LV_EXT_CLICK_AREA_FULL: The extra area can be adjusted in all 4 directions (-32k..+32k px) - */ -#define LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY - /*================== - * LV OBJ X USAGE + * WIDGET USAGE *================*/ -/* - * Documentation of the object types: https://docs.lvgl.com/#Object-types - */ -/*Arc (dependencies: -)*/ -#define LV_USE_ARC 1 +/*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/ -/*Bar (dependencies: -)*/ -#define LV_USE_BAR 1 +#define LV_USE_ARC IS_USED(MODULE_LVGL_WIDGET_ARC) -/*Button (dependencies: lv_cont*/ -#define LV_USE_BTN 1 +#define LV_USE_ANIMIMG IS_USED(MODULE_LVGL_EXTRA_WIDGET_ANIMIMG) -/*Button matrix (dependencies: -)*/ -#define LV_USE_BTNMATRIX 1 +#define LV_USE_BAR IS_USED(MODULE_LVGL_WIDGET_BAR) -/*Calendar (dependencies: -)*/ -#define LV_USE_CALENDAR 1 -#if LV_USE_CALENDAR -# define LV_CALENDAR_WEEK_STARTS_MONDAY 0 +#define LV_USE_BTN IS_USED(MODULE_LVGL_WIDGET_BTN) + +#define LV_USE_BTNMATRIX IS_USED(MODULE_LVGL_WIDGET_BTNMATRIX) + +#define LV_USE_CANVAS IS_USED(MODULE_LVGL_WIDGET_CANVAS) + +#define LV_USE_CHECKBOX IS_USED(MODULE_LVGL_WIDGET_CHECKBOX) + +#define LV_USE_DROPDOWN IS_USED(MODULE_LVGL_WIDGET_DROPDOWN) /*Requires: lv_label*/ + +#define LV_USE_IMG IS_USED(MODULE_LVGL_WIDGET_IMG) /*Requires: lv_label*/ + +#define LV_USE_LABEL IS_USED(MODULE_LVGL_WIDGET_LABEL) +#if LV_USE_LABEL +#ifndef LV_LABEL_TEXT_SELECTION +#define LV_LABEL_TEXT_SELECTION 1 /**< Enable selecting text of the label*/ +#endif +#ifndef LV_LABEL_LONG_TXT_HINT +#define LV_LABEL_LONG_TXT_HINT 1 /**< Store some extra info in labels to speed up drawing of very long texts*/ +#endif #endif -/*Canvas (dependencies: lv_img)*/ -#define LV_USE_CANVAS 1 +#define LV_USE_LINE IS_USED(MODULE_LVGL_WIDGET_LINE) -/*Check box (dependencies: lv_btn, lv_label)*/ -#define LV_USE_CHECKBOX 1 - -/*Chart (dependencies: -)*/ -#define LV_USE_CHART 1 -#if LV_USE_CHART -# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 256 +#define LV_USE_ROLLER IS_USED(MODULE_LVGL_WIDGET_ROLLER) /*Requires: lv_label*/ +#if LV_USE_ROLLER +# define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/ #endif -/*Container (dependencies: -*/ -#define LV_USE_CONT 1 +#define LV_USE_SLIDER IS_USED(MODULE_LVGL_WIDGET_SLIDER) /*Requires: lv_bar*/ -/*Color picker (dependencies: -*/ -#define LV_USE_CPICKER 1 +#define LV_USE_SWITCH IS_USED(MODULE_LVGL_WIDGET_SWITCH) -/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/ -#define LV_USE_DROPDOWN 1 -#if LV_USE_DROPDOWN != 0 -/*Open and close default animation time [ms] (0: no animation)*/ -# define LV_DROPDOWN_DEF_ANIM_TIME 200 -#endif - -/*Gauge (dependencies:lv_bar, lv_linemeter)*/ -#define LV_USE_GAUGE 1 - -/*Image (dependencies: lv_label*/ -#define LV_USE_IMG 1 - -/*Image Button (dependencies: lv_btn*/ -#define LV_USE_IMGBTN 1 -#if LV_USE_IMGBTN -/*1: The imgbtn requires left, mid and right parts and the width can be set freely*/ -# define LV_IMGBTN_TILED 0 -#endif - -/*Keyboard (dependencies: lv_btnm)*/ -#define LV_USE_KEYBOARD 1 - -/*Label (dependencies: -*/ -#define LV_USE_LABEL 1 -#if LV_USE_LABEL != 0 -/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/ -# define LV_LABEL_DEF_SCROLL_SPEED 25 - -/* Waiting period at beginning/end of animation cycle */ -# define LV_LABEL_WAIT_CHAR_COUNT 3 - -/*Enable selecting text of the label */ -# define LV_LABEL_TEXT_SEL 0 - -/*Store extra some info in labels (12 bytes) to speed up drawing of very long texts*/ -# define LV_LABEL_LONG_TXT_HINT 0 -#endif - -/*LED (dependencies: -)*/ -#define LV_USE_LED 1 -#if LV_USE_LED -# define LV_LED_BRIGHT_MIN 120 /*Minimal brightness*/ -# define LV_LED_BRIGHT_MAX 255 /*Maximal brightness*/ -#endif - -/*Line (dependencies: -*/ -#define LV_USE_LINE 1 - -/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/ -#define LV_USE_LIST 1 -#if LV_USE_LIST != 0 -/*Default animation time of focusing to a list element [ms] (0: no animation) */ -# define LV_LIST_DEF_ANIM_TIME 100 -#endif - -/*Line meter (dependencies: *;)*/ -#define LV_USE_LINEMETER 1 -#if LV_USE_LINEMETER -/* Draw line more precisely at cost of performance. - * Useful if there are lot of lines any minor are visible - * 0: No extra precision - * 1: Some extra precision - * 2: Best precision - */ -# define LV_LINEMETER_PRECISE 0 -#endif - -/*Mask (dependencies: -)*/ -#define LV_USE_OBJMASK 1 - -/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ -#define LV_USE_MSGBOX 1 - -/*Page (dependencies: lv_cont)*/ -#define LV_USE_PAGE 1 -#if LV_USE_PAGE != 0 -/*Focus default animation time [ms] (0: no animation)*/ -# define LV_PAGE_DEF_ANIM_TIME 400 -#endif - -/*Preload (dependencies: lv_arc, lv_anim)*/ -#define LV_USE_SPINNER 1 -#if LV_USE_SPINNER != 0 -# define LV_SPINNER_DEF_ARC_LENGTH 60 /*[deg]*/ -# define LV_SPINNER_DEF_SPIN_TIME 1000 /*[ms]*/ -# define LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC -#endif - -/*Roller (dependencies: lv_ddlist)*/ -#define LV_USE_ROLLER 1 -#if LV_USE_ROLLER != 0 -/*Focus animation time [ms] (0: no animation)*/ -# define LV_ROLLER_DEF_ANIM_TIME 200 - -/*Number of extra "pages" when the roller is infinite*/ -# define LV_ROLLER_INF_PAGES 7 -#endif - -/*Slider (dependencies: lv_bar)*/ -#define LV_USE_SLIDER 1 - -/*Spinbox (dependencies: lv_ta)*/ -#define LV_USE_SPINBOX 1 - -/*Switch (dependencies: lv_slider)*/ -#define LV_USE_SWITCH 1 - -/*Text area (dependencies: lv_label, lv_page)*/ -#define LV_USE_TEXTAREA 1 +#define LV_USE_TEXTAREA IS_USED(MODULE_LVGL_WIDGET_TEXTAREA) /*Requires: lv_label*/ #if LV_USE_TEXTAREA != 0 -# define LV_TEXTAREA_DEF_CURSOR_BLINK_TIME 400 /*ms*/ # define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/ #endif -/*Table (dependencies: lv_label)*/ -#define LV_USE_TABLE 1 -#if LV_USE_TABLE -# define LV_TABLE_COL_MAX 12 -# define LV_TABLE_CELL_STYLE_CNT 4 +#define LV_USE_TABLE IS_USED(MODULE_LVGL_WIDGET_TABLE) + +/*================== + * EXTRA COMPONENTS + *==================*/ + +/*----------- + * Widgets + *----------*/ + +#define LV_USE_CALENDAR IS_USED(MODULE_LVGL_EXTRA_WIDGET_CALENDAR) +#if LV_USE_CALENDAR +# define LV_CALENDAR_WEEK_STARTS_MONDAY 0 +# if LV_CALENDAR_WEEK_STARTS_MONDAY +# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"} +# else +# define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"} +# endif + +# define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} +# define LV_USE_CALENDAR_HEADER_ARROW 1 +# define LV_USE_CALENDAR_HEADER_DROPDOWN 1 +#endif /*LV_USE_CALENDAR*/ + +#define LV_USE_CHART IS_USED(MODULE_LVGL_EXTRA_WIDGET_CHART) + +#define LV_USE_COLORWHEEL IS_USED(MODULE_LVGL_EXTRA_WIDGET_COLORWHEEL) + +#define LV_USE_IMGBTN IS_USED(MODULE_LVGL_EXTRA_WIDGET_IMGBTN) + +#define LV_USE_KEYBOARD IS_USED(MODULE_LVGL_EXTRA_WIDGET_KEYBOARD) + +#define LV_USE_LED IS_USED(MODULE_LVGL_EXTRA_WIDGET_LED) + +#define LV_USE_LIST IS_USED(MODULE_LVGL_EXTRA_WIDGET_LIST) + +#define LV_USE_MENU IS_USED(MODULE_LVGL_EXTRA_WIDGET_MENU) + +#define LV_USE_METER IS_USED(MODULE_LVGL_EXTRA_WIDGET_METER) + +#define LV_USE_MSGBOX IS_USED(MODULE_LVGL_EXTRA_WIDGET_MSGBOX) + +#define LV_USE_SPINBOX IS_USED(MODULE_LVGL_EXTRA_WIDGET_SPINBOX) + +#define LV_USE_SPINNER IS_USED(MODULE_LVGL_EXTRA_WIDGET_SPINNER) + +#define LV_USE_TABVIEW IS_USED(MODULE_LVGL_EXTRA_WIDGET_TABVIEW) + +#define LV_USE_TILEVIEW IS_USED(MODULE_LVGL_EXTRA_WIDGET_TILEVIEW) + +#define LV_USE_WIN IS_USED(MODULE_LVGL_EXTRA_WIDGET_WIN) + +#define LV_USE_SPAN IS_USED(MODULE_LVGL_EXTRA_WIDGET_SPAN) +#if LV_USE_SPAN +/*A line text can contain maximum num of span descriptor */ +# define LV_SPAN_SNIPPET_STACK_SIZE 64 #endif -/*Tab (dependencies: lv_page, lv_btnm)*/ -#define LV_USE_TABVIEW 1 -#if LV_USE_TABVIEW != 0 -/*Time of slide animation [ms] (0: no animation)*/ -# define LV_TABVIEW_DEF_ANIM_TIME 300 -#endif +/*----------- + * Themes + *----------*/ +/*A simple, impressive and very complete theme*/ +#define LV_USE_THEME_DEFAULT IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT) -/*Tileview (dependencies: lv_page) */ -#define LV_USE_TILEVIEW 1 -#if LV_USE_TILEVIEW -/*Time of slide animation [ms] (0: no animation)*/ -# define LV_TILEVIEW_DEF_ANIM_TIME 300 -#endif +/*0: Light mode; 1: Dark mode*/ +#define LV_THEME_DEFAULT_DARK IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_DARK) -/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ -#define LV_USE_WIN 1 +/*1: Enable grow on press*/ +#define LV_THEME_DEFAULT_GROW IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW) + +/*Default transition time in [ms]*/ +# define LV_THEME_DEFAULT_TRANSITON_TIME 80 + +/*An very simple them that is a good starting point for a custom theme*/ +#define LV_USE_THEME_BASIC IS_USED(MODULE_LVGL_EXTRA_THEME_BASIC) + +/*A theme designed for monochrome displays*/ +#define LV_USE_THEME_MONO IS_USED(MODULE_LVGL_EXTRA_THEME_MONO) + +/*----------- + * Layouts + *----------*/ + +/*A layout similar to Flexbox in CSS.*/ +#define LV_USE_FLEX IS_USED(MODULE_LVGL_EXTRA_LAYOUT_FLEX) + +/*A layout similar to Grid in CSS.*/ +#define LV_USE_GRID IS_USED(MODULE_LVGL_EXTRA_LAYOUT_GRID) #ifdef __cplusplus } diff --git a/pkg/lvgl/include/lvgl_riot_conf.h b/pkg/lvgl/include/lvgl_riot_conf.h index 4d11b32f6e..0344fd4cfa 100644 --- a/pkg/lvgl/include/lvgl_riot_conf.h +++ b/pkg/lvgl/include/lvgl_riot_conf.h @@ -19,18 +19,40 @@ #ifndef LVGL_RIOT_CONF_H #define LVGL_RIOT_CONF_H +#include "board.h" + #ifdef __cplusplus extern "C" { #endif +/** Maximal horizontal resolution to support by the library.*/ +#ifndef LV_HOR_RES_MAX +#ifdef LCD_SCREEN_WIDTH +#define LV_HOR_RES_MAX (LCD_SCREEN_WIDTH) +#else +#define LV_HOR_RES_MAX (320) +#endif +#endif + +/** Maximal vertical resolution to support by the library.*/ +#ifndef LV_VER_RES_MAX +#ifdef LCD_SCREEN_HEIGHT +#define LV_VER_RES_MAX (LCD_SCREEN_HEIGHT) +#else +#define LV_VER_RES_MAX (240) +#endif +#endif + +/** Will be added where memories needs to be aligned (with -Os data might not be aligned to boundary by default). + * E.g. __attribute__((aligned(4)))*/ +#define LV_ATTRIBUTE_MEM_ALIGN __attribute__((aligned(4))) + /* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */ typedef int16_t lv_coord_t; #define LV_TICK_CUSTOM 1 -#if LV_TICK_CUSTOM == 1 #define LV_TICK_CUSTOM_INCLUDE "ztimer.h" /*Header for the sys time function*/ #define LV_TICK_CUSTOM_SYS_TIME_EXPR (ztimer_now(ZTIMER_MSEC)) /*Expression evaluating to current systime in ms*/ -#endif /*LV_TICK_CUSTOM*/ #ifdef __cplusplus } diff --git a/tests/pkg_lvgl/app.config.sample b/tests/pkg_lvgl/app.config.sample deleted file mode 100644 index e2682577f4..0000000000 --- a/tests/pkg_lvgl/app.config.sample +++ /dev/null @@ -1,5 +0,0 @@ -# Sample lvgl configuration -CONFIG_KCONFIG_USEPKG_LVGL=y -CONFIG_LV_COLOR_DEPTH_16=y -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_SIZE_KILOBYTES=5 diff --git a/tests/pkg_lvgl_touch/app.config.sample b/tests/pkg_lvgl_touch/app.config.sample deleted file mode 100644 index e2682577f4..0000000000 --- a/tests/pkg_lvgl_touch/app.config.sample +++ /dev/null @@ -1,5 +0,0 @@ -# Sample lvgl configuration -CONFIG_KCONFIG_USEPKG_LVGL=y -CONFIG_LV_COLOR_DEPTH_16=y -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_SIZE_KILOBYTES=5 From f35c348722b1335a0f31bbcbf97cfa03caeee590 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 4 Jun 2021 13:58:12 +0200 Subject: [PATCH 3/5] tests/pkg_lvgl: adapt to new lvgl version --- tests/pkg_lvgl/Makefile | 7 +++- tests/pkg_lvgl/app.config.test | 20 ++++++++++++ tests/pkg_lvgl/main.c | 48 +++++++++++++++------------- tests/pkg_lvgl_touch/Makefile | 7 ++++ tests/pkg_lvgl_touch/app.config.test | 20 ++++++++++++ tests/pkg_lvgl_touch/main.c | 14 ++++---- 6 files changed, 86 insertions(+), 30 deletions(-) diff --git a/tests/pkg_lvgl/Makefile b/tests/pkg_lvgl/Makefile index 4795f07f0a..c89d099886 100644 --- a/tests/pkg_lvgl/Makefile +++ b/tests/pkg_lvgl/Makefile @@ -6,7 +6,12 @@ DISABLE_MODULE += test_utils_interactive_sync USEPKG += lvgl USEMODULE += lvgl_contrib +USEMODULE += lvgl_extra_widget_chart +USEMODULE += lvgl_extra_widget_win +USEMODULE += lvgl_extra_layout_flex +USEMODULE += lvgl_extra_theme_default +USEMODULE += lvgl_extra_theme_default_dark -CFLAGS += -DTHREAD_STACKSIZE_MAIN=2048 +CFLAGS += -DTHREAD_STACKSIZE_MAIN=2*1024 include $(RIOTBASE)/Makefile.include diff --git a/tests/pkg_lvgl/app.config.test b/tests/pkg_lvgl/app.config.test index 76c76f4330..11883456a7 100644 --- a/tests/pkg_lvgl/app.config.test +++ b/tests/pkg_lvgl/app.config.test @@ -1,2 +1,22 @@ CONFIG_PACKAGE_LVGL=y CONFIG_MODULE_LVGL_CONTRIB=y +CONFIG_MODULE_LVGL_EXTRA_WIDGET_CHART=y +CONFIG_MODULE_LVGL_EXTRA_WIDGET_WIN=y +CONFIG_MODULE_LVGL_EXTRA_LAYOUT_FLEX=y +CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT=y +CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_DARK=y + +# Uncomment the following Kconfig symbols to configure LVGL using Kconfig. This +# requires the LVGL package to be already downloaded (e.g. built once already) +# LVGL specific configuration +# CONFIG_KCONFIG_USEPKG_LVGL=y +# CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12=y +# CONFIG_LV_FONT_UNSCII_8=n +# CONFIG_LV_MEMCPY_MEMSET_STD=y +# CONFIG_LV_COLOR_16_SWAP=y +# # set memory size to 6 when +# # CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW symbol above is enabled +# CONFIG_LV_MEM_SIZE_KILOBYTES=5 +# # comment out the following line when +# # CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW symbol above is enabled +# CONFIG_LV_THEME_DEFAULT_GROW=n diff --git a/tests/pkg_lvgl/main.c b/tests/pkg_lvgl/main.c index 2437f3446b..7f7dfd9dbb 100644 --- a/tests/pkg_lvgl/main.c +++ b/tests/pkg_lvgl/main.c @@ -36,14 +36,14 @@ static lv_obj_t *chart; static lv_chart_series_t * cpu_ser; static lv_chart_series_t *mem_ser; static lv_obj_t *info_label; -static lv_task_t *refr_task; +static lv_timer_t *refr_task; -static void sysmon_task(lv_task_t *param) +static void sysmon_task(lv_timer_t *param) { (void)param; /* Get CPU and memory information */ - uint8_t cpu_busy = 100 - lv_task_get_idle(); + uint8_t cpu_busy = 100 - lv_timer_get_idle(); lv_mem_monitor_t mem_mon; lv_mem_monitor(&mem_mon); @@ -51,16 +51,16 @@ static void sysmon_task(lv_task_t *param) uint8_t mem_used_pct = mem_mon.used_pct; /* Add the CPU and memory data to the chart */ - lv_chart_set_next(chart, cpu_ser, cpu_busy); - lv_chart_set_next(chart, mem_ser, mem_used_pct); + lv_chart_set_next_value(chart, cpu_ser, cpu_busy); + lv_chart_set_next_value(chart, mem_ser, mem_used_pct); /* Set the text info */ lv_label_set_text_fmt(info_label, "%s%s CPU: %d %%%s\n\n" LV_TXT_COLOR_CMD"%s MEMORY: %d %%"LV_TXT_COLOR_CMD"\n" - "Total: %d bytes\n" - "Used: %d bytes\n" - "Free: %d bytes\n" + "Total: %" PRIu32 " bytes\n" + "Used: %" PRIu32 " bytes\n" + "Free: %" PRIu32 " bytes\n" "Frag: %d %%", LV_TXT_COLOR_CMD, CPU_LABEL_COLOR, @@ -68,9 +68,10 @@ static void sysmon_task(lv_task_t *param) LV_TXT_COLOR_CMD, MEM_LABEL_COLOR, mem_used_pct, - (int)mem_mon.total_size, - (int)mem_mon.total_size - mem_mon.free_size, - mem_mon.free_size, mem_mon.frag_pct); + mem_mon.total_size, + mem_mon.total_size - mem_mon.free_size, + mem_mon.free_size, + mem_mon.frag_pct); /* Force a wakeup of lvgl when each task is called: this ensures an activity is triggered and wakes up lvgl during the next LVGL_INACTIVITY_PERIOD ms */ @@ -82,35 +83,36 @@ void sysmon_create(void) lv_coord_t hres = lv_disp_get_hor_res(NULL); lv_coord_t vres = lv_disp_get_ver_res(NULL); - win = lv_win_create(lv_disp_get_scr_act(NULL), NULL); - lv_win_set_title(win, "System monitor"); + win = lv_win_create(lv_scr_act(), 25); + lv_win_add_title(win, "System monitor"); + lv_obj_t * cont = lv_win_get_content(win); /* Make the window content responsive */ - lv_win_set_layout(win, LV_LAYOUT_PRETTY_MID); + lv_obj_set_layout(cont, LV_LAYOUT_FLEX); /* Create a chart with two data lines */ - chart = lv_chart_create(win, NULL); + chart = lv_chart_create(cont); lv_obj_set_size(chart, hres / 2.5, vres / 2); - lv_obj_set_pos(chart, LV_DPI / 10, LV_DPI / 10); + lv_obj_set_pos(chart, LV_DPI_DEF / 10, LV_DPI_DEF / 10); lv_chart_set_point_count(chart, CHART_POINT_NUM); - lv_chart_set_range(chart, 0, 100); + lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 100); lv_chart_set_type(chart, LV_CHART_TYPE_LINE); - cpu_ser = lv_chart_add_series(chart, LV_COLOR_RED); - mem_ser = lv_chart_add_series(chart, LV_COLOR_BLUE); + cpu_ser = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y); + mem_ser = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_BLUE), LV_CHART_AXIS_PRIMARY_Y); /* Set the data series to zero */ uint16_t i; for(i = 0; i < CHART_POINT_NUM; i++) { - lv_chart_set_next(chart, cpu_ser, 0); - lv_chart_set_next(chart, mem_ser, 0); + lv_chart_set_next_value(chart, cpu_ser, 0); + lv_chart_set_next_value(chart, mem_ser, 0); } /* Create a label for the details of Memory and CPU usage */ - info_label = lv_label_create(win, NULL); + info_label = lv_label_create(cont); lv_label_set_recolor(info_label, true); /* Create the task used to refresh the chart and label */ - refr_task = lv_task_create(sysmon_task, REFR_TIME, LV_TASK_PRIO_LOW, NULL); + refr_task = lv_timer_create(sysmon_task, REFR_TIME, NULL); } int main(void) diff --git a/tests/pkg_lvgl_touch/Makefile b/tests/pkg_lvgl_touch/Makefile index 3d34d38d10..3747a14fca 100644 --- a/tests/pkg_lvgl_touch/Makefile +++ b/tests/pkg_lvgl_touch/Makefile @@ -9,5 +9,12 @@ USEMODULE += lvgl_contrib # Add touch capabilities USEMODULE += lvgl_contrib_touch +USEMODULE += lvgl_widget_btn +USEMODULE += lvgl_widget_label +USEMODULE += lvgl_extra_theme_default +# uncomment the following to enable growing button (needs more RAM) +# USEMODULE += lvgl_extra_theme_default_grow + +CFLAGS += -DTHREAD_STACKSIZE_MAIN=2*1024 include $(RIOTBASE)/Makefile.include diff --git a/tests/pkg_lvgl_touch/app.config.test b/tests/pkg_lvgl_touch/app.config.test index 19adbf3bb9..0bcef0b3a7 100644 --- a/tests/pkg_lvgl_touch/app.config.test +++ b/tests/pkg_lvgl_touch/app.config.test @@ -1,5 +1,25 @@ CONFIG_PACKAGE_LVGL=y CONFIG_MODULE_LVGL_CONTRIB=y +CONFIG_MODULE_LVGL_WIDGET_BTN=y +CONFIG_MODULE_LVGL_WIDGET_LABEL=y +CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT=y +# uncomment the following to enable growing button (needs more RAM) +#CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW=y # Add touch capabilities CONFIG_MODULE_LVGL_CONTRIB_TOUCH=y + +# Uncomment the following Kconfig symbols to configure LVGL using Kconfig. This +# requires the LVGL package to be already downloaded (e.g. built once already) +# LVGL specific configuration +# CONFIG_KCONFIG_USEPKG_LVGL=y +# CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12=y +# CONFIG_LV_FONT_UNSCII_8=n +# CONFIG_LV_MEMCPY_MEMSET_STD=y +# CONFIG_LV_COLOR_16_SWAP=y +# # set memory size to 6 when +# # CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW symbol above is enabled +# CONFIG_LV_MEM_SIZE_KILOBYTES=5 +# # comment out the following line when +# # CONFIG_MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW symbol above is enabled +# CONFIG_LV_THEME_DEFAULT_GROW=n diff --git a/tests/pkg_lvgl_touch/main.c b/tests/pkg_lvgl_touch/main.c index ebddae4385..9ba3982e0e 100644 --- a/tests/pkg_lvgl_touch/main.c +++ b/tests/pkg_lvgl_touch/main.c @@ -25,10 +25,11 @@ #include "disp_dev.h" -static void btn_event_cb(lv_obj_t * btn, lv_event_t event) + +static void btn_event_cb(lv_event_t *event) { - (void)btn; - if (event == LV_EVENT_CLICKED) { + lv_event_code_t code = lv_event_get_code(event); + if (code == LV_EVENT_CLICKED) { puts("Button clicked!"); } } @@ -39,7 +40,7 @@ int main(void) disp_dev_backlight_on(); /* Add a button to the current screen */ - lv_obj_t * btn = lv_btn_create(lv_scr_act(), NULL); + lv_obj_t *btn = lv_btn_create(lv_scr_act()); /* Set the button position and size */ lv_coord_t x_size = 100; @@ -50,11 +51,12 @@ int main(void) lv_obj_set_size(btn, 100, 50); /*Assign a callback to the button*/ - lv_obj_set_event_cb(btn, btn_event_cb); + lv_obj_add_event_cb(btn, btn_event_cb, LV_EVENT_ALL, NULL); /* Add a label to the button */ - lv_obj_t * label = lv_label_create(btn, NULL); + lv_obj_t *label = lv_label_create(btn); lv_label_set_text(label, "Click me"); + lv_obj_center(label); lvgl_run(); From 3c3dae36a0c5f7d031bc2e848276732086398ea6 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 21 Feb 2022 16:09:14 +0100 Subject: [PATCH 4/5] pkg/lvgl: use lvgl minimal config, bind widget use to modules --- pkg/lvgl/Kconfig | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/pkg/lvgl/Kconfig b/pkg/lvgl/Kconfig index 281300a787..ea5ff60456 100644 --- a/pkg/lvgl/Kconfig +++ b/pkg/lvgl/Kconfig @@ -39,8 +39,6 @@ config MODULE_LVGL_CONTRIB_TOUCH bool "Touch support" select MODULE_TOUCH_DEV -endif # PACKAGE_LVGL - config MODULE_LVGL bool @@ -70,122 +68,164 @@ config MODULE_LVGL_WIDGETS config MODULE_LVGL_WIDGET_ARC bool "Arc widget" + select LV_USE_ARC if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_BAR bool "Bar widget" + select LV_USE_BAR if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_BTN bool "Button widget" + select LV_USE_BTN if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_BTNMATRIX bool "Button matrix widget" + select LV_USE_BTNMATRIX if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_CANVAS bool "Canvas widget" + select LV_USE_CANVAS if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_CHECKBOX bool "Checkbox widget" + select LV_USE_CHECKBOX if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_DROPDOWN bool "Dropdown widget" select MODULE_LVGL_WIDGET_LABEL + select LV_USE_DROPDOWN if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_IMG bool "Image widget" select MODULE_LVGL_WIDGET_LABEL + select LV_USE_IMG if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_LABEL bool "Label widget" + select LV_USE_LABEL if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_LINE bool "Line widget" + select LV_USE_LINE if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_ROLLER bool "Roller widget" select MODULE_LVGL_WIDGET_LABEL + select LV_USE_ROLLER if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_SLIDER bool "Slider widget" select MODULE_LVGL_WIDGET_BAR + select LV_USE_SLIDER if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_SWITCH bool "Switch widget" + select LV_USE_SWITCH if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_TEXTAREA bool "Textarea widget" select MODULE_LVGL_WIDGET_LABEL + select LV_USE_TEXTAREA if KCONFIG_USEPKG_LVGL config MODULE_LVGL_WIDGET_TABLE bool "Table widget" + select LV_USE_TABLE if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_LAYOUT_FLEX bool "Flex extra layout" + select LV_USE_FLEX if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_LAYOUT_GRID bool "Grid extra layout" + select LV_USE_GRID if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_THEME_BASIC bool "Extra theme basic" + select LV_USE_THEME_BASIC if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_THEME_DEFAULT bool "Extra theme default" + select LV_USE_THEME_DEFAULT if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_THEME_DEFAULT_DARK bool "Extra theme default in dark mode" + select LV_THEME_DEFAULT_DARK if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW bool "Extra theme default with button grow mode" + select LV_THEME_DEFAULT_GROW if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_THEME_MONO bool "Extra theme mono" config MODULE_LVGL_EXTRA_WIDGET_ANIMING bool "Animing extra widget" + select LV_USE_ANIMING if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_CALENDAR bool "Calendar extra widget" + select LV_USE_CALENDAR if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_CHART bool "Chart extra widget" + select LV_USE_CHART if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_COLORWHEEL bool "Colorwheel extra widget" + select LV_USE_COLORWHEEL if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_IMGBIN bool "Imgbin extra widget" + select LV_USE_IMGBIN if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_LED bool "Led extra widget" + select LV_USE_LED if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_LIST bool "List extra widget" + select LV_USE_LIST if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_MENU bool "Menu extra widget" + select LV_USE_MENU if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_METER bool "Meter extra widget" + select LV_USE_METER if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_MSGBOX bool "Message box extra widget" + select LV_USE_MSGBOX if KCONFIG_USEPKG_LVGL + +config MODULE_LVGL_EXTRA_WIDGET_SPAN + bool "Window extra widget" + select LV_USE_SPAN if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_SPINBOX bool "Spinbox extra widget" + select LV_USE_SPINBOX if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_SPINNER bool "Spinner extra widget" + select LV_USE_SPINNER if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_TABVIEW bool "Tabview extra widget" + select LV_USE_TABVIEW if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_TILEVIEW bool "Tileview extra widget" + select LV_USE_TILEVIEW if KCONFIG_USEPKG_LVGL config MODULE_LVGL_EXTRA_WIDGET_WIN bool "Window extra widget" select MODULE_LVGL_WIDGET_BTN select MODULE_LVGL_WIDGET_IMG select MODULE_LVGL_WIDGET_LABEL + select LV_USE_WIN if KCONFIG_USEPKG_LVGL + +endif # PACKAGE_LVGL endif # TEST_KCONFIG @@ -193,6 +233,8 @@ menuconfig KCONFIG_USEPKG_LVGL bool "Configure LVGL" help Configure LVGL package via Kconfig. + # Make sure all widgets are unchecked by default + select LV_CONF_MINIMAL if KCONFIG_USEPKG_LVGL From cc26dedf07e00863c889946e0deee53dbcefba5a Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 22 Feb 2022 11:34:12 +0100 Subject: [PATCH 5/5] pkg/lvgl: add patch for lv_conf_internal --- ...endencies-internal-handling-consiste.patch | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 pkg/lvgl/patches/0001-widgets-make-dependencies-internal-handling-consiste.patch diff --git a/pkg/lvgl/patches/0001-widgets-make-dependencies-internal-handling-consiste.patch b/pkg/lvgl/patches/0001-widgets-make-dependencies-internal-handling-consiste.patch new file mode 100644 index 0000000000..ae69cd6706 --- /dev/null +++ b/pkg/lvgl/patches/0001-widgets-make-dependencies-internal-handling-consiste.patch @@ -0,0 +1,181 @@ +From ec1a78d4c7a25d79e38197cdfc513efe4724c0ec Mon Sep 17 00:00:00 2001 +From: Alexandre Abadie +Date: Tue, 22 Feb 2022 09:44:30 +0100 +Subject: [PATCH 1/1] widgets: make dependencies internal handling consistent + when using Kconfig + +--- + src/lv_conf_internal.h | 72 ++++++++++++++++++++++++++++++----------- + src/widgets/lv_img.h | 5 +++ + src/widgets/lv_roller.h | 5 +++ + 3 files changed, 64 insertions(+), 18 deletions(-) + +diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h +index 456c7284..a07b51bb 100644 +--- a/src/lv_conf_internal.h ++++ b/src/lv_conf_internal.h +@@ -597,15 +597,23 @@ + /*Enable asserts if an operation is failed or an invalid data is found. + *If LV_USE_LOG is enabled an error message will be printed on failure*/ + #ifndef LV_USE_ASSERT_NULL +- #ifdef CONFIG_LV_USE_ASSERT_NULL +- #define LV_USE_ASSERT_NULL CONFIG_LV_USE_ASSERT_NULL ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_ASSERT_NULL ++ #define LV_USE_ASSERT_NULL CONFIG_LV_USE_ASSERT_NULL ++ #else ++ #define LV_USE_ASSERT_NULL 0 ++ #endif + #else + #define LV_USE_ASSERT_NULL 1 /*Check if the parameter is NULL. (Very fast, recommended)*/ + #endif + #endif + #ifndef LV_USE_ASSERT_MALLOC +- #ifdef CONFIG_LV_USE_ASSERT_MALLOC +- #define LV_USE_ASSERT_MALLOC CONFIG_LV_USE_ASSERT_MALLOC ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_ASSERT_MALLOC ++ #define LV_USE_ASSERT_MALLOC CONFIG_LV_USE_ASSERT_MALLOC ++ #else ++ #define LV_USE_ASSERT_MALLOC 0 ++ #endif + #else + #define LV_USE_ASSERT_MALLOC 1 /*Checks is the memory is successfully allocated or no. (Very fast, recommended)*/ + #endif +@@ -1341,16 +1349,24 @@ + #endif + + #ifndef LV_USE_DROPDOWN +- #ifdef CONFIG_LV_USE_DROPDOWN +- #define LV_USE_DROPDOWN CONFIG_LV_USE_DROPDOWN ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_DROPDOWN ++ #define LV_USE_DROPDOWN CONFIG_LV_USE_DROPDOWN ++ #else ++ #define LV_USE_DROPDOWN 0 ++ #endif + #else + #define LV_USE_DROPDOWN 1 /*Requires: lv_label*/ + #endif + #endif + + #ifndef LV_USE_IMG +- #ifdef CONFIG_LV_USE_IMG +- #define LV_USE_IMG CONFIG_LV_USE_IMG ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_IMG ++ #define LV_USE_IMG CONFIG_LV_USE_IMG ++ #else ++ #define LV_USE_IMG 0 ++ #endif + #else + #define LV_USE_IMG 1 /*Requires: lv_label*/ + #endif +@@ -1369,15 +1385,23 @@ + #endif + #if LV_USE_LABEL + #ifndef LV_LABEL_TEXT_SELECTION +- #ifdef CONFIG_LV_LABEL_TEXT_SELECTION +- #define LV_LABEL_TEXT_SELECTION CONFIG_LV_LABEL_TEXT_SELECTION ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_LABEL_TEXT_SELECTION ++ #define LV_LABEL_TEXT_SELECTION CONFIG_LV_LABEL_TEXT_SELECTION ++ #else ++ #define LV_LABEL_TEXT_SELECTION 0 ++ #endif + #else + #define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/ + #endif + #endif + #ifndef LV_LABEL_LONG_TXT_HINT +- #ifdef CONFIG_LV_LABEL_LONG_TXT_HINT +- #define LV_LABEL_LONG_TXT_HINT CONFIG_LV_LABEL_LONG_TXT_HINT ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_LABEL_LONG_TXT_HINT ++ #define LV_LABEL_LONG_TXT_HINT CONFIG_LV_LABEL_LONG_TXT_HINT ++ #else ++ #define LV_LABEL_LONG_TXT_HINT 0 ++ #endif + #else + #define LV_LABEL_LONG_TXT_HINT 1 /*Store some extra info in labels to speed up drawing of very long texts*/ + #endif +@@ -1397,8 +1421,12 @@ + #endif + + #ifndef LV_USE_ROLLER +- #ifdef CONFIG_LV_USE_ROLLER +- #define LV_USE_ROLLER CONFIG_LV_USE_ROLLER ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_ROLLER ++ #define LV_USE_ROLLER CONFIG_LV_USE_ROLLER ++ #else ++ #define LV_USE_ROLLER 0 ++ #endif + #else + #define LV_USE_ROLLER 1 /*Requires: lv_label*/ + #endif +@@ -1414,8 +1442,12 @@ + #endif + + #ifndef LV_USE_SLIDER +- #ifdef CONFIG_LV_USE_SLIDER +- #define LV_USE_SLIDER CONFIG_LV_USE_SLIDER ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_SLIDER ++ #define LV_USE_SLIDER CONFIG_LV_USE_SLIDER ++ #else ++ #define LV_USE_SLIDER 0 ++ #endif + #else + #define LV_USE_SLIDER 1 /*Requires: lv_bar*/ + #endif +@@ -1434,8 +1466,12 @@ + #endif + + #ifndef LV_USE_TEXTAREA +- #ifdef CONFIG_LV_USE_TEXTAREA +- #define LV_USE_TEXTAREA CONFIG_LV_USE_TEXTAREA ++ #ifdef _LV_KCONFIG_PRESENT ++ #ifdef CONFIG_LV_USE_TEXTAREA ++ #define LV_USE_TEXTAREA CONFIG_LV_USE_TEXTAREA ++ #else ++ #define LV_USE_TEXTAREA 0 ++ #endif + #else + #define LV_USE_TEXTAREA 1 /*Requires: lv_label*/ + #endif +diff --git a/src/widgets/lv_img.h b/src/widgets/lv_img.h +index 2a005643..9068c50e 100644 +--- a/src/widgets/lv_img.h ++++ b/src/widgets/lv_img.h +@@ -17,6 +17,11 @@ extern "C" { + + #if LV_USE_IMG != 0 + ++/*Testing of dependencies*/ ++#if LV_USE_LABEL == 0 ++#error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" ++#endif ++ + #include "../core/lv_obj.h" + #include "../misc/lv_fs.h" + #include "../draw/lv_draw.h" +diff --git a/src/widgets/lv_roller.h b/src/widgets/lv_roller.h +index d90001d9..14411dea 100644 +--- a/src/widgets/lv_roller.h ++++ b/src/widgets/lv_roller.h +@@ -17,6 +17,11 @@ extern "C" { + + #if LV_USE_ROLLER != 0 + ++/*Testing of dependencies*/ ++#if LV_USE_LABEL == 0 ++#error "lv_roller: lv_label is required. Enable it in lv_conf.h (LV_USE_ROLLER 1)" ++#endif ++ + #include "../core/lv_obj.h" + #include "lv_label.h" + +-- +2.32.0 +