diff --git a/env_support/cmsis-pack/LVGL.lvgl.1.0.11-alpha.pack b/env_support/cmsis-pack/LVGL.lvgl.1.0.11.pack similarity index 73% rename from env_support/cmsis-pack/LVGL.lvgl.1.0.11-alpha.pack rename to env_support/cmsis-pack/LVGL.lvgl.1.0.11.pack index 1f70419b6..be5b66b44 100644 Binary files a/env_support/cmsis-pack/LVGL.lvgl.1.0.11-alpha.pack and b/env_support/cmsis-pack/LVGL.lvgl.1.0.11.pack differ diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc index 19ae055e4..79b181bca 100644 --- a/env_support/cmsis-pack/LVGL.lvgl.pdsc +++ b/env_support/cmsis-pack/LVGL.lvgl.pdsc @@ -36,7 +36,7 @@ https://github.com/lvgl/lvgl.git - + - LVGL 9.0.0-dev - Montyly update for November @@ -263,6 +263,7 @@ + @@ -400,7 +401,7 @@ - + @@ -454,7 +455,7 @@ An hardware acceleration from STM32-DMA2D - + @@ -468,7 +469,7 @@ An hardware acceleration from SWM341-DMA2D - + @@ -482,10 +483,10 @@ An hardware acceleration from NXP-PXP - - - - + + + + @@ -499,11 +500,11 @@ An hardware acceleration from NXP-VGLite - - - - - + + + + + @@ -517,7 +518,7 @@ An hardware acceleration from GD32-IPA - + @@ -533,34 +534,34 @@ - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + @@ -574,15 +575,15 @@ Add the binding for PikaScript, an ultra-light-weight python VM. - - - - - - - - - + + + + + + + + + @@ -601,8 +602,8 @@ Add PNG support - - + + @@ -617,7 +618,7 @@ Add BMP support - + @@ -632,7 +633,11 @@ Add freetype support, an extra librbary is required. - + + + + + @@ -647,8 +652,8 @@ Add GIF support - - + + @@ -663,8 +668,8 @@ Add sJPG support - - + + @@ -679,8 +684,8 @@ Add QRCode support - - + + @@ -695,9 +700,9 @@ Add FileSystem support - - - + + + @@ -706,7 +711,7 @@ Add RLOTTIE support, an extra librbary is required. - + @@ -721,7 +726,7 @@ Add ffmpeg support, an extra librbary is required. - + @@ -736,7 +741,7 @@ Add Pinyin input method - + @@ -751,8 +756,8 @@ Add Pinyin input method - - + + @@ -767,10 +772,10 @@ Add tiny ttf support - - + + - + @@ -785,21 +790,21 @@ Add the official benchmark. - - + + - - - - - - + + + + + + - - - + + + - + @@ -814,12 +819,12 @@ Add the demo:widgets - - + + - - - + + + diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx index 572be1573..f6e68b938 100644 --- a/env_support/cmsis-pack/LVGL.pidx +++ b/env_support/cmsis-pack/LVGL.pidx @@ -2,8 +2,8 @@ LVGL https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/ - 2022-11-16T03:10:00 + 2022-11-28T21:03:00 - + \ No newline at end of file diff --git a/env_support/cmsis-pack/README.md b/env_support/cmsis-pack/README.md index 7113b5cad..3721c5b33 100644 --- a/env_support/cmsis-pack/README.md +++ b/env_support/cmsis-pack/README.md @@ -123,9 +123,23 @@ Make sure `LV_MEM_SIZE` is no less than `(64*1024U)`. -10. Thoroughly remove the `3rd party libraries` section. +10. Remove following macro definitions in the `3rd party libraries` section: -11. rename '**lv_conf_template.h**' to '**lv_conf_cmsis.h**'. + - \#define LV_USE_FS_STDIO 0 + - \#define LV_USE_FS_POSIX 0 + - \#define LV_USE_FS_WIN32 0 + - \#define LV_USE_FS_FATFS 0 + - \#define LV_USE_PNG 0 + - \#define LV_USE_BMP 0 + - \#define LV_USE_SJPG 0 + - \#define LV_USE_GIF 0 + - \#define LV_USE_QRCODE 0 + - \#define LV_USE_FREETYPE 0 + - \#define LV_USE_TINY_TTF 0 + - \#define LV_USE_RLOTTIE 0 + - \#define LV_USE_FFMPEG 0 + +9. rename '**lv_conf_template.h**' to '**lv_conf_cmsis.h**'. diff --git a/env_support/cmsis-pack/gen_pack.sh b/env_support/cmsis-pack/gen_pack.sh index 54a8e83b0..8aa8a095e 100644 --- a/env_support/cmsis-pack/gen_pack.sh +++ b/env_support/cmsis-pack/gen_pack.sh @@ -21,8 +21,8 @@ if [ `uname -s` = "Linux" ] CMSIS_PACK_PATH="/home/$USER/.arm/Packs/ARM/CMSIS/5.7.0/" PATH_TO_ADD="$CMSIS_PACK_PATH/CMSIS/Utilities/Linux64/" else - CMSIS_PACK_PATH="/C/Users/gabriel/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0" - PATH_TO_ADD="/C/Program Files (x86)/7-Zip/:$CMSIS_PACK_PATH/CMSIS/Utilities/Win32/:/C/xmllint/" + CMSIS_PACK_PATH="/C/Users/$USER/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0" + PATH_TO_ADD="/C/Program Files (x86)/7-Zip/:/C/Program Files/7-Zip/:$CMSIS_PACK_PATH/CMSIS/Utilities/Win32/:/C/xmllint/" fi [[ ":$PATH:" != *":$PATH_TO_ADD}:"* ]] && PATH="${PATH}:${PATH_TO_ADD}" echo $PATH_TO_ADD appended to PATH diff --git a/env_support/cmsis-pack/lv_cmsis_pack.txt b/env_support/cmsis-pack/lv_cmsis_pack.txt index b24dd45c9..651d8fb51 100644 --- a/env_support/cmsis-pack/lv_cmsis_pack.txt +++ b/env_support/cmsis-pack/lv_cmsis_pack.txt @@ -98,12 +98,16 @@ * GLOBAL FUNCTIONS **********************/ -/* only arm compilers will use microLib that doesn't implement time() */ -#if defined(__MICROLIB) +/* When Arm Compilers using the MicroLib, provide an empty implementation for + * time() which is not included in the MicroLib + */ +#if defined(__IS_COMPILER_ARM_COMPILER__) && __IS_COMPILER_ARM_COMPILER__ +# if defined(__MICROLIB) __attribute__((weak)) _ARMABI time_t time(time_t * time) { return (time_t)(-1); } +# endif #endif diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index 27c173bdc..eece00c88 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -579,6 +579,68 @@ /*A layout similar to Grid in CSS.*/ #define LV_USE_GRID 1 +/*==================== + * 3RD PARTS LIBRARIES + *====================*/ + +/*API for fopen, fread, etc*/ +#if LV_USE_FS_STDIO + #define LV_FS_STDIO_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_STDIO_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_STDIO_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for open, read, etc*/ +#if LV_USE_FS_POSIX + #define LV_FS_POSIX_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_POSIX_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_POSIX_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for CreateFile, ReadFile, etc*/ +#if LV_USE_FS_WIN32 + #define LV_FS_WIN32_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_WIN32_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_WIN32_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/ +#if LV_USE_FS_FATFS + #define LV_FS_FATFS_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_FATFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +#if LV_USE_FREETYPE + /*Memory used by FreeType to cache characters [bytes]*/ + #define LV_FREETYPE_CACHE_SIZE (64 * 1024) + + /*Let FreeType to use LVGL memory and file porting*/ + #define LV_FREETYPE_USE_LVGL_PORT 0 + + /* 1: bitmap cache use the sbit cache, 0:bitmap cache use the image cache. */ + /* sbit cache:it is much more memory efficient for small bitmaps(font size < 256) */ + /* if font size >= 256, must be configured as image cache */ + #define LV_FREETYPE_SBIT_CACHE 0 + + /* Maximum number of opened FT_Face/FT_Size objects managed by this cache instance. */ + /* (0:use system defaults) */ + #define LV_FREETYPE_CACHE_FT_FACES 4 + #define LV_FREETYPE_CACHE_FT_SIZES 4 +#endif + +#if LV_USE_TINY_TTF + /* Enable loading TTF data from files */ + #define LV_TINY_TTF_FILE_SUPPORT 0 +#endif + + +/*FFmpeg library for image decoding and playing videos + *Supports all major image formats so do not enable other image decoder with it*/ +#if LV_USE_FFMPEG + /*Dump input information to stderr*/ + #define LV_FFMPEG_DUMP_FORMAT 0 +#endif + /*================== * OTHERS *==================*/