mirrors/lvgl
0
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2024-11-27 03:33:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(kconfig): update Kconfig and lv_conf_kconfig.h (#4338)

Browse Source 
Signed-off-by: Peter Bee <bijunda1@xiaomi.com>
Signed-off-by: Peter Bee <pbjd97@gmail.com>
This commit is contained in:
Peter Bee 2023-07-10 05:27:32 +08:00 committed by GitHub
parent 8d375ef12e
commit 36c5f19c95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 124 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
Kconfig
View File

@ -21,6 +21,8 @@ menu "LVGL configuration"
config LV_COLOR_DEPTH_32
bool "32: ARGB8888"
config LV_COLOR_DEPTH_24
bool "24: RGB888"
config LV_COLOR_DEPTH_16
bool "16: RGB565"
config LV_COLOR_DEPTH_8
@ -34,6 +36,7 @@ menu "LVGL configuration"
default 1 if LV_COLOR_DEPTH_1
default 8 if LV_COLOR_DEPTH_8
default 16 if LV_COLOR_DEPTH_16
default 24 if LV_COLOR_DEPTH_24
default 32 if LV_COLOR_DEPTH_32
config LV_COLOR_MIX_ROUND_OFS
@ -57,28 +60,65 @@ menu "LVGL configuration"
endmenu
menu "Memory settings"
config LV_MEM_CUSTOM
bool "If true use custom malloc/free, otherwise use the built-in `lv_malloc()` and `lv_free()`"
choice
prompt "Malloc functions source"
default LV_USE_BUILTIN_MALLOC
config LV_USE_BUILTIN_MALLOC
bool "LVGL's built in implementation"
config LV_USE_CLIB_MALLOC
bool "Standard C functions malloc/realloc/free"
config LV_USE_CUSTOM_MALLOC
bool "Implement the functions externally"
endchoice # "Malloc functions"
choice
prompt "String functions source"
default LV_USE_BUILTIN_STRING
config LV_USE_BUILTIN_STRING
bool "LVGL's built in implementation"
config LV_USE_CLIB_STRING
bool "Standard C functions memcpy/memset/strlen/strcpy"
config LV_USE_CUSTOM_STRING
bool "Implement the functions externally"
endchoice # "String functions"
choice
prompt "Sprintf functions source"
default LV_USE_BUILTIN_SPRINTF
config LV_USE_BUILTIN_SPRINTF
bool "LVGL's built in implementation"
config LV_USE_CLIB_SPRINTF
bool "Standard C functions vsnprintf"
config LV_USE_CUSTOM_SPRINTF
bool "Implement the functions externally"
endchoice # "Sprintf functions"
config LV_MEM_SIZE_KILOBYTES
int "Size of the memory used by `lv_malloc()` in kilobytes (>= 2kB)"
default 32
depends on !LV_MEM_CUSTOM
depends on LV_USE_BUILTIN_MALLOC
config LV_MEM_POOL_EXPAND_SIZE_KILOBYTES
int "Size of the memory expand for `lv_malloc()` in kilobytes"
default 0
depends on !LV_MEM_CUSTOM
depends on LV_USE_BUILTIN_MALLOC
config LV_MEM_ADDR
config LV_MEM_ADR
hex "Address for the memory pool instead of allocating it as a normal array"
default 0x0
depends on !LV_MEM_CUSTOM
config LV_MEM_CUSTOM_INCLUDE
string "Header to include for the custom memory function"
default "stdlib.h"
depends on LV_MEM_CUSTOM
depends on LV_USE_BUILTIN_MALLOC
config LV_MEM_BUF_MAX_NUM
int "Number of the memory buffer"
@ -88,8 +128,6 @@ menu "LVGL configuration"
internal processing mechanisms. You will see an error log message if
there wasn't enough buffers.
config LV_MEMCPY_MEMSET_STD
bool "Use the standard memcpy and memset instead of LVGL's own functions"
endmenu
menu "HAL Settings"
@ -112,25 +150,32 @@ menu "LVGL configuration"
menu "Feature configuration"
menu "Drawing"
config LV_DRAW_COMPLEX
config LV_USE_DRAW_SW
bool "Enable software rendering"
default y
help
Required to draw anything on the screen.
config LV_DRAW_SW_COMPLEX
bool "Enable complex draw engine"
default y
depends on LV_USE_DRAW_SW
help
Required to draw shadow, gradient, rounded corners, circles, arc, skew lines,
image transformations or any masks.
config LV_SHADOW_CACHE_SIZE
config LV_DRAW_SW_SHADOW_CACHE_SIZE
int "Allow buffering some shadow calculation"
depends on LV_DRAW_COMPLEX
depends on LV_DRAW_SW_COMPLEX
default 0
help
LV_SHADOW_CACHE_SIZE is the max shadow size to buffer, where
LV_DRAW_SW_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.
Caching has LV_DRAW_SW_SHADOW_CACHE_SIZE^2 RAM cost.
config LV_CIRCLE_CACHE_SIZE
config LV_DRAW_SW_CIRCLE_CACHE_SIZE
int "Set number of maximally cached circle data"
depends on LV_DRAW_COMPLEX
depends on LV_DRAW_SW_COMPLEX
default 4
help
The circumference of 1/4 circle are saved for anti-aliasing
@ -138,9 +183,10 @@ menu "LVGL configuration"
radiuses are saved).
Set to 0 to disable caching.
config LV_LAYER_SIMPLE_BUF_SIZE
config LV_DRAW_SW_LAYER_SIMPLE_BUF_SIZE
int "Optimal size to buffer the widget with opacity"
default 24576
depends on LV_USE_DRAW_SW
help
"Simple layers" are used when a widget has `style_opa < 255`
to buffer the widget into a layer and blend it as an image
@ -150,6 +196,7 @@ menu "LVGL configuration"
config LV_IMG_CACHE_DEF_SIZE
int "Default image cache size. 0 to disable caching."
default 0
depends on LV_USE_DRAW_SW
help
If only the built-in image formats are used there is no real advantage of caching.
(I.e. no new image decoder is added).
@ -161,6 +208,7 @@ menu "LVGL configuration"
config LV_GRADIENT_MAX_STOPS
int "Number of stops allowed per gradient."
default 2
depends on LV_USE_DRAW_SW
help
Increase this to allow more stops.
This adds (sizeof(lv_color_t) + 1) bytes per additional stop
@ -168,6 +216,7 @@ menu "LVGL configuration"
config LV_GRAD_CACHE_DEF_SIZE
int "Default gradient buffer size."
default 0
depends on LV_USE_DRAW_SW
help
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.
@ -176,6 +225,7 @@ menu "LVGL configuration"
config LV_DITHER_GRADIENT
bool "Allow dithering the gradients"
depends on LV_USE_DRAW_SW
help
Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display)
LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface
@ -191,6 +241,7 @@ menu "LVGL configuration"
config LV_DISP_ROT_MAX_BUF
int "Maximum buffer size to allocate for rotation"
default 10240
depends on LV_USE_DRAW_SW
help
Only used if software rotation is enabled in the display driver.
endmenu
@ -338,7 +389,7 @@ menu "LVGL configuration"
bool "Enable/Disable LV_LOG_TRACE in anim module"
default y
depends on LV_USE_LOG
config LV_LOG_TRACE_MSG
bool "Enable/Disable LV_LOG_TRACE in msg module"
default y
@ -436,17 +487,13 @@ menu "LVGL configuration"
config LV_USE_REFR_DEBUG
bool "Draw random colored rectangles over the redrawn areas."
config LV_SPRINTF_CUSTOM
bool "Change the built-in (v)snprintf functions"
config LV_SPRINTF_INCLUDE
string "Header to include for the custom sprintf function"
depends on LV_SPRINTF_CUSTOM
default "stdio.h"
config LV_USE_BUILTIN_SNPRINTF
bool "Use the built-in (v)snprintf functions"
default y
config LV_SPRINTF_USE_FLOAT
bool "Enable float in built-in (v)snprintf functions"
depends on !LV_SPRINTF_CUSTOM
depends on LV_USE_BUILTIN_SNPRINTF
config LV_ENABLE_GC
bool "Enable garbage collector"
@ -811,9 +858,6 @@ menu "LVGL configuration"
config LV_USE_CHART
bool "Chart."
default y if !LV_CONF_MINIMAL
config LV_USE_COLORWHEEL
bool "Colorwheel."
default y if !LV_CONF_MINIMAL
config LV_USE_IMGBTN
bool "Imgbtn."
default y if !LV_CONF_MINIMAL
@ -1068,7 +1112,7 @@ menu "LVGL configuration"
help
Set the maximum number of candidate panels that can be displayed.
This needs to be adjusted according to the size of the screen.
config LV_USE_FILE_EXPLORER
bool "Enable file explorer"
default n

