1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-17 18:43:50 +01:00

Merge pull request #15404 from aabadie/pr/pkg/lvgl_v7.6.1

pkg/lvgl: bump to v7.7.1
This commit is contained in:
Alexandre Abadie 2020-11-09 08:20:26 +01:00 committed by GitHub
commit c6b1b3b06f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 3 deletions

View File

@ -1,6 +1,6 @@
PKG_NAME=lvgl PKG_NAME=lvgl
PKG_URL=https://github.com/littlevgl/lvgl PKG_URL=https://github.com/littlevgl/lvgl
PKG_VERSION=acb46aaed14ce607040771c2d9805140a5f482e4 # v7.3.0 PKG_VERSION=5035c0c7809d288d5b5d141a22b0bf9bf932cf1b # v7.7.1
PKG_LICENSE=MIT PKG_LICENSE=MIT
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

View File

@ -116,6 +116,10 @@ typedef int16_t lv_coord_t;
#define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/ #define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/
#endif /*LV_MEM_CUSTOM*/ #endif /*LV_MEM_CUSTOM*/
/* Use the standard memcpy and memset instead of LVGL's own functions.
* The standard functions might or might not be faster depending on their implementation. */
#define LV_MEMCPY_MEMSET_STD 0
/* Garbage Collector settings /* Garbage Collector settings
* Used if lvgl is binded to higher level language and the memory is managed by that language */ * Used if lvgl is binded to higher level language and the memory is managed by that language */
#define LV_ENABLE_GC 0 #define LV_ENABLE_GC 0
@ -149,6 +153,12 @@ typedef int16_t lv_coord_t;
* Time between `LV_EVENT_LONG_PRESSED_REPEAT */ * Time between `LV_EVENT_LONG_PRESSED_REPEAT */
#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 #define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100
/* Gesture threshold in pixels */
#define LV_INDEV_DEF_GESTURE_LIMIT 50
/* Gesture min velocity at release before swipe (pixels)*/
#define LV_INDEV_DEF_GESTURE_MIN_VELOCITY 3
/*================== /*==================
* Feature usage * Feature usage
*==================*/ *==================*/
@ -256,6 +266,9 @@ typedef void * lv_img_decoder_user_data_t;
/* Define a custom attribute to `lv_disp_flush_ready` function */ /* Define a custom attribute to `lv_disp_flush_ready` function */
#define LV_ATTRIBUTE_FLUSH_READY #define LV_ATTRIBUTE_FLUSH_READY
/* Required alignment size for buffers */
#define LV_ATTRIBUTE_MEM_ALIGN_SIZE
/* With size optimization (-Os) the compiler might not align data to /* With size optimization (-Os) the compiler might not align data to
* 4 or 8 byte boundary. This alignment will be explicitly applied where needed. * 4 or 8 byte boundary. This alignment will be explicitly applied where needed.
* E.g. __attribute__((aligned(4))) */ * E.g. __attribute__((aligned(4))) */
@ -339,6 +352,9 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i
/*Checks is the memory is successfully allocated or no. (Quite fast)*/ /*Checks is the memory is successfully allocated or no. (Quite fast)*/
#define LV_USE_ASSERT_MEM 1 #define LV_USE_ASSERT_MEM 1
/*Check the integrity of `lv_mem` after critical operations. (Slow)*/
#define LV_USE_ASSERT_MEM_INTEGRITY 0
/* Check the strings. /* Check the strings.
* Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow) * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow)
* If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
@ -443,7 +459,10 @@ typedef void * lv_font_user_data_t;
/* A fast and impressive theme. /* A fast and impressive theme.
* Flags: * Flags:
* LV_THEME_MATERIAL_FLAG_LIGHT: light theme * LV_THEME_MATERIAL_FLAG_LIGHT: light theme
* LV_THEME_MATERIAL_FLAG_DARK: dark theme*/ * LV_THEME_MATERIAL_FLAG_DARK: dark theme
* LV_THEME_MATERIAL_FLAG_NO_TRANSITION: disable transitions (state change animations)
* LV_THEME_MATERIAL_FLAG_NO_FOCUS: disable indication of focused state)
* */
#define LV_USE_THEME_MATERIAL 1 #define LV_USE_THEME_MATERIAL 1
/* Mono-color theme for monochrome displays. /* Mono-color theme for monochrome displays.
@ -479,7 +498,7 @@ typedef void * lv_font_user_data_t;
/* If a word is at least this long, will break wherever "prettiest" /* If a word is at least this long, will break wherever "prettiest"
* To disable, set to a value <= 0 */ * To disable, set to a value <= 0 */
#define LV_TXT_LINE_BREAK_LONG_LEN 12 #define LV_TXT_LINE_BREAK_LONG_LEN 0
/* Minimum number of characters in a long word to put on a line before a break. /* Minimum number of characters in a long word to put on a line before a break.
* Depends on LV_TXT_LINE_BREAK_LONG_LEN. */ * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */
@ -505,12 +524,19 @@ typedef void * lv_font_user_data_t;
#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO #define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO
#endif #endif
/* Enable Arabic/Persian processing
* In these languages characters should be replaced with
* an other form based on their position in the text */
#define LV_USE_ARABIC_PERSIAN_CHARS 0
/*Change the built in (v)snprintf functions*/ /*Change the built in (v)snprintf functions*/
#define LV_SPRINTF_CUSTOM 0 #define LV_SPRINTF_CUSTOM 0
#if LV_SPRINTF_CUSTOM #if LV_SPRINTF_CUSTOM
#define LV_SPRINTF_INCLUDE <stdio.h> #define LV_SPRINTF_INCLUDE <stdio.h>
#define lv_snprintf snprintf #define lv_snprintf snprintf
#define lv_vsnprintf vsnprintf #define lv_vsnprintf vsnprintf
#else /*!LV_SPRINTF_CUSTOM*/
#define LV_SPRINTF_DISABLE_FLOAT 1
#endif /*LV_SPRINTF_CUSTOM*/ #endif /*LV_SPRINTF_CUSTOM*/
/*=================== /*===================
@ -701,6 +727,7 @@ typedef void * lv_obj_user_data_t;
#define LV_USE_TABLE 1 #define LV_USE_TABLE 1
#if LV_USE_TABLE #if LV_USE_TABLE
# define LV_TABLE_COL_MAX 12 # define LV_TABLE_COL_MAX 12
# define LV_TABLE_CELL_STYLE_CNT 4
#endif #endif
/*Tab (dependencies: lv_page, lv_btnm)*/ /*Tab (dependencies: lv_page, lv_btnm)*/

View File

@ -8,4 +8,6 @@ USEPKG += lvgl
USEMODULE += lvgl_contrib USEMODULE += lvgl_contrib
USEMODULE += ili9341 USEMODULE += ili9341
CFLAGS += -DTHREAD_STACKSIZE_MAIN=2048
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

View File

@ -12,6 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \ nucleo-l053r8 \
saml10-xpro \ saml10-xpro \
saml11-xpro \ saml11-xpro \
spark-core \
stk3200 \ stk3200 \
stm32f030f4-demo \ stm32f030f4-demo \
stm32f0discovery \ stm32f0discovery \