lib: gui: lvgl: update to v7.6.1
Update LVGL to minor release 7.6.1 resolves: #29050 Signed-off-by: Jan Van Winkel <jan.van_winkel@dxplore.eu>
This commit is contained in:
Jan Van Winkel
Anas Nashif
parent
e4e3ab3cc3
commit
7c8ef52648
6 changed files with 158 additions and 8 deletions
|
|
@ -22,6 +22,21 @@ config LVGL_SHADOW_CACHE_SIZE
|
|||
Allow buffering some shadow calculation. This parameter is the maximum
|
||||
shadow size to buffer.
|
||||
|
||||
config LVGL_USE_OUTLINE
|
||||
bool "Enable outline drawing on rectangles"
|
||||
help
|
||||
Enable outline drawing on rectangles
|
||||
|
||||
config LVGL_USE_PATTERN
|
||||
bool "Enable pattern drawing on rectangles"
|
||||
help
|
||||
Enable pattern drawing on rectangles
|
||||
|
||||
config LVGL_USE_VALUE_STR
|
||||
bool "Enable value string drawing on rectangles"
|
||||
help
|
||||
Enable value string drawing on rectangles
|
||||
|
||||
config LVGL_USE_BLEND_MODES
|
||||
bool "Enable other blend modes"
|
||||
help
|
||||
|
|
@ -66,4 +81,9 @@ config LVGL_USE_API_EXTENSION_V6
|
|||
help
|
||||
Use the functions and types from the older API if possible
|
||||
|
||||
config LVGL_USE_API_EXTENSION_V7
|
||||
bool "Enable V7 API extensions"
|
||||
help
|
||||
Use the functions and types from the older API if possible
|
||||
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -3,11 +3,33 @@
|
|||
|
||||
menu "Fonts"
|
||||
|
||||
config LVGL_USE_FONT_COMPRESSED
|
||||
bool "Enable compressed font support"
|
||||
help
|
||||
Enable support for compressed fonts. If it's disabled, compressed
|
||||
glyphs cannot be processed by the library and won't be rendered.
|
||||
|
||||
config LVGL_USE_FONT_SUBPX
|
||||
bool "Enable sub-pixel rendering"
|
||||
help
|
||||
Enable sub-pixel rendering
|
||||
|
||||
config LVGL_FONT_SUBPX_BGR
|
||||
bool "Use BGR instead RGB for sub-pixel rendering"
|
||||
depends on LVGL_USE_FONT_SUBPX
|
||||
help
|
||||
User BGR pixel format instead of RGB for sub-pixel rendering
|
||||
|
||||
config LVGL_FONT_MONTSERRAT_8
|
||||
bool "Enable Montserrat 8px font"
|
||||
help
|
||||
Enable Montserrat font support, size 8 pixels
|
||||
|
||||
config LVGL_FONT_MONTSERRAT_10
|
||||
bool "Enable Montserrat 10px font"
|
||||
help
|
||||
Enable Montserrat font support, size 10 pixels
|
||||
|
||||
config LVGL_FONT_MONTSERRAT_12
|
||||
bool "Enable Montserrat 12px font"
|
||||
help
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ config LVGL_USE_CALENDAR
|
|||
help
|
||||
Enable calendar object support
|
||||
|
||||
config LVGL_CALENDAR_WEEK_STARTS_MONDAY
|
||||
bool "Calendar week starts on Monday"
|
||||
depends on LVGL_USE_CALENDAR
|
||||
help
|
||||
Start a calendar week on Monday
|
||||
|
||||
config LVGL_USE_CANVAS
|
||||
bool "Canvas object"
|
||||
depends on LVGL_USE_IMG
|
||||
|
|
|
|||
|
|
@ -42,6 +42,16 @@ choice
|
|||
bool "Dark"
|
||||
endchoice
|
||||
|
||||
config LVGL_THEME_MATERIAL_FLAG_NO_TRANSITION
|
||||
bool "Disable transitions"
|
||||
help
|
||||
Disable transitions in material theme
|
||||
|
||||
config LVGL_THEME_MATERIAL_FLAG_NO_FOCUS
|
||||
bool "Disable focus"
|
||||
help
|
||||
Disable indication of focused state in material theme
|
||||
|
||||
endif # LVGL_USE_THEME_MATERIAL
|
||||
|
||||
if LVGL_USE_THEME_CUSTOM
|
||||
|
|
@ -231,6 +241,14 @@ choice
|
|||
prompt "Default theme small font"
|
||||
default LVGL_THEME_DEFAULT_FONT_SMALL_UNSCII_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_8
|
||||
bool "Build-in font size 8"
|
||||
depends on LVGL_FONT_MONTSERRAT_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_10
|
||||
bool "Build-in font size 10"
|
||||
depends on LVGL_FONT_MONTSERRAT_10
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_12
|
||||
bool "Build-in font size 12"
|
||||
depends on LVGL_FONT_MONTSERRAT_12
|
||||
|
|
@ -340,6 +358,14 @@ choice
|
|||
prompt "Default theme normal font"
|
||||
default LVGL_THEME_DEFAULT_FONT_NORMAL_UNSCII_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_8
|
||||
bool "Build-in font size 8"
|
||||
depends on LVGL_FONT_MONTSERRAT_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_10
|
||||
bool "Build-in font size 10"
|
||||
depends on LVGL_FONT_MONTSERRAT_10
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_12
|
||||
bool "Build-in font size 12"
|
||||
depends on LVGL_FONT_MONTSERRAT_12
|
||||
|
|
@ -449,6 +475,14 @@ choice
|
|||
prompt "Default theme subtitle font"
|
||||
default LVGL_THEME_DEFAULT_FONT_SUBTITLE_UNSCII_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_8
|
||||
bool "Build-in font size 8"
|
||||
depends on LVGL_FONT_MONTSERRAT_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_10
|
||||
bool "Build-in font size 10"
|
||||
depends on LVGL_FONT_MONTSERRAT_10
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_12
|
||||
bool "Build-in font size 12"
|
||||
depends on LVGL_FONT_MONTSERRAT_12
|
||||
|
|
@ -558,6 +592,14 @@ choice
|
|||
prompt "Default theme title font"
|
||||
default LVGL_THEME_DEFAULT_FONT_TITLE_UNSCII_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_8
|
||||
bool "Build-in font size 8"
|
||||
depends on LVGL_FONT_MONTSERRAT_8
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_10
|
||||
bool "Build-in font size 10"
|
||||
depends on LVGL_FONT_MONTSERRAT_10
|
||||
|
||||
config LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_12
|
||||
bool "Build-in font size 12"
|
||||
depends on LVGL_FONT_MONTSERRAT_12
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
|
||||
* Copyright (c) 2018-2020 Jan Van Winkel <jan.van_winkel@dxplore.eu>
|
||||
* Copyright (c) 2020 Teslabs Engineering S.L.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
|
|
@ -63,6 +63,8 @@ typedef short lv_coord_t;
|
|||
|
||||
#define LV_MEM_CUSTOM 1
|
||||
|
||||
#define LV_MEMCPY_MEMSET_STD 1
|
||||
|
||||
#ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL
|
||||
|
||||
#define LV_MEM_CUSTOM_INCLUDE "kernel.h"
|
||||
|
|
@ -115,6 +117,12 @@ typedef void *lv_anim_user_data_t;
|
|||
#define LV_SHADOW_CACHE_SIZE CONFIG_LVGL_SHADOW_CACHE_SIZE
|
||||
#endif
|
||||
|
||||
#define LV_USE_OUTLINE IS_ENABLED(CONFIG_LVGL_USE_OUTLINE)
|
||||
|
||||
#define LV_USE_PATTERN IS_ENABLED(CONFIG_LVGL_USE_PATTERN)
|
||||
|
||||
#define LV_USE_VALUE_STR IS_ENABLED(CONFIG_LVGL_USE_VALUE_STR)
|
||||
|
||||
#define LV_USE_BLEND_MODES IS_ENABLED(CONFIG_LVGL_USE_BLEND_MODES)
|
||||
|
||||
#define LV_USE_OPA_SCALE IS_ENABLED(CONFIG_LVGL_USE_OPA_SCALE)
|
||||
|
|
@ -140,6 +148,7 @@ typedef void *lv_fs_drv_user_data_t;
|
|||
#define LV_USE_PERF_MONITOR IS_ENABLED(CONFIG_LVGL_USE_PERF_MONITOR)
|
||||
|
||||
#define LV_USE_API_EXTENSION_V6 IS_ENABLED(CONFIG_LVGL_USE_API_EXTENSION_V6)
|
||||
#define LV_USE_API_EXTENSION_V7 IS_ENABLED(CONFIG_LVGL_USE_API_EXTENSION_V7)
|
||||
|
||||
/* Image decoder and cache */
|
||||
|
||||
|
|
@ -153,6 +162,8 @@ typedef void *lv_img_decoder_user_data_t;
|
|||
|
||||
/* Compiler settings */
|
||||
|
||||
#define LV_BIG_ENDIAN_SYSTEM IS_ENABLED(CONFIG_BIG_ENDIAN)
|
||||
|
||||
#define LV_ATTRIBUTE_TICK_INC
|
||||
|
||||
#define LV_ATTRIBUTE_TASK_HANDLER
|
||||
|
|
@ -229,11 +240,30 @@ typedef void *lv_indev_drv_user_data_t;
|
|||
#define LV_THEME_DEFAULT_INIT lv_theme_material_init
|
||||
|
||||
#if defined(CONFIG_LVGL_THEME_MATERIAL_LIGHT)
|
||||
#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_LIGHT
|
||||
#define LVGL_THEME_MATERIAL_LIGHT_DARK_FLAG LV_THEME_MATERIAL_FLAG_LIGHT
|
||||
#elif defined(CONFIG_LVGL_THEME_MATERIAL_DARK)
|
||||
#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_DARK
|
||||
#define LVGL_THEME_MATERIAL_LIGHT_DARK_FLAG LV_THEME_MATERIAL_FLAG_DARK
|
||||
#else
|
||||
#define LVGL_THEME_MATERIAL_LIGHT_DARK_FLAG 0
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_LVGL_THEME_MATERIAL_FLAG_NO_TRANSITION)
|
||||
#define LVGL_THEME_MATERIAL_FLAG_NO_TRANSITION LV_THEME_MATERIAL_FLAG_NO_TRANSITION
|
||||
#else
|
||||
#define LVGL_THEME_MATERIAL_FLAG_NO_TRANSITION 0
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_LVGL_THEME_MATERIAL_FLAG_NO_FOCUS)
|
||||
#define LVGL_THEME_MATERIAL_FLAG_NO_FOCUS LV_THEME_MATERIAL_FLAG_NO_FOCUS
|
||||
#else
|
||||
#define LVGL_THEME_MATERIAL_FLAG_NO_FOCUS 0
|
||||
#endif
|
||||
|
||||
#define LV_THEME_DEFAULT_FLAG \
|
||||
(LVGL_THEME_MATERIAL_LIGHT_DARK_FLAG | \
|
||||
LVGL_THEME_MATERIAL_FLAG_NO_TRANSITION | \
|
||||
LVGL_THEME_MATERIAL_FLAG_NO_FOCUS)
|
||||
|
||||
#endif
|
||||
|
||||
/* Mono-color theme */
|
||||
|
|
@ -345,7 +375,11 @@ lv_theme_t *LVGL_THEME_CUSTOM_INIT_FUNCTION(
|
|||
#endif
|
||||
|
||||
/* Theme small font */
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_12)
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_8)
|
||||
#define LV_THEME_DEFAULT_FONT_SMALL (&lv_font_montserrat_8)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_10)
|
||||
#define LV_THEME_DEFAULT_FONT_SMALL (&lv_font_montserrat_10)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_12)
|
||||
#define LV_THEME_DEFAULT_FONT_SMALL (&lv_font_montserrat_12)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_14)
|
||||
#define LV_THEME_DEFAULT_FONT_SMALL (&lv_font_montserrat_14)
|
||||
|
|
@ -400,7 +434,11 @@ extern void *lv_theme_default_font_small_custom_ptr;
|
|||
#endif
|
||||
|
||||
/* Theme normal font */
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_12)
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_8)
|
||||
#define LV_THEME_DEFAULT_FONT_NORMAL (&lv_font_montserrat_8)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_10)
|
||||
#define LV_THEME_DEFAULT_FONT_NORMAL (&lv_font_montserrat_10)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_12)
|
||||
#define LV_THEME_DEFAULT_FONT_NORMAL (&lv_font_montserrat_12)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_14)
|
||||
#define LV_THEME_DEFAULT_FONT_NORMAL (&lv_font_montserrat_14)
|
||||
|
|
@ -455,7 +493,11 @@ extern void *lv_theme_default_font_normal_custom_ptr;
|
|||
#endif
|
||||
|
||||
/* Theme subtitle font */
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_12)
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_8)
|
||||
#define LV_THEME_DEFAULT_FONT_SUBTITLE (&lv_font_montserrat_8)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_10)
|
||||
#define LV_THEME_DEFAULT_FONT_SUBTITLE (&lv_font_montserrat_10)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_12)
|
||||
#define LV_THEME_DEFAULT_FONT_SUBTITLE (&lv_font_montserrat_12)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_SUBTITLE_MONTSERRAT_14)
|
||||
#define LV_THEME_DEFAULT_FONT_SUBTITLE (&lv_font_montserrat_14)
|
||||
|
|
@ -510,7 +552,11 @@ extern void *lv_theme_default_font_subtitle_custom_ptr;
|
|||
#endif
|
||||
|
||||
/* Theme title font */
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_12)
|
||||
#if defined(CONFIG_LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_8)
|
||||
#define LV_THEME_DEFAULT_FONT_TITLE (&lv_font_montserrat_8)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_10)
|
||||
#define LV_THEME_DEFAULT_FONT_TITLE (&lv_font_montserrat_10)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_12)
|
||||
#define LV_THEME_DEFAULT_FONT_TITLE (&lv_font_montserrat_12)
|
||||
#elif defined(CONFIG_LVGL_THEME_DEFAULT_FONT_TITLE_MONTSERRAT_14)
|
||||
#define LV_THEME_DEFAULT_FONT_TITLE (&lv_font_montserrat_14)
|
||||
|
|
@ -566,6 +612,10 @@ extern void *lv_theme_default_font_title_custom_ptr;
|
|||
|
||||
/* FONT USAGE */
|
||||
|
||||
#define LV_FONT_MONTSERRAT_8 IS_ENABLED(CONFIG_LVGL_FONT_MONTSERRAT_8)
|
||||
|
||||
#define LV_FONT_MONTSERRAT_10 IS_ENABLED(CONFIG_LVGL_FONT_MONTSERRAT_10)
|
||||
|
||||
#define LV_FONT_MONTSERRAT_12 IS_ENABLED(CONFIG_LVGL_FONT_MONTSERRAT_12)
|
||||
|
||||
#define LV_FONT_MONTSERRAT_14 IS_ENABLED(CONFIG_LVGL_FONT_MONTSERRAT_14)
|
||||
|
|
@ -614,7 +664,13 @@ extern void *lv_theme_default_font_title_custom_ptr;
|
|||
|
||||
#define LV_FONT_UNSCII_8 IS_ENABLED(CONFIG_LVGL_FONT_UNSCII_8)
|
||||
|
||||
#define LV_USE_FONT_COMPRESSED IS_ENABLED(CONFIG_LVGL_USE_FONT_COMPRESSED)
|
||||
|
||||
#define LV_USE_FONT_SUBPX IS_ENABLED(CONFIG_LVGL_USE_FONT_SUBPX)
|
||||
|
||||
#if LV_USE_FONT_SUBPX
|
||||
#define LV_FONT_SUBPX_BGR IS_ENABLED(CONFIG_LVGL_FONT_SUBPX_BGR)
|
||||
#endif
|
||||
|
||||
#define LV_FONT_CUSTOM_DECLARE
|
||||
|
||||
|
|
@ -690,6 +746,10 @@ typedef void *lv_obj_user_data_t;
|
|||
|
||||
#define LV_USE_CALENDAR IS_ENABLED(CONFIG_LVGL_USE_CALENDAR)
|
||||
|
||||
#if LV_USE_CALENDAR
|
||||
#define LV_CALENDAR_WEEK_STARTS_MONDAY IS_ENABLED(CONFIG_LVGL_CALENDAR_WEEK_STARTS_MONDAY)
|
||||
#endif
|
||||
|
||||
#define LV_USE_CANVAS IS_ENABLED(CONFIG_LVGL_USE_CANVAS)
|
||||
|
||||
#define LV_USE_CHECKBOX IS_ENABLED(CONFIG_LVGL_USE_CHECKBOX)
|
||||
|
|
|
|||
2
west.yml
2
west.yml
|
|
@ -87,7 +87,7 @@ manifest:
|
|||
revision: 7deb3aab1cc430a7650143f9833cfc8ddad76eb5
|
||||
path: modules/hal/quicklogic
|
||||
- name: lvgl
|
||||
revision: 928b61c7c8ef5f770f10e6fd36d4fea0cf375b5e
|
||||
revision: 9339a1331cc36e82c180d8277ab22953282595d9
|
||||
path: modules/lib/gui/lvgl
|
||||
- name: mbedtls
|
||||
revision: aef137b1af8aa7a0f43345c82459254b8832262e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue