github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-01-23 23:50:00 +01:00
parent 8d3f43cf5c eaacde6722
commit f84720aa95
180 changed files with 774 additions and 2806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lv_conf_internal.h
View File

@@ -349,7 +349,6 @@
# endif
#endif
/* Gesture threshold in pixels */
#ifndef LV_INDEV_DEF_GESTURE_LIMIT
# ifdef CONFIG_LV_INDEV_DEF_GESTURE_LIMIT
@@ -602,7 +601,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
* (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 */
* Set it to 0 to disable caching */
#ifndef LV_IMG_CACHE_DEF_SIZE
# ifdef CONFIG_LV_IMG_CACHE_DEF_SIZE
# define LV_IMG_CACHE_DEF_SIZE CONFIG_LV_IMG_CACHE_DEF_SIZE
@@ -1363,15 +1362,15 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
# endif
#endif
#ifndef lv_snprintf
# ifdef CONFIG_lv_snprintf
# define lv_snprintf CONFIG_lv_snprintf
# ifdef CONFIG_LV_SNPRINTF
# define lv_snprintf CONFIG_LV_SNPRINTF
# else
# define lv_snprintf snprintf
# endif
#endif
#ifndef lv_vsnprintf
# ifdef CONFIG_lv_vsnprintf
# define lv_vsnprintf CONFIG_lv_vsnprintf
# ifdef CONFIG_LV_VSNPRINTF
# define lv_vsnprintf CONFIG_LV_VSNPRINTF
# else
# define lv_vsnprintf vsnprintf
# endif