gui: Added support for LVGL v6.1

Added support for new features in LVGL v6.1

Signed-off-by: Jan Van Winkel <[email protected]>

Author: vanwinkeljan

lib/gui/lvgl/Kconfig

@@ -273,6 +273,64 @@ config LVGL_TEXT_BREAK_CHARACTERS
 	help
 	  Characters on which a text break can take place
 
+config LVGL_TEXT_LINE_BREAK_LONG_LEN
+	int "Minimal word length for line break"
+	default 12
+	help
+	  If a word is at least this long, a line break is allowed in the word.
+
+	  If the length is 0, no line break is allowed in the middle of a word.
+
+config LVGL_TEXT_LINE_BREAK_LONG_PRE_MIN_LEN
+	int "Minimal number of characters on line before line break"
+	default 3
+	help
+	  Minimal number of characters to place on a line before a line break
+	  in the middle of a word can occur.
+
+config LVGL_TEXT_LINE_BREAK_LONG_POST_MIN_LEN
+	int "Minimal number of characters on line after line break"
+	default 3
+	help
+	  Minimal number of characters to place on a line after a line break
+	  occurred in the middle of a word.
+
+config LVGL_TEXT_COLOR_CMD
+	string "Text recoloring control character"
+	default "#"
+	help
+	  Control character to use for signalling text recoloring
+
+config LVGL_TEXT_USE_BIDI
+	bool "Enable bidirectional text support"
+	help
+	  Enable bidirectional text support
+
+	  The direction of the text will be processed according to the
+	  Unicode Bidirectional Algorithm:
+	  https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
+
+if LVGL_TEXT_USE_BIDI
+
+choice LVGL_TEXT_BIDI_MODE
+	prompt "Bidirectional text processing direction"
+	default LVGL_TEXT_BIDI_DIR_AUTO
+	help
+	  Direction of bidirectional text processing
+
+	config LVGL_TEXT_BIDI_DIR_AUTO
+		bool "Automatically detect direction"
+
+	config LVGL_TEXT_BIDI_DIR_LTR
+		bool "Left-to-right"
+
+	config LVGL_TEXT_BIDI_DIR_RTL
+		bool "Right-to-left"
+
+endchoice
+
+endif
+
 config LVGL_ANTIALIAS
 	bool "Enable anti-aliasing"
 	help
@@ -311,6 +369,11 @@ config LVGL_IMG_CF_ALPHA
 	help
 	  Enable support for alpha indexed images
 
+config LVGL_IMG_INDEXED_CHROMA
+	bool "Enable chroma keying for indexed images"
+	help
+	  Enable chroma keying for indexed images
+
 config LVGL_FILESYSTEM
 	bool "Enable file system"
 	depends on FILE_SYSTEM
@@ -328,6 +391,68 @@ config LVGL_IMG_CACHE_DEF_SIZE
 	  caching can save the continuous decoding of images. However the
 	  opened images might consume additional RAM.
 
+config LVGL_USE_DEBUG
+	bool "Enable debug support"
+	default y if TEST
+	help
+	  Enable debug support.
+
+	  If debug support is enabled LVGL will validate the parameters of
+	  any function call made and if an invalid parameter is found __ASSERT
+	  is called.
+
+if LVGL_USE_DEBUG
+
+config LVGL_USE_ASSERT_NULL
+	bool "Enable null pointer assertion"
+	default y if TEST
+	help
+	  Enable null pointer assertion
+
+	  Check if a null pointer is passed as a parameter (Quite fast)
+
+config LVGL_USE_ASSERT_MEM
+	bool "Enable memory allocation assertion"
+	default y if TEST
+	help
+	  Enable memory allocation assertion
+
+	  Check if memory allocation is successful (Quite fast)
+
+config LVGL_USE_ASSERT_STR
+	bool "Enable string assertion"
+	default y if TEST
+	help
+	  Enable string assertion
+
+	  Check if the string is not a NULL pointer, unusually long string,
+	  contains invalid characters or contains unusual repetitions. (Slow)
+
+	  If this option is disabled and NULL pointer checking is enabled, the
+	  NULL pointer check is executed instead.
+
+config LVGL_USE_ASSERT_OBJ
+	bool "Enable object assertion"
+	default y if TEST
+	help
+	  Enable object assertion
+
+	  Check if an object is not a NULL pointer, has the correct type and
+	  does exists. (Quite Slow)
+
+	  If this option is disabled and NULL pointer checking is enabled, the
+	  NULL pointer check is executed instead.
+
+config LVGL_USE_ASSERT_STYLE
+	bool "Enable style assertion"
+	default y if TEST
+	help
+	  Enable style assertion
+
+	  Check if a used style is correctly initialized. (Fast)
+
+endif
+
 rsource "Kconfig.themes"
 rsource "Kconfig.fonts"
 rsource "Kconfig.objects"

lib/gui/lvgl/Kconfig.fonts

@@ -3,6 +3,11 @@
 
 menu "Fonts"
 