1
demos/music/lv_demo_music_main.c
View File

@ -784,7 +784,6 @@ static void spectrum_draw_event_cb(lv_event_t * e)
lv_opa_t opa = lv_obj_get_style_opa(obj, LV_PART_MAIN);
if(opa < LV_OPA_MIN) return;
lv_point_t poly[4];
lv_point_t center;
center.x = obj->coords.x1 + lv_obj_get_width(obj) / 2;
center.y = obj->coords.y1 + lv_obj_get_height(obj) / 2;

2
examples/widgets/chart/lv_example_chart_2.c
View File

@ -1,6 +1,6 @@
#include "../../lv_examples.h"
//TODO should be a chart feature
#if LV_USE_CHART && LV_USE_DRAW_MASKS && LV_BUILD_EXAMPLES && 0
#if LV_USE_CHART && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES && 0
static lv_obj_t * chart1;
static lv_chart_series_t * ser1;

2
examples/widgets/chart/lv_example_chart_8.c
View File

@ -1,6 +1,6 @@
#include "../../lv_examples.h"
//TODO Should be a chart feature
#if LV_USE_CHART && LV_USE_DRAW_MASKS && LV_BUILD_EXAMPLES && 0
#if LV_USE_CHART && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES && 0
/* A struct is used to keep track of the series list because later we need to draw to the series in the reverse order to which they were initialised. */
typedef struct {

2
examples/widgets/chart/lv_example_chart_9.c
View File

@ -1,5 +1,5 @@
#include "../../lv_examples.h"
#if LV_USE_CHART && LV_USE_DRAW_MASKS && LV_BUILD_EXAMPLES
#if LV_USE_CHART && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES
static void add_data(lv_timer_t * t)

2
examples/widgets/label/lv_example_label_4.c
View File

@ -1,6 +1,6 @@
#include "../../lv_examples.h"
//TODO
#if LV_USE_LABEL && LV_USE_CANVAS && LV_BUILD_EXAMPLES && LV_USE_DRAW_MASKS && 0
#if LV_USE_LABEL && LV_USE_CANVAS && LV_BUILD_EXAMPLES && LV_DRAW_SW_COMPLEX && 0
#define MASK_WIDTH 100
#define MASK_HEIGHT 45

2
examples/widgets/roller/lv_example_roller_3.c
View File

@ -1,6 +1,6 @@
#include "../../lv_examples.h"
//TODO
#if LV_USE_ROLLER && LV_USE_DRAW_MASKS && LV_BUILD_EXAMPLES && 0
#if LV_USE_ROLLER && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES && 0
static void mask_event_cb(lv_event_t * e)
{

3
src/font/lv_font_fmt_txt.c
View File

@ -387,6 +387,9 @@ static void decompress(const uint8_t * in, uint8_t * out, lv_coord_t w, lv_coord
case 4:
opa_table = opa4_table;
break;
default:
LV_LOG_WARN("%d bpp is not handled", bpp);
return;
}
rle_init(in, bpp);

36
src/lv_conf_kconfig.h
View File

@ -33,6 +33,42 @@ extern "C" {
# define CONFIG_LV_COLOR_CHROMA_KEY lv_color_hex(CONFIG_LV_COLOR_CHROMA_KEY_HEX)
#endif
/*******************
* LV_USE_STDLIB_MALLOC
*******************/
#if defined(CONFIG_LV_USE_BUILTIN_MALLOC)
# define CONFIG_LV_USE_STDLIB_MALLOC LV_STDLIB_BUILTIN
#elif defined(CONFIG_LV_USE_CLIB_MALLOC)
# define CONFIG_LV_USE_STDLIB_MALLOC LV_STDLIB_CLIB
#elif defined (CONFIG_LV_USE_CUSTOM_MALLOC)
# define CONFIG_LV_USE_STDLIB_MALLOC LV_STDLIB_CUSTOM
#endif
/*******************
* LV_USE_STDLIB_STRING
*******************/
#if defined(CONFIG_LV_USE_BUILTIN_STRING)
# define CONFIG_LV_USE_STDLIB_STRING LV_STDLIB_BUILTIN
#elif defined(CONFIG_LV_USE_CLIB_STRING)
# define CONFIG_LV_USE_STDLIB_STRING LV_STDLIB_CLIB
#elif defined (CONFIG_LV_USE_CUSTOM_STRING)
# define CONFIG_LV_USE_STDLIB_STRING LV_STDLIB_CUSTOM
#endif
/*******************
* LV_USE_STDLIB_SPRINTF
*******************/
#if defined(CONFIG_LV_USE_BUILTIN_SPRINTF)
# define CONFIG_LV_USE_STDLIB_SPRINTF LV_STDLIB_BUILTIN
#elif defined(CONFIG_LV_USE_CLIB_SPRINTF)
# define CONFIG_LV_USE_STDLIB_SPRINTF LV_STDLIB_CLIB
#elif defined (CONFIG_LV_USE_CUSTOM_SPRINTF)
# define CONFIG_LV_USE_STDLIB_SPRINTF LV_STDLIB_CUSTOM
#endif
/*******************
* LV_MEM_SIZE
*******************/

4
src/themes/basic/lv_theme_basic.c
View File

@ -34,7 +34,7 @@ typedef struct {
lv_style_t dark;
lv_style_t dim;
lv_style_t scrollbar;
#if LV_USE_ARC || LV_USE_COLORWHEEL
#if LV_USE_ARC
lv_style_t arc_line;
lv_style_t arc_knob;
#endif
@ -113,7 +113,7 @@ static void style_init(void)
lv_style_set_arc_width(&styles->dim, 2);
lv_style_set_arc_color(&styles->dim, COLOR_DIM);
#if LV_USE_ARC || LV_USE_COLORWHEEL
#if LV_USE_ARC
style_init_reset(&styles->arc_line);
lv_style_set_arc_width(&styles->arc_line, 6);
style_init_reset(&styles->arc_knob);

9
src/themes/default/lv_theme_default.c
View File

@ -122,10 +122,6 @@ typedef struct {
lv_style_t calendar_btnm_bg, calendar_btnm_day, calendar_header;
#endif
#if LV_USE_COLORWHEEL
lv_style_t colorwheel_main;
#endif
#if LV_USE_MENU
lv_style_t menu_bg, menu_cont, menu_sidebar_cont, menu_main_cont, menu_page, menu_header_cont, menu_header_btn,
menu_section, menu_pressed, menu_separator;
@ -581,11 +577,6 @@ static void style_init(void)
lv_style_set_pad_gap(&styles->calendar_header, PAD_SMALL);
#endif
#if LV_USE_COLORWHEEL
style_init_reset(&styles->colorwheel_main);
lv_style_set_arc_width(&styles->colorwheel_main, lv_disp_dpx(theme.disp, 10));
#endif
#if LV_USE_MSGBOX
/*To add space for for the button shadow*/
style_init_reset(&styles->msgbox_btn_bg);

2
tests/src/lv_test_conf_full.h
View File

@ -80,5 +80,3 @@
#define LV_USE_DEMO_MULTILANG 1
#define LV_USE_COLORWHEEL 0