diff --git a/Kconfig b/Kconfig index 993266bd4..236284f3b 100644 --- a/Kconfig +++ b/Kconfig @@ -340,7 +340,7 @@ menu "LVGL configuration" which usually improves performance, but does not guarantee the same rendering quality as the software. - config LV_VG_LITE_LINEAER_GRAD_CACHE_CNT + config LV_VG_LITE_LINEAR_GRAD_CACHE_CNT int "VG-Lite linear gradient image maximum cache number." default 32 depends on LV_USE_DRAW_VG_LITE @@ -353,12 +353,6 @@ menu "LVGL configuration" depends on LV_USE_DRAW_VG_LITE help The memory usage of a single gradient image is radial grad radius * 4 bytes. - - config LV_USE_VECTOR_GRAPHIC - bool "Use Vector Graphic APIs" - default n - help - Enable drawing support vector graphic APIs. endmenu menu "Feature Configuration" @@ -1148,6 +1142,13 @@ menu "LVGL configuration" config LV_USE_RLOTTIE bool "Lottie library" + + config LV_USE_VECTOR_GRAPHIC + bool "Enable Vector Graphic APIs" + default n + help + Enable drawing support vector graphic APIs. + config LV_USE_THORVG bool "ThorVG library" choice diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index aabeaa30f..90dbb2315 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -190,7 +190,7 @@ /* VG-Lite linear gradient image maximum cache number. * NOTE: The memory usage of a single gradient image is 4K bytes. */ -#define LV_VG_LITE_LINEAER_GRAD_CACHE_CNT 32 +#define LV_VG_LITE_LINEAR_GRAD_CACHE_CNT 32 /* VG-Lite radial gradient image maximum cache size. * NOTE: The memory usage of a single gradient image is radial grad radius * 4 bytes. diff --git a/lv_conf_template.h b/lv_conf_template.h index bf6c5979a..24caf267a 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -204,7 +204,7 @@ /* VG-Lite linear gradient image maximum cache number. * NOTE: The memory usage of a single gradient image is 4K bytes. */ -#define LV_VG_LITE_LINEAER_GRAD_CACHE_CNT 32 +#define LV_VG_LITE_LINEAR_GRAD_CACHE_CNT 32 /* VG-Lite radial gradient image maximum cache size. * NOTE: The memory usage of a single gradient image is radial grad radius * 4 bytes. diff --git a/src/draw/vg_lite/lv_draw_vg_lite.c b/src/draw/vg_lite/lv_draw_vg_lite.c index 9487ab443..f150b963c 100644 --- a/src/draw/vg_lite/lv_draw_vg_lite.c +++ b/src/draw/vg_lite/lv_draw_vg_lite.c @@ -72,7 +72,7 @@ void lv_draw_vg_lite_init(void) unit->base_unit.delete_cb = draw_delete; lv_vg_lite_image_dsc_init(unit); - lv_vg_lite_grad_init(unit, LV_VG_LITE_LINEAER_GRAD_CACHE_CNT, LV_VG_LITE_RADIAL_GRAD_CACHE_CNT); + lv_vg_lite_grad_init(unit, LV_VG_LITE_LINEAR_GRAD_CACHE_CNT, LV_VG_LITE_RADIAL_GRAD_CACHE_CNT); lv_vg_lite_path_init(unit); lv_vg_lite_decoder_init(); } diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d56747ea4..0b6d14ecf 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -550,11 +550,11 @@ /* VG-Lite linear gradient image maximum cache number. * NOTE: The memory usage of a single gradient image is 4K bytes. */ -#ifndef LV_VG_LITE_LINEAER_GRAD_CACHE_CNT - #ifdef CONFIG_LV_VG_LITE_LINEAER_GRAD_CACHE_CNT - #define LV_VG_LITE_LINEAER_GRAD_CACHE_CNT CONFIG_LV_VG_LITE_LINEAER_GRAD_CACHE_CNT +#ifndef LV_VG_LITE_LINEAR_GRAD_CACHE_CNT + #ifdef CONFIG_LV_VG_LITE_LINEAR_GRAD_CACHE_CNT + #define LV_VG_LITE_LINEAR_GRAD_CACHE_CNT CONFIG_LV_VG_LITE_LINEAR_GRAD_CACHE_CNT #else - #define LV_VG_LITE_LINEAER_GRAD_CACHE_CNT 32 + #define LV_VG_LITE_LINEAR_GRAD_CACHE_CNT 32 #endif #endif