+config LVGL_FONT_SUBPX_BGR
+	bool "Use BGR instead RGB for sub-pixel rendering"
+	help
+	  User BGR pixel format instead of RGB for sub-pixel rendering
+
 config LVGL_BUILD_IN_FONT_ROBOTO_12
 	bool "Enable build-in 12px fonts"
 	help
@@ -29,6 +34,16 @@ config LVGL_BUILD_IN_FONT_UNSCII_8
 	help
 	  Enable build-in monospace font support, size 8 pixels
 
+config LVGL_BUILD_IN_FONT_ROBOTO_28_COMPRESSED
+	bool "Enable build-in 28px compressed fonts"
+	help
+	  Enable build-in compressed font support, size 28 pixels
+
+config LVGL_BUILD_IN_FONT_ROBOTO_12_SUBPX
+	bool "Enable build-in 12px fonts with sub-pixel rendering"
+	help
+	  Enable build-in font support with sub-pixel rendering, size 12 pixels
+
 choice
 	prompt "Default LVGL font"
 	default LVGL_DEFAULT_FONT_BUILD_IN_UNSCII_8
@@ -53,6 +68,14 @@ choice
 		bool "Build-in monospace font"
 		depends on LVGL_BUILD_IN_FONT_UNSCII_8
 
+	config LVGL_DEFAULT_FONT_BUILD_IN_ROBOTO_28_COMPRESSED
+		bool "Build-in compressed font size 28"
+		depends on LVGL_BUILD_IN_FONT_ROBOTO_28_COMPRESSED
+
+	config LVGL_DEFAULT_FONT_BUILD_IN_ROBOTO_12_SUBPX
+		bool "Build-in font size 12 with sub-pixel rendering"
+		depends on LVGL_BUILD_IN_FONT_ROBOTO_12_SUBPX
+
 	config LVGL_DEFAULT_FONT_CUSTOM
 		bool "Custom font"
 		help

lib/gui/lvgl/Kconfig.objects

@@ -315,6 +315,11 @@ config LVGL_OBJ_LIST_FOCUS_TIME
 
 endif
 
+config LVGL_OBJ_COLOR_PICKER
+	bool "Color picker object"
+	help
+	  Enable color picker object support
+
 config LVGL_OBJ_DROP_DOWN_LIST
 	bool "Drop Down List object"
 	depends on LVGL_OBJ_LABEL && LVGL_OBJ_PAGE

lib/gui/lvgl/lv_conf.h

@@ -7,6 +7,11 @@
 #ifndef ZEPHYR_LIB_GUI_LVGL_LV_CONF_H_
 #define ZEPHYR_LIB_GUI_LVGL_LV_CONF_H_
 
+#ifdef CONFIG_LVGL_USE_DEBUG
+#include <sys/__assert.h>
+#define LV_DEBUG_ASSERT(expr, msg, value) __ASSERT(expr, msg)
+#endif
+
 /* Graphical settings */
 
 #define LV_HOR_RES_MAX	CONFIG_LVGL_HOR_RES
@@ -46,6 +51,12 @@
 		CONFIG_LVGL_CUSTOM_CHROMA_KEY_BLUE)
 #endif
 
+#ifdef CONFIG_LVGL_IMG_INDEXED_CHROMA
+#define LV_INDEXED_CHROMA 1
+#else
+#define LV_INDEXED_CHROMA 0
+#endif
+
 #ifdef CONFIG_LVGL_ANTIALIAS
 #define LV_ANTIALIAS 1
 #else
@@ -171,6 +182,8 @@ typedef void *lv_img_decoder_user_data_t;
 
 #define LV_ATTRIBUTE_LARGE_CONST
 
+#define LV_EXPORT_CONST_INT(int_value)
+
 /* HAL settings */
 
 #define LV_TICK_CUSTOM			1
@@ -200,6 +213,48 @@ typedef void *lv_indev_drv_user_data_t;
 #define LV_LOG_PRINTF 0
 #endif
 
+/* Debug settings */
+
+#ifdef CONFIG_LVGL_USE_DEBUG
+#define LV_USE_DEBUG 1
+#else
+#define LV_USE_DEBUG 0
+#endif
+
+#if LV_USE_DEBUG
+
+#ifdef CONFIG_LVGL_USE_ASSERT_NULL
+#define LV_USE_ASSERT_NULL 1
+#else
+#define LV_USE_ASSERT_NULL 0
+#endif
+
+#ifdef CONFIG_LVGL_USE_ASSERT_MEM
+#define LV_USE_ASSERT_MEM 1
+#else
+#define LV_USE_ASSERT_MEM 0
+#endif
+
+#ifdef CONFIG_LVGL_USE_ASSERT_STR
+#define LV_USE_ASSERT_STR 1
+#else
+#define LV_USE_ASSERT_STR 0
+#endif
+
+#ifdef CONFIG_LVGL_USE_ASSERT_OBJ
+#define LV_USE_ASSERT_OBJ 1
+#else
+#define LV_USE_ASSERT_OBJ 0
+#endif
+
+#ifdef CONFIG_LVGL_USE_ASSERT_STYLE
+#define LV_USE_ASSERT_STYLE 1
+#else
+#define LV_USE_ASSERT_STYLE 0
+#endif
+
+#endif /* LV_USE_DEBUG */
+
 /* THEME USAGE */
 
 #ifdef CONFIG_LVGL_THEMES
@@ -267,6 +322,12 @@ typedef void *lv_indev_drv_user_data_t;
 
 /* FONT USAGE */
 
+#ifdef CONFIG_LVGL_FONT_SUBPX_BGR
+#define LV_FONT_SUBPX_BGR 1
+#else
+#define LV_FONT_SUBPX_BGR 0
+#endif
+
 #ifdef CONFIG_LVGL_BUILD_IN_FONT_ROBOTO_12
 #define LV_FONT_ROBOTO_12 1
 #else
@@ -297,6 +358,18 @@ typedef void *lv_indev_drv_user_data_t;
 #define LV_FONT_UNSCII_8 0
 #endif
 
+#ifdef CONFIG_LVGL_BUILD_IN_FONT_ROBOTO_28_COMPRESSED
+#define LV_FONT_ROBOTO_28_COMPRESSED 1
+#else
+#define LV_FONT_ROBOTO_28_COMPRESSED 0
+#endif
+
+#ifdef CONFIG_LVGL_BUILD_IN_FONT_ROBOTO_12_SUBPX
+#define LV_FONT_ROBOTO_12_SUBPX 1
+#else
+#define LV_FONT_ROBOTO_12_SUBPX 0
+#endif
+
 #define LV_FONT_CUSTOM_DECLARE
 
 #ifdef CONFIG_LVGL_DEFAULT_FONT_BUILD_IN_ROBOTO_12
@@ -309,6 +382,10 @@ typedef void *lv_indev_drv_user_data_t;
 #define LV_FONT_DEFAULT		(&lv_font_roboto_28)
 #elif defined(CONFIG_LVGL_DEFAULT_FONT_BUILD_IN_UNSCII_8)
 #define LV_FONT_DEFAULT		(&lv_font_unscii_8)
+#elif defined(CONFIG_LVGL_DEFAULT_FONT_BUILD_IN_ROBOTO_28_COMPRESSED)
+#define LV_FONT_DEFAULT		(&lv_font_roboto_28_compressed)
+#elif defined(CONFIG_LVGL_DEFAULT_FONT_BUILD_IN_ROBOTO_12_SUBPX)
+#define LV_FONT_DEFAULT		(&lv_font_roboto_12_subpx)
 #elif defined(CONFIG_LVGL_DEFAULT_FONT_CUSTOM)
 extern void *lv_default_font_custom_ptr;
 #define LV_FONT_DEFAULT ((lv_font_t *) lv_default_font_custom_ptr)
@@ -324,7 +401,43 @@ typedef void *lv_font_user_data_t;
 #define LV_TXT_ENC LV_TXT_ENC_UTF8
 #endif
 
-#define LV_TXT_BREAK_CHARS	CONFIG_LVGL_TEXT_BREAK_CHARACTERS
+#define LV_TXT_BREAK_CHARS CONFIG_LVGL_TEXT_BREAK_CHARACTERS
+
+#define LV_TXT_LINE_BREAK_LONG_LEN CONFIG_LVGL_TEXT_LINE_BREAK_LONG_LEN
+
+#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN  \
+	CONFIG_LVGL_TEXT_LINE_BREAK_LONG_PRE_MIN_LEN
+
+#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN \
+	CONFIG_LVGL_TEXT_LINE_BREAK_LONG_POST_MIN_LEN
+
+#define LV_TXT_COLOR_CMD CONFIG_LVGL_TEXT_COLOR_CMD
+
+#ifdef CONFIG_LVGL_TEXT_USE_BIDI
+#define LV_USE_BIDI 1
+#else
+#define LV_USE_BIDI 0
+#endif
+
+#if LV_USE_BIDI
+
+#ifdef CONFIG_LVGL_TEXT_BIDI_DIR_LTR
+#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_LTR
+#elif defined(CONFIG_LVGL_TEXT_BIDI_DIR_RTL)
+#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_RTL
+#else
+#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO
+#endif
+
+#endif
+
+#define LV_SPRINTF_CUSTOM 1
+
+#if LV_SPRINTF_CUSTOM
+#define LV_SPRINTF_INCLUDE "stdio.h"
+#define lv_snprintf snprintf
+#define lv_vsnprintf vsnprintf
+#endif
 
 /* LV_OBJ SETTINGS */
 
@@ -414,6 +527,12 @@ typedef void *lv_obj_user_data_t;
 #define LV_USE_CONT 0
 #endif
 
+#ifdef CONFIG_LVGL_OBJ_COLOR_PICKER
+#define LV_USE_CPICKER 1
+#else
+#define LV_USE_CPICKER 0
+#endif
+
 #ifdef CONFIG_LVGL_OBJ_DROP_DOWN_LIST
 #define LV_USE_DDLIST 1
 #else