diff --git a/env_support/cmsis-pack/LVGL.lvgl.9.0.0-dev.pack b/env_support/cmsis-pack/LVGL.lvgl.9.0.0-dev.pack index bd2c75999..5fbc03622 100644 Binary files a/env_support/cmsis-pack/LVGL.lvgl.9.0.0-dev.pack and b/env_support/cmsis-pack/LVGL.lvgl.9.0.0-dev.pack differ diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc index 27b06f2f3..c4e9a56f2 100644 --- a/env_support/cmsis-pack/LVGL.lvgl.pdsc +++ b/env_support/cmsis-pack/LVGL.lvgl.pdsc @@ -20,7 +20,7 @@ --> - + LVGL lvgl LVGL (Light and Versatile Graphics Library) is a free and open-source graphics library providing everything you need to create an embedded GUI with easy-to-use graphical elements, beautiful visual effects and a low memory footprint. @@ -36,20 +36,41 @@ https://github.com/lvgl/lvgl.git - - - LVGL 8.3.7 release - - Various fixes - - - - LVGL 8.3.6 release - - Various fixes - - + - LVGL 9.0.0-dev - New Driver Architecture - Other fixes - - + + + - LVGL 8.3.11 + - Add LittleFS Library to LVGL8 + - Backport Tiny TTF to LVGL8 + - Some minor fixes + + + - LVGL 8.3.10 + - Some minor fixes + + + - LVGL 8.3.10 + - Add snapshot, fragment, imgfont, gridnav, msg and monkey + - Other minor fixes + + + - LVGL 8.3.8 + - Add renesas-ra6m3 gpu adaptation + - Improve performance and add more features for PXP and VGLite + - Minor updates + + + - LVGL 8.3.7 release + - Various fixes + + + - LVGL 8.3.6 release + - Various fixes + + - LVGL 8.3.5 release - Use LVGL version as the cmsis-pack version - Fix GPU support for NXP PXP and NXP VGLite @@ -176,8 +197,6 @@ - - Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors. @@ -202,10 +221,48 @@ --> + + + + + + + + + + Support All Cortex-M based processors + + + + + + + + + + + + + + + + + + Support All Cortex-M based processors + + + + + Require LVGL Essential Service - + @@ -215,68 +272,62 @@ Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + Enable LVGL Arm-2D GPU Support - - - - - - - + + + + + + @@ -311,68 +362,105 @@ --> - + LVGL (Light and Versatile Graphics Library) is a free and open-source graphics library providing everything you need to create an embedded GUI with easy-to-use graphical elements, beautiful visual effects and a low memory footprint. - + The Essential services of LVGL (without extra content) + + + + - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -396,118 +484,133 @@ - - - - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + + + + + + - - - - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + @@ -524,22 +627,229 @@ + + + Add the support for pthreads + + + - + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_PTHREAD + + + + + + + Add the support for FreeRTOS + + + + + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_FREERTOS + + + + + + + Add the support for CMSIS-RTOS2 APIs + + + + + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_CMSIS_RTOS2 + + + + + + + Add the support for RT-Thread APIs + + + + + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_RTTHREAD + + + + + + + Add the support for Windows APIs + + + + + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_WINDOWS + + + + + + + Add a user customized (RT)OS support + + + + + + + +/* Select an operating system to use. Possible options: + * - LV_OS_NONE + * - LV_OS_PTHREAD + * - LV_OS_FREERTOS + * - LV_OS_CMSIS_RTOS2 + * - LV_OS_RTTHREAD + * - LV_OS_WINDOWS + * - LV_OS_CUSTOM + */ +#define LV_USE_OS LV_OS_CUSTOM +#define LV_OS_CUSTOM_INCLUDE "lv_os_custom.h" + + + + + + Porting Templates - - + + - - + + - - + + - + + + An hardware acceleration from NXP-PXP + + + + + + + + + + + + + + +/*! \brief enable NXP PXP */ +#define LV_USE_DRAW_PXP 1 + + + + + + An hardware acceleration from NXP-VGLite + + + + + + + + + + + + + + + + + + + + +/*! \brief enable NXP VGLite */ +#define LV_USE_DRAW_VGLITE 1 + + + + + + Using existing SDL2 APIs for acceleration + + + + + + +/*! \brief enable SDL2 acceleration*/ +#define LV_USE_DRAW_SDL 1 + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/*! \brief use extra themes, widgets and layouts */ -#define RTE_GRAPHICS_LVGL_USE_EXTRA_THEMES - - - - - + --> + + - - Add PNG support - - - - - - - - -/*! \brief enable PNG support */ -#define LV_USE_LODEPNG 1 - - - - - - Add BMP support - - - - - - - -/*! \brief enable BMP support */ -#define LV_USE_BMP 1 - - - - - - Add BMP support + + Add the Barcode code library @@ -749,15 +951,46 @@ - - Add freetype support, an extra librbary is required. + + Add BMP decoder library + + + + + + + +/*! \brief enable BMP support */ +#define LV_USE_BMP 1 + + + + + + + Add FFmpeg library for image decoding and playing videos, an extra librbary is required. + + + + + + + +/*! \brief enable ffmpeg support */ +#define LV_USE_FFMPEG 1 + + + + + + Add FreeType library, an extra librbary is required. - + + + - - @@ -768,7 +1001,85 @@ - + + + Add API for FATFS (needs to be added separately). Uses f_open, f_read, etc + + + + + + + +/*! \brief enable FATFS support */ +#define LV_USE_FS_FATFS 1 + + + + + + Add API for memory-mapped file access. + + + + + + + +/*! \brief enable memory-mapped file access */ +#define LV_USE_FS_MEMFS 1 + + + + + + Add API for file access via POSIX + + + + + + + +/*! \brief enable POSIX file access */ +#define LV_USE_FS_POSIX 1 + + + + + + Add API for file access via STDIO + + + + + + + +/*! \brief enable STDIO file access */ +#define LV_USE_FS_STDIO 1 + + + + + + + Add GIF support @@ -784,7 +1095,87 @@ - + + Add libjpeg-turbo decoder library + + + + + + + +/*! \brief enable ibjpeg-turbo decoder */ +#define LV_USE_LIBJPEG_TURBO 1 + + + + + + Add PNG decoder(libpng) library + + + + + + + +/*! \brief enable PNG decoder(libpng) library */ +#define LV_USE_LIBPNG 1 + + + + + + Add LODEPNG decoder library + + + + + + + + +/*! \brief enable LODEPNG decoder library */ +#define LV_USE_LODEPNG 1 + + + + + + Add LZ4 compress/decompress lib + + + + + + + +/*! \brief enable LZ4 compress/decompress lib */ +#define LV_USE_LZ4 1 +#define LV_USE_LZ4_INTERNAL 1 +#define LV_USE_LZ4_EXTERNAL 0 + + + + + + Add QR code library + + + + + + + + +/*! \brief enable QR code library */ +#define LV_USE_QRCODE 1 + + + + + + Add LVGL's version of RLE compression method support @@ -797,8 +1188,89 @@ - - Add sJPG support + + Add Rlottie library, an extra librbary is required. + + + + + + + +/*! \brief enable Rlottie library */ +#define LV_USE_RLOTTIE 1 + + + + + + Add ThorVG (vector graphics library), an extra librbary is required. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/*! \brief enable ThorVG (vector graphics library) */ +#define LV_USE_VECTOR_GRAPHIC 1 +#define LV_USE_THORVG_INTERNAL 1 +#define LV_USE_THORVG_EXTERNAL 0 + + + + + + Add Built-in TTF decoder + + + + + + + + +/*! \brief enable Built-in TTF decoder */ +#define LV_USE_TINY_TTF 1 + + + + + + Add JPG + split JPG decoder library. Split JPG is a custom format optimized for embedded systems. @@ -807,85 +1279,14 @@ -/*! \brief enable sJPG support */ -#define LV_USE_SJPG 1 +/*! \brief enable JPG + split JPG decoder library. */ +#define LV_USE_TJPGD 1 - - Add QRCode support - - - - - - - -/*! \brief enable QRCode support */ -#define LV_USE_QRCODE 1 - - - - - - Add FileSystem support - - - - - - - - - - - Add RLOTTIE support, an extra librbary is required. - - - - - - - -/*! \brief enable RLOTTIE support */ -#define LV_USE_RLOTTIE 1 - - - - - - Add ffmpeg support, an extra librbary is required. - - - - - - - -/*! \brief enable ffmpeg support */ -#define LV_USE_FFMPEG 1 - - - - - - Add Pinyin input method - - - - - - - -/*! \brief enable pinying support */ -#define LV_USE_IME_PINYIN 1 - - - - - + Add a file explorer @@ -899,37 +1300,124 @@ - - - Add the Tiny TTF support + + + Add the Fragment service - - - - + + + -/*! \brief enable tiny ttf support */ -#define LV_USE_TINY_TTF 1 +/*! \brief enable lv_obj fragment */ +#define LV_USE_FRAGMENT 1 + + + + + + Add the Grid Navigation service + + + + + + + +/*! \brief enable the Grid Navigation support*/ +#define LV_USE_GRIDNAV 1 - + + Add Pinyin input method + + + + + + + +/*! \brief Pinyin input method */ +#define LV_USE_IME_PINYIN 1 + + + + + + Add Support for using images as font in label or span widgets + + + + + + + +/*! \brief Support using images as font in label or span widgets */ +#define LV_USE_IMGFONT 1 + + + + + + Add the Monkey test service + + + + + + + +/*! \brief enable Monkey test*/ +#define LV_USE_MONKEY 1 + + + + + + Add an observer pattern implementation + + + + + + + +/*! \brief enable an observer pattern implementation*/ +#define LV_USE_OBSERVER 1 + + + + + + Add the API to take snapshot for object + + + + + + + +/*! \brief enable API to take snapshot for object */ +#define LV_USE_SNAPSHOT 1 + + + + + + Add the official benchmark. - - - @@ -941,27 +1429,271 @@ /*! \brief enable demo:bencharmk */ -#define LV_USE_DEMO_BENCHMARK 1 +#define LV_USE_DEMO_BENCHMARK 1 - + + Add the Flex layout demo + + + + + + + + + + + + +/*! \brief enable the Flex layout demo */ +#define LV_USE_DEMO_FLEX_LAYOUT 1 + + + + + + Add the demonstrate the usage of encoder and keyboard + + + + + + + + +/*! \brief enable the demonstrate the usage of encoder and keyboard */ +#define LV_USE_DEMO_KEYPAD_AND_ENCODER 1 + + + + + + + Add the Smart-phone like multi-language demo. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/*! \brief enable the Smart-phone like multi-language demo */ +#define LV_USE_DEMO_MULTILANG 1 + + + + + + Add the music player demo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/*! \brief enable the music player demo */ +#define LV_USE_DEMO_MUSIC 1 + + + + + + Add the demonstration for scroll settings + + + + + + + +/*! \brief enable the demonstration for scroll settings */ +#define LV_USE_DEMO_SCROLL 1 + + + + + + Add the Stress test for LVGL + + + + + + + +/*! \brief enable the Stress test for LVGL */ +#define LV_USE_DEMO_STRESS 1 + + + + + + Add the Widget transformation demo + + + + + + + + +/*! \brief enable the Widget transformation demo */ +#define LV_USE_DEMO_TRANSFORM 1 + + + + + + Add the Vector graphic demo + + + + + + + + +/*! \brief enable the Vector graphic demo */ +#define LV_USE_DEMO_VECTOR_GRAPHIC 1 + + + + + Add the demo:widgets - + /*! \brief enable demo:widgets support */ -#define LV_USE_DEMO_WIDGETS 1 +#define LV_USE_DEMO_WIDGETS 1 + + + + + + Add the Render test for each primitives. Requires at least 480x272 display + + + + + + + + + + + + + + + +/*! \brief add Render test for each primitives */ +#define LV_USE_DEMO_RENDER 1 diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx index b9c542b13..dc34b1f58 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/ - 2023-03-03T12:22:00 + 2023-12-10 - + diff --git a/env_support/cmsis-pack/README.md b/env_support/cmsis-pack/README.md index c312a00d5..1dbd844a1 100644 --- a/env_support/cmsis-pack/README.md +++ b/env_support/cmsis-pack/README.md @@ -34,127 +34,63 @@ remove the misleading guide above this code segment. #ifndef LV_CONF_H #define LV_CONF_H -#include #include "RTE_Components.h" ... ``` +4. Remove macro definitions for -4. Update `LV_STDIO_INCLUDE` and `LV_STRING_INCLUDE` - - ```c - #define LV_STDLIB_INCLUDE - #define LV_STDIO_INCLUDE - #define LV_STRING_INCLUDE - ``` - - - -5. Remove macro definitions for - - - LV_USE_GPU_STM32_DMA2D - - LV_USE_GPU_NXP_PXP - - LV_USE_GPU_NXP_VG_LITE - - LV_USE_GPU_SWM341_DMA2D - - LV_USE_GPU_GD32_IPA - - LV_USE_GPU_ARM2D - LV_USE_DEMO_WIDGETS - LV_USE_DEMO_BENCHMARK - LV_USE_IME_PINYIN + - LV_USE_OS - LV_USE_FILE_EXPLORER + - LV_USE_DEMO_WIDGETS + - LV_USE_DEMO_KEYPAD_AND_ENCODER + - LV_USE_DEMO_BENCHMARK + - LV_USE_DEMO_RENDER + - LV_USE_DEMO_STRESS + - LV_USE_DEMO_MUSIC + - LV_USE_DEMO_FLEX_LAYOUT + - LV_USE_DEMO_MULTILANG + - LV_USE_DEMO_TRANSFORM + - LV_USE_DEMO_SCROLL + - LV_USE_DEMO_VECTOR_GRAPHIC + - LV_USE_DRAW_VGLITE + - LV_USE_DRAW_PXP + - LV_USE_DRAW_SDL + - LV_USE_SNAPSHOT + - LV_USE_MONKEY + - LV_USE_GRIDNAV + - LV_USE_FRAGMENT + - LV_USE_IMGFONT + - LV_USE_OBSERVER +5. Update `LV_LOG_PRINTF` to `1` and `LV_LOG_LEVEL` to `LV_LOG_LEVEL_USER` -6. Update `LV_LOG_PRINTF` to `1` and `LV_LOG_LEVEL` to `LV_LOG_LEVEL_USER` -7. Update `LV_DEMO_BENCHMARK_RGB565A8` to `1` +6. Set `LV_FONT_MONTSERRAT_12` and `LV_FONT_MONTSERRAT_16` to `1` (So Widgets and Benchmark can be compiled correctly, this is for improving the out of box experience.) -8. Set `LV_FONT_MONTSERRAT_12` and `LV_FONT_MONTSERRAT_16` to `1` (So Widgets and Benchmark can be compiled correctly, this is for improving the out of box experience.) -9. Update macro `LV_ATTRIBUTE_MEM_ALIGN` and `LV_ATTRIBUTE_MEM_ALIGN_SIZE` to force a WORD alignment. +7. Update macro `LV_ATTRIBUTE_MEM_ALIGN` and `LV_ATTRIBUTE_MEM_ALIGN_SIZE` to force a WORD alignment. ```c #define LV_ATTRIBUTE_MEM_ALIGN_SIZE 4 +#define LV_DRAW_BUF_STRIDE_ALIGN 4 #define LV_ATTRIBUTE_MEM_ALIGN __attribute__((aligned(4))) ``` -Make sure `LV_MEM_SIZE` is no less than `(64*1024U)`. +Make sure `LV_MEM_SIZE` is no less than `(256*1024U)`. - - -6. Update Theme related macros: - -```c -#ifdef RTE_GRAPHICS_LVGL_USE_EXTRA_THEMES - /*A simple, impressive and very complete theme*/ - #define LV_USE_THEME_DEFAULT 1 - #if LV_USE_THEME_DEFAULT - - /*0: Light mode; 1: Dark mode*/ - #define LV_THEME_DEFAULT_DARK 0 - - /*1: Enable grow on press*/ - #define LV_THEME_DEFAULT_GROW 1 - - /*Default transition time in [ms]*/ - #define LV_THEME_DEFAULT_TRANSITION_TIME 80 - #endif /*LV_USE_THEME_DEFAULT*/ - - /*A very simple theme that is a good starting point for a custom theme*/ - #define LV_USE_THEME_BASIC 1 - - /*A theme designed for monochrome displays*/ - #define LV_USE_THEME_MONO 1 -#else - #define LV_USE_THEME_DEFAULT 0 - #define LV_USE_THEME_BASIC 0 - #define LV_USE_THEME_MONO 0 -#endif -``` -7. Update `LV_TICK_CUSTOM` related macros: -```c -/*Use a custom tick source that tells the elapsed time in milliseconds. - *It removes the need to manually update the tick with `lv_tick_inc()`)*/ -#ifdef __PERF_COUNTER__ - #define LV_TICK_CUSTOM 1 - #if LV_TICK_CUSTOM - extern uint32_t SystemCoreClock; - #define LV_TICK_CUSTOM_INCLUDE "perf_counter.h" - #define LV_TICK_CUSTOM_SYS_TIME_EXPR get_system_ms() - #endif /*LV_TICK_CUSTOM*/ -#else - #define LV_TICK_CUSTOM 0 - #if LV_TICK_CUSTOM - #define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ - #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ - /*If using lvgl as ESP32 component*/ - // #define LV_TICK_CUSTOM_INCLUDE "esp_timer.h" - // #define LV_TICK_CUSTOM_SYS_TIME_EXPR ((esp_timer_get_time() / 1000LL)) - #endif /*LV_TICK_CUSTOM*/ -#endif /*__PERF_COUNTER__*/ -``` -9. Thoroughly remove the `DEMO USAGE` section and add following code: - - ```c - /*Show some widget. It might be required to increase `LV_MEM_SIZE` */ - #if LV_USE_DEMO_WIDGETS - #define LV_DEMO_WIDGETS_SLIDESHOW 0 - #endif - - /*Benchmark your system*/ - #if LV_USE_DEMO_BENCHMARK - /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ - #define LV_DEMO_BENCHMARK_RGB565A8 0 - #endif - ``` - - - -10. Remove following macro definitions in the `3rd party libraries` section: +8. Remove following macro definitions in the `3rd party libraries` section: - \#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_FS_MEMFS 0 - \#define LV_USE_LODEPNG 0 + - #define LV_USE_LIBPNG 0 - \#define LV_USE_BMP 0 - \#define LV_USE_RLE 0 - - \#define LV_USE_SJPG 0 + - #define LV_USE_TJPGD 0 + - #define LV_USE_LIBJPEG_TURBO 0 - \#define LV_USE_GIF 0 - \#define LV_USE_BARCODE 0 - \#define LV_USE_QRCODE 0 @@ -163,21 +99,38 @@ Make sure `LV_MEM_SIZE` is no less than `(64*1024U)`. - \#define LV_USE_RLOTTIE 0 - \#define LV_USE_FFMPEG 0 -11. Remove unsupported devices from the `DEVICES` section +9. update the definition of following macros: `LV_USE_VECTOR_GRAPHIC`, `LV_USE_THORVE_INTERNAL` and `LV_USE_THORVE_EXTERNAL` as - - LV_USE_SDL + ```c + /*Enable Vector Graphic APIs*/ + #ifndef LV_USE_VECTOR_GRAPHIC + # define LV_USE_VECTOR_GRAPHIC 0 + + /* Enable ThorVG (vector graphics library) from the src/libs folder */ + # define LV_USE_THORVG_INTERNAL 0 + + /* Enable ThorVG by assuming that its installed and linked to the project */ + # define LV_USE_THORVG_EXTERNAL 0 + #endif + ``` - - LV_USE_X11 +10. update the definition of following macros: `LV_USE_LZ4`, `LV_USE_LZ4_INTERNAL` and `LV_USE_LZ4_EXTERNAL` as - - LV_USE_LINUX_FBDEV + ```c + /*Enable LZ4 compress/decompress lib*/ + #ifndef LV_USE_LZ4 + # define LV_USE_LZ4 0 + + /*Use lvgl built-in LZ4 lib*/ + # define LV_USE_LZ4_INTERNAL 0 + + /*Use external LZ4 library*/ + # define LV_USE_LZ4_EXTERNAL 0 + #endif + ``` - - LV_USE_NUTTX_FBDEV - - LV_USE_LINUX_DRM - - - LV_USE_TFT_ESPI - -12. rename '**lv_conf_template.h**' to '**lv_conf_cmsis.h**'. +11. 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 8aa8a095e..c094311be 100755 --- a/env_support/cmsis-pack/gen_pack.sh +++ b/env_support/cmsis-pack/gen_pack.sh @@ -44,7 +44,6 @@ PACK_BUILD=build/ # alternative: specify directory names to be added to pack base directory PACK_DIRS=" ../../src - ../../docs ../../demos ../../env_support/pikascript " @@ -138,10 +137,6 @@ fi mkdir -p ${PACK_BUILD}/examples mkdir -p ${PACK_BUILD}/examples/porting -# Copy files into build base directory: $PACK_BUILD -# pdsc file is mandatory in base directory: -cp -f ./$PACK_VENDOR.$PACK_NAME.pdsc ${PACK_BUILD} -cp -f ../../examples/porting/* ${PACK_BUILD}/examples/porting # directories @@ -162,6 +157,12 @@ do cp -f "$f" $PACK_BUILD/ done +# Copy files into build base directory: $PACK_BUILD +# pdsc file is mandatory in base directory: +cp -f ./$PACK_VENDOR.$PACK_NAME.pdsc ${PACK_BUILD} +cp -f ../../examples/porting/* ${PACK_BUILD}/examples/porting +cp -f ./lv_os_custom.* ${PACK_BUILD}/src/osal + mv "${PACK_BUILD}/lv_cmsis_pack.txt" "${PACK_BUILD}/lv_cmsis_pack.c" # Run Schema Check (for Linux only): @@ -188,16 +189,19 @@ fi PACKNAME=`cat PackName.txt` rm -rf PackName.txt -echo remove unrequired files and folders... -rm -rf $PACK_BUILD/demos/keypad_encoder -rm -rf $PACK_BUILD/demos/music -rm -rf $PACK_BUILD/demos/stress -rm -rf $PACK_BUILD/demos/widgets/screenshot1.gif - # echo apply patches... # rm -rf $PACK_BUILD/demos/lv_demos.h # cp -f ./lv_demos.h $PACK_BUILD/demos/ +echo delete files... +find $PACK_BUILD/demos/ -type f -name "*.png" -delete +find $PACK_BUILD/demos/ -type f -name "*.gif" -delete +find $PACK_BUILD/demos/ -type f -name "*.gif" -delete +find $PACK_BUILD/demos/ -type f -name "*.ttf" -delete +find $PACK_BUILD/demos/ -type f -name "*.otf" -delete +find $PACK_BUILD/demos/ -type f -name "*.jpg" -delete +find $PACK_BUILD/demos/ -type f -name "*.fnt" -delete + # Archiving # $ZIP a $PACKNAME echo creating pack file $PACKNAME diff --git a/env_support/cmsis-pack/lv_cmsis_pack.txt b/env_support/cmsis-pack/lv_cmsis_pack.txt index 651d8fb51..7e83c7dc2 100644 --- a/env_support/cmsis-pack/lv_cmsis_pack.txt +++ b/env_support/cmsis-pack/lv_cmsis_pack.txt @@ -27,9 +27,18 @@ #include "RTE_Components.h" #include - /********************* +#if defined(__PERF_COUNTER__) && __PERF_COUNTER__ +# include "perf_counter.h" +#endif + +#include +#include +#include "lv_global.h" + +/********************* * DEFINES *********************/ +#define state LV_GLOBAL_DEFAULT()->tick_state /********************** * TYPEDEFS @@ -102,12 +111,35 @@ * time() which is not included in the MicroLib */ #if defined(__IS_COMPILER_ARM_COMPILER__) && __IS_COMPILER_ARM_COMPILER__ -# if defined(__MICROLIB) +# if defined(__MICROLIB) __attribute__((weak)) _ARMABI time_t time(time_t * time) { return (time_t)(-1); } -# endif +# endif + + + +# if defined(__PERF_COUNTER__) && __PERF_COUNTER__ +/** + * Get the elapsed milliseconds since start up from perf_counter + * @return the elapsed milliseconds + */ +uint32_t $Sub$$lv_tick_get(void) +{ + lv_tick_state_t * state_p = &state; + + if (state_p->tick_get_cb){ + return state_p->tick_get_cb(); + } + + return (uint32_t)get_system_ms(); +} + +# endif + #endif + + diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index e7da9a166..7e972dce2 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -9,27 +9,34 @@ #ifndef LV_CONF_H #define LV_CONF_H -#include #include "RTE_Components.h" /*==================== COLOR SETTINGS *====================*/ -/*Color depth: 1 (1 byte per pixel), 8 (RGB332), 16 (RGB565), 24 (RGB888), 32 (ARGB8888)*/ +/*Color depth: 8 (A8), 16 (RGB565), 24 (RGB888), 32 (XRGB8888)*/ #define LV_COLOR_DEPTH 16 -#define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) - /*========================= STDLIB WRAPPER SETTINGS *=========================*/ -/*Enable and configure the built-in memory manager*/ -#define LV_USE_BUILTIN_MALLOC 1 -#if LV_USE_BUILTIN_MALLOC +/* Possible values + * - LV_STDLIB_BUILTIN: LVGL's built in implementation + * - LV_STDLIB_CLIB: Standard C functions, like malloc, strlen, etc + * - LV_STDLIB_MICROPYTHON: MicroPython implementation + * - LV_STDLIB_RTTHREAD: RT-Thread implementation + * - LV_STDLIB_CUSTOM: Implement the functions externally + */ +#define LV_USE_STDLIB_MALLOC LV_STDLIB_BUILTIN +#define LV_USE_STDLIB_STRING LV_STDLIB_BUILTIN +#define LV_USE_STDLIB_SPRINTF LV_STDLIB_BUILTIN + + +#if LV_USE_STDLIB_MALLOC == LV_STDLIB_BUILTIN /*Size of the memory available for `lv_malloc()` in bytes (>= 2kB)*/ - #define LV_MEM_SIZE (128U * 1024U) /*[bytes]*/ + #define LV_MEM_SIZE (256 * 1024U) /*[bytes]*/ /*Size of the memory expand for `lv_malloc()` in bytes*/ #define LV_MEM_POOL_EXPAND_SIZE 0 @@ -41,35 +48,7 @@ #undef LV_MEM_POOL_INCLUDE #undef LV_MEM_POOL_ALLOC #endif -#endif /*LV_USE_BUILTIN_MALLOC*/ - -/*Enable lv_memcpy_builtin, lv_memset_builtin, lv_strlen_builtin, lv_strncpy_builtin, lv_strcpy_builtin*/ -#define LV_USE_BUILTIN_MEMCPY 1 - -/*Enable and configure the built-in (v)snprintf */ -#define LV_USE_BUILTIN_SNPRINTF 1 -#if LV_USE_BUILTIN_SNPRINTF - #define LV_SPRINTF_USE_FLOAT 0 -#endif /*LV_USE_BUILTIN_SNPRINTF*/ - -#define LV_STDLIB_INCLUDE -#define LV_STDIO_INCLUDE -#define LV_STRING_INCLUDE -#define LV_MALLOC lv_malloc_builtin -#define LV_REALLOC lv_realloc_builtin -#define LV_FREE lv_free_builtin -#define LV_MEMSET lv_memset_builtin -#define LV_MEMCPY lv_memcpy_builtin -#define LV_SNPRINTF lv_snprintf_builtin -#define LV_VSNPRINTF lv_vsnprintf_builtin -#define LV_STRLEN lv_strlen_builtin -#define LV_STRNCPY lv_strncpy_builtin -#define LV_STRCPY lv_strcpy_builtin - -#define "../misc/lv_color.h" -#define LV_COLOR_MIX lv_color_mix -#define LV_COLOR_PREMULT lv_color_premult -#define LV_COLOR_MIX_PREMULT lv_color_mix_premult +#endif /*LV_USE_MALLOC == LV_STDLIB_BUILTIN*/ /*==================== HAL SETTINGS @@ -78,44 +57,26 @@ /*Default display refresh, input device read and animation step period.*/ #define LV_DEF_REFR_PERIOD 33 /*[ms]*/ -/*Use a custom tick source that tells the elapsed time in milliseconds. - *It removes the need to manually update the tick with `lv_tick_inc()`)*/ -#ifdef __PERF_COUNTER__ - #define LV_TICK_CUSTOM 1 - #if LV_TICK_CUSTOM - extern uint32_t SystemCoreClock; - #define LV_TICK_CUSTOM_INCLUDE "perf_counter.h" - #define LV_TICK_CUSTOM_SYS_TIME_EXPR get_system_ms() - #endif /*LV_TICK_CUSTOM*/ -#else - #define LV_TICK_CUSTOM 0 - #if LV_TICK_CUSTOM - #define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ - #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ - /*If using lvgl as ESP32 component*/ - // #define LV_TICK_CUSTOM_INCLUDE "esp_timer.h" - // #define LV_TICK_CUSTOM_SYS_TIME_EXPR ((esp_timer_get_time() / 1000LL)) - #endif /*LV_TICK_CUSTOM*/ -#endif /*__PERF_COUNTER__*/ - /*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings. *(Not so important, you can adjust it to modify default sizes and spaces)*/ #define LV_DPI_DEF 130 /*[px/inch]*/ /*======================== - * DRAW CONFIGURATION + * RENDERING CONFIGURATION *========================*/ -/*Enable the built in mask engine. - *Required to draw shadow, rounded corners, circles, arc, skew lines, or any other masks*/ -#define LV_USE_DRAW_MASKS 1 +/*Align the stride of all layers and images to this bytes*/ +#define LV_DRAW_BUF_STRIDE_ALIGN 4 -#define LV_USE_DRAW_SW 1 -#if LV_USE_DRAW_SW +/*Align the start address of draw_buf addresses to this bytes*/ +#define LV_DRAW_BUF_ALIGN 4 - /*Enable complex draw engine. - *Required to draw shadow, gradient, rounded corners, circles, arc, skew lines, image transformations or any masks*/ - #define LV_DRAW_SW_COMPLEX 1 +#define LV_USE_DRAW_SW 1 +#if LV_USE_DRAW_SW == 1 + /* Set the number of draw unit. + * > 1 requires an operating system enabled in `LV_USE_OS` + * > 1 means multiply threads will render the screen in parallel */ + #define LV_DRAW_SW_DRAW_UNIT_CNT 1 /* If a widget has `style_opa < 255` (not `bg_opa`, `text_opa` etc) or not NORMAL blend mode * it is buffered into a "simple" layer before rendering. The widget can be buffered in smaller chunks. @@ -125,71 +86,37 @@ /*The target buffer size for simple layer chunks.*/ #define LV_DRAW_SW_LAYER_SIMPLE_BUF_SIZE (24 * 1024) /*[bytes]*/ - /*Used if `LV_DRAW_SW_LAYER_SIMPLE_BUF_SIZE` couldn't be allocated.*/ - #define LV_DRAW_SW_LAYER_SIMPLE_FALLBACK_BUF_SIZE (3 * 1024) /*[bytes]*/ + /* 0: use a simple renderer capable of drawing only simple rectangles with gradient, images, texts, and straight lines only + * 1: use a complex renderer capable of drawing rounded corners, shadow, skew lines, and arcs too */ + #define LV_DRAW_SW_COMPLEX 1 - /*Allow buffering some shadow calculation. - *LV_DRAW_SW_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius` - *Caching has LV_DRAW_SW_SHADOW_CACHE_SIZE^2 RAM cost*/ - #define LV_DRAW_SW_SHADOW_CACHE_SIZE 0 + #if LV_DRAW_SW_COMPLEX == 1 + /*Allow buffering some shadow calculation. + *LV_DRAW_SW_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius` + *Caching has LV_DRAW_SW_SHADOW_CACHE_SIZE^2 RAM cost*/ + #define LV_DRAW_SW_SHADOW_CACHE_SIZE 0 - /* Set number of maximally cached circle data. - * The circumference of 1/4 circle are saved for anti-aliasing - * radius * 4 bytes are used per circle (the most often used radiuses are saved) - * 0: to disable caching */ - #define LV_DRAW_SW_CIRCLE_CACHE_SIZE 4 - - /*Default gradient buffer size. - *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again. - *LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE sets the size of this cache in bytes. - *If the cache is too small the map will be allocated only while it's required for the drawing. - *0 mean no caching.*/ - #define LV_DRAW_SW_GRADIENT_CACHE_DEF_SIZE 0 - - /*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display) - *LV_DRAW_SW_GRADIENT_DITHER implies allocating one or two more lines of the object's rendering surface - *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */ - #define LV_DRAW_SW_GRADIENT_DITHER 0 - #if LV_DRAW_SW_GRADIENT_DITHER - /*Add support for error diffusion dithering. - *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. - *The increase in memory consumption is (24 bits * object's width)*/ - #define LV_DRAW_SW_GRADIENT_DITHER_ERROR_DIFFUSION 0 + /* Set number of maximally cached circle data. + * The circumference of 1/4 circle are saved for anti-aliasing + * radius * 4 bytes are used per circle (the most often used radiuses are saved) + * 0: to disable caching */ + #define LV_DRAW_SW_CIRCLE_CACHE_SIZE 4 #endif - /*Enable subpixel rendering*/ - #define LV_DRAW_SW_FONT_SUBPX 0 - #if LV_DRAW_SW_FONT_SUBPX - /*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/ - #define LV_DRAW_SW_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/ + #define LV_USE_DRAW_SW_ASM LV_DRAW_SW_ASM_NONE + + #if LV_USE_DRAW_SW_ASM == LV_DRAW_SW_ASM_CUSTOM + #define LV_DRAW_SW_ASM_CUSTOM_INCLUDE "" #endif #endif -/*===================== - * GPU CONFIGURATION - *=====================*/ +/*================= + * OPERATING SYSTEM + *=================*/ -/*Use STM32's DMA2D (aka Chrom Art) GPU*/ -#if LV_USE_GPU_STM32_DMA2D - /*Must be defined to include path of CMSIS header of target processor - e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ - #define LV_GPU_DMA2D_CMSIS_INCLUDE -#endif - -/*Use NXP's PXP GPU iMX RTxxx platforms*/ -#if LV_USE_GPU_NXP_PXP - /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c) - * and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS - * has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected. - *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init() - */ - #define LV_USE_GPU_NXP_PXP_AUTO_INIT 0 -#endif - -/*Use SWM341's DMA2D GPU*/ -#if LV_USE_GPU_SWM341_DMA2D - #define LV_GPU_SWM341_DMA2D_INCLUDE "SWM341.h" +#if LV_USE_OS == LV_OS_CUSTOM + #define LV_OS_CUSTOM_INCLUDE #endif /*======================= @@ -221,6 +148,10 @@ *0: Disable print timestamp*/ #define LV_LOG_USE_TIMESTAMP 1 + /*1: Print file and line number of the log; + *0: Do not print file and line number of the log*/ + #define LV_LOG_USE_FILE_LINE 1 + /*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/ #define LV_LOG_TRACE_MEM 1 #define LV_LOG_TRACE_TIMER 1 @@ -230,7 +161,6 @@ #define LV_LOG_TRACE_OBJ_CREATE 1 #define LV_LOG_TRACE_LAYOUT 1 #define LV_LOG_TRACE_ANIM 1 - #define LV_LOG_TRACE_MSG 1 #define LV_LOG_TRACE_CACHE 1 #endif /*LV_USE_LOG*/ @@ -252,9 +182,24 @@ #define LV_ASSERT_HANDLER while(1); /*Halt by default*/ /*------------- - * Others + * Debug *-----------*/ +/*1: Draw random colored rectangles over the redrawn areas*/ +#define LV_USE_REFR_DEBUG 0 + +/*1: Draw a red overlay for ARGB layers and a green overlay for RGB layers*/ +#define LV_USE_LAYER_DEBUG 0 + +/*1: Draw overlays with different colors for each draw_unit's tasks. + *Also add the index number of the draw unit on white background. + *For layers add the index number of the draw unit on black background.*/ +#define LV_USE_PARALLEL_DRAW_DEBUG 0 + +/*------------------ + * STATUS MONITORING + *------------------*/ + /*1: Show CPU usage and FPS count * Requires `LV_USE_SYSMON = 1`*/ #define LV_USE_PERF_MONITOR 0 @@ -273,35 +218,45 @@ #define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT #endif -/*1: Draw random colored rectangles over the redrawn areas*/ -#define LV_USE_REFR_DEBUG 0 +/*------------- + * Others + *-----------*/ /*Maximum buffer size to allocate for rotation. *Only used if software rotation is enabled in the display driver.*/ #define LV_DISPLAY_ROT_MAX_BUF (10*1024) -/*Garbage Collector settings - *Used if lvgl is bound to higher level language and the memory is managed by that language*/ -#define LV_ENABLE_GC 0 -#if LV_ENABLE_GC != 0 - #define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ -#endif /*LV_ENABLE_GC*/ - -/*Default image cache size. Image caching keeps some images opened. - *If only the built-in image formats are used there is no real advantage of caching. - *With other image decoders (e.g. PNG or JPG) caching save the continuous open/decode of images. - *However the opened images consume additional RAM. - *0: to disable caching*/ -#define LV_IMAGE_CACHE_DEF_SIZE 0 +#define LV_ENABLE_GLOBAL_CUSTOM 0 +#if LV_ENABLE_GLOBAL_CUSTOM + /*Header to include for the custom 'lv_global' function"*/ + #define LV_GLOBAL_CUSTOM_INCLUDE +#endif +/*Default cache size in bytes. + *Used by image decoders such as `lv_lodepng` to keep the decoded image in the memory. + *Data larger than the size of the cache also can be allocated but + *will be dropped immediately after usage.*/ +#define LV_CACHE_DEF_SIZE 0 /*Number of stops allowed per gradient. Increase this to allow more stops. *This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/ -#define LV_GRADIENT_MAX_STOPS 2 +#define LV_GRADIENT_MAX_STOPS 2 /* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently. * 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */ -#define LV_COLOR_MIX_ROUND_OFS 0 +#define LV_COLOR_MIX_ROUND_OFS 0 + +/* Add 2 x 32 bit variables to each lv_obj_t to speed up getting style properties */ +#define LV_OBJ_STYLE_CACHE 0 + +/* Add `id` field to `lv_obj_t` */ +#define LV_USE_OBJ_ID 0 + +/* Use lvgl builtin method for obj ID */ +#define LV_USE_OBJ_ID_BUILTIN 0 + +/*Use obj property set/get API*/ +#define LV_USE_OBJ_PROPERTY 0 /*===================== * COMPILER SETTINGS @@ -335,11 +290,16 @@ /*Place performance critical functions into a faster memory (e.g RAM)*/ #define LV_ATTRIBUTE_FAST_MEM - /*Export integer constant to binding. This macro is used with constants in the form of LV_ that *should also appear on LVGL binding API such as Micropython.*/ #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ +/*Prefix all global extern data with this*/ +#define LV_ATTRIBUTE_EXTERN_DATA + +/* Use `float` as `lv_value_precise_t` */ +#define LV_USE_FLOAT 0 + /*================== * FONT USAGE *===================*/ @@ -369,7 +329,6 @@ #define LV_FONT_MONTSERRAT_48 0 /*Demonstrate special features*/ -#define LV_FONT_MONTSERRAT_12_SUBPX 0 #define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ #define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, Persian letters and all their forms*/ #define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ @@ -424,9 +383,6 @@ *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/ #define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 -/*The control character to use for signalling text recoloring.*/ -#define LV_TXT_COLOR_CMD "#" - /*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts. *The direction will be processed according to the Unicode Bidirectional Algorithm: *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ @@ -449,6 +405,8 @@ /*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/ +#define LV_WIDGETS_HAS_DEFAULT_VALUE 1 + #define LV_USE_ANIMIMG 1 #define LV_USE_ARC 1 @@ -491,6 +449,7 @@ #if LV_USE_LABEL #define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/ #define LV_LABEL_LONG_TXT_HINT 1 /*Store some extra info in labels to speed up drawing of very long texts*/ + #define LV_LABEL_WAIT_CHAR_COUNT 3 /*The count of wait chart*/ #endif #define LV_USE_LED 1 @@ -507,6 +466,8 @@ #define LV_USE_ROLLER 1 /*Requires: lv_label*/ +#define LV_USE_SCALE 1 + #define LV_USE_SLIDER 1 /*Requires: lv_bar*/ #define LV_USE_SPAN 1 @@ -538,31 +499,25 @@ * THEMES *==================*/ -#ifdef RTE_GRAPHICS_LVGL_USE_EXTRA_THEMES - /*A simple, impressive and very complete theme*/ - #define LV_USE_THEME_DEFAULT 1 - #if LV_USE_THEME_DEFAULT +/*A simple, impressive and very complete theme*/ +#define LV_USE_THEME_DEFAULT 1 +#if LV_USE_THEME_DEFAULT - /*0: Light mode; 1: Dark mode*/ - #define LV_THEME_DEFAULT_DARK 0 + /*0: Light mode; 1: Dark mode*/ + #define LV_THEME_DEFAULT_DARK 0 - /*1: Enable grow on press*/ - #define LV_THEME_DEFAULT_GROW 1 + /*1: Enable grow on press*/ + #define LV_THEME_DEFAULT_GROW 1 - /*Default transition time in [ms]*/ - #define LV_THEME_DEFAULT_TRANSITION_TIME 80 - #endif /*LV_USE_THEME_DEFAULT*/ + /*Default transition time in [ms]*/ + #define LV_THEME_DEFAULT_TRANSITION_TIME 80 +#endif /*LV_USE_THEME_DEFAULT*/ - /*A very simple theme that is a good starting point for a custom theme*/ - #define LV_USE_THEME_BASIC 1 +/*A very simple theme that is a good starting point for a custom theme*/ +#define LV_USE_THEME_BASIC 1 - /*A theme designed for monochrome displays*/ - #define LV_USE_THEME_MONO 1 -#else - #define LV_USE_THEME_DEFAULT 0 - #define LV_USE_THEME_BASIC 0 - #define LV_USE_THEME_MONO 0 -#endif +/*A theme designed for monochrome displays*/ +#define LV_USE_THEME_MONO 1 /*================== * LAYOUTS @@ -607,24 +562,42 @@ #define LV_FS_FATFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ #endif +/*API for memory-mapped file access. */ +#if LV_USE_FS_MEMFS + #define LV_FS_MEMFS_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ +#endif + + +/*GIF decoder library*/ +#if LV_USE_GIF +/*GIF decoder accelerate*/ +#define LV_GIF_CACHE_DECODE_DATA 0 +#endif + + +/*Decode bin images to RAM*/ +#define LV_BIN_DECODER_RAM_LOAD 0 + /*FreeType library*/ #if LV_USE_FREETYPE - /*Memory used by FreeType to cache characters [bytes]*/ - #define LV_FREETYPE_CACHE_SIZE (64 * 1024) + /*Memory used by FreeType to cache characters in kilobytes*/ + #define LV_FREETYPE_CACHE_SIZE 768 /*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 + /*FreeType cache type: + * LV_FREETYPE_CACHE_TYPE_IMAGE - Image cache + * LV_FREETYPE_CACHE_TYPE_SBIT - Sbit cache + * LV_FREETYPE_CACHE_TYPE_OUTLINE - Outline cache*/ + #define LV_FREETYPE_CACHE_TYPE LV_FREETYPE_CACHE_TYPE_IMAGE /* 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 + #define LV_FREETYPE_CACHE_FT_FACES 8 + #define LV_FREETYPE_CACHE_FT_SIZES 8 + #define LV_FREETYPE_CACHE_FT_OUTLINES 256 #endif /* Built-in TTF decoder */ @@ -634,6 +607,28 @@ #endif +/*Enable Vector Graphic APIs*/ +#ifndef LV_USE_VECTOR_GRAPHIC +# define LV_USE_VECTOR_GRAPHIC 0 + +/* Enable ThorVG (vector graphics library) from the src/libs folder */ +# define LV_USE_THORVG_INTERNAL 0 + +/* Enable ThorVG by assuming that its installed and linked to the project */ +# define LV_USE_THORVG_EXTERNAL 0 +#endif + +/*Enable LZ4 compress/decompress lib*/ +#ifndef LV_USE_LZ4 +# define LV_USE_LZ4 0 + +/*Use lvgl built-in LZ4 lib*/ +# define LV_USE_LZ4_INTERNAL 0 + +/*Use external LZ4 library*/ +# define LV_USE_LZ4_EXTERNAL 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 @@ -645,11 +640,9 @@ * OTHERS *==================*/ -/*1: Enable API to take snapshot for object*/ -#define LV_USE_SNAPSHOT 0 /*1: Enable system monitor component*/ -#define LV_USE_SYSMON 0 +#define LV_USE_SYSMON (LV_USE_MEM_MONITOR | LV_USE_PERF_MONITOR) /*1: Enable the runtime performance profiler*/ #define LV_USE_PROFILER 0 @@ -665,23 +658,20 @@ #define LV_PROFILER_INCLUDE "lvgl/src/misc/lv_profiler_builtin.h" /*Profiler start point function*/ - #define LV_PROFILER_BEGIN LV_PROFILER_BUILTIN_BEGIN + #define LV_PROFILER_BEGIN LV_PROFILER_BUILTIN_BEGIN /*Profiler end point function*/ - #define LV_PROFILER_END LV_PROFILER_BUILTIN_END + #define LV_PROFILER_END LV_PROFILER_BUILTIN_END + + /*Profiler start point function with custom tag*/ + #define LV_PROFILER_BEGIN_TAG LV_PROFILER_BUILTIN_BEGIN_TAG + + /*Profiler end point function with custom tag*/ + #define LV_PROFILER_END_TAG LV_PROFILER_BUILTIN_END_TAG #endif -/*1: Enable Monkey test*/ -#define LV_USE_MONKEY 0 - -/*1: Enable grid navigation*/ -#define LV_USE_GRIDNAV 0 - -/*1: Enable lv_obj fragment*/ -#define LV_USE_FRAGMENT 0 /*1: Support using images as font in label or span widgets */ -#define LV_USE_IMGFONT 0 #if LV_USE_IMGFONT /*Imgfont image file path maximum length*/ #define LV_IMGFONT_PATH_MAX_LEN 64 @@ -690,6 +680,7 @@ #define LV_IMGFONT_USE_IMAGE_CACHE_HEADER 0 #endif + /*1: Enable Pinyin input method*/ /*Requires: lv_keyboard*/ #if LV_USE_IME_PINYIN @@ -704,7 +695,7 @@ #define LV_IME_PINYIN_USE_K9_MODE 1 #if LV_IME_PINYIN_USE_K9_MODE == 1 #define LV_IME_PINYIN_K9_CAND_TEXT_NUM 3 - #endif // LV_IME_PINYIN_USE_K9_MODE + #endif /*LV_IME_PINYIN_USE_K9_MODE*/ #endif /*1: Enable file explorer*/ @@ -722,18 +713,65 @@ *==================*/ /*Use SDL to open window on PC and handle mouse and keyboard*/ +#define LV_USE_SDL 0 #if LV_USE_SDL #define LV_SDL_INCLUDE_PATH - #define LV_SDL_PARTIAL_MODE 0 /*Recommended only to emulate a setup with a display controller*/ - #define LV_SDL_FULLSCREEN 0 - #define LV_SDL_DIRECT_EXIT 1 /*1: Exit the application when all SDL widows are closed*/ + #define LV_SDL_RENDER_MODE LV_DISPLAY_RENDER_MODE_DIRECT /*LV_DISPLAY_RENDER_MODE_DIRECT is recommended for best performance*/ + #define LV_SDL_BUF_COUNT 1 /*1 or 2*/ + #define LV_SDL_FULLSCREEN 0 /*1: Make the window full screen by default*/ + #define LV_SDL_DIRECT_EXIT 1 /*1: Exit the application when all SDL windows are closed*/ +#endif + +/*Use X11 to open window on Linux desktop and handle mouse and keyboard*/ +#define LV_USE_X11 0 +#if LV_USE_X11 + #define LV_X11_DIRECT_EXIT 1 /*Exit the application when all X11 windows have been closed*/ + #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for endering*/ + /*select only 1 of the following render modes (LV_X11_RENDER_MODE_PARTIAL preferred!)*/ + #define LV_X11_RENDER_MODE_PARTIAL 1 /*Partial render mode (preferred)*/ + #define LV_X11_RENDER_MODE_DIRECT 0 /*direct render mode*/ + #define LV_X11_RENDER_MODE_FULL 0 /*Full render mode*/ #endif /*Driver for /dev/fb*/ +#define LV_USE_LINUX_FBDEV 0 #if LV_USE_LINUX_FBDEV - #define LV_LINUX_FBDEV_BSD 0 + #define LV_LINUX_FBDEV_BSD 0 + #define LV_LINUX_FBDEV_RENDER_MODE LV_DISPLAY_RENDER_MODE_PARTIAL + #define LV_LINUX_FBDEV_BUFFER_COUNT 0 + #define LV_LINUX_FBDEV_BUFFER_SIZE 60 #endif +/*Use Nuttx to open window and handle touchscreen*/ +#define LV_USE_NUTTX 0 + +#if LV_USE_NUTTX + #define LV_USE_NUTTX_LIBUV 0 + + /*Use Nuttx custom init API to open window and handle touchscreen*/ + #define LV_USE_NUTTX_CUSTOM_INIT 0 + + /*Driver for /dev/lcd*/ + #define LV_USE_NUTTX_LCD 0 + #if LV_USE_NUTTX_LCD + #define LV_NUTTX_LCD_BUFFER_COUNT 0 + #define LV_NUTTX_LCD_BUFFER_SIZE 60 + #endif + + /*Driver for /dev/input*/ + #define LV_USE_NUTTX_TOUCHSCREEN 0 + +#endif + +/*Driver for /dev/dri/card*/ +#define LV_USE_LINUX_DRM 0 + +/*Interface for TFT_eSPI*/ +#define LV_USE_TFT_ESPI 0 + +/*Driver for evdev input devices*/ +#define LV_USE_EVDEV 0 + /*================== * EXAMPLES *==================*/ @@ -750,10 +788,13 @@ #define LV_DEMO_WIDGETS_SLIDESHOW 0 #endif -/*Benchmark your system*/ -#if LV_USE_DEMO_BENCHMARK - /*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/ - #define LV_DEMO_BENCHMARK_RGB565A8 1 +/*Music player demo*/ +#if LV_USE_DEMO_MUSIC + #define LV_DEMO_MUSIC_SQUARE 0 + #define LV_DEMO_MUSIC_LANDSCAPE 0 + #define LV_DEMO_MUSIC_ROUND 0 + #define LV_DEMO_MUSIC_LARGE 0 + #define LV_DEMO_MUSIC_AUTO_PLAY 0 #endif /*--END OF LV_CONF_H--*/ diff --git a/env_support/cmsis-pack/lv_os_custom.c b/env_support/cmsis-pack/lv_os_custom.c new file mode 100644 index 000000000..87427b240 --- /dev/null +++ b/env_support/cmsis-pack/lv_os_custom.c @@ -0,0 +1,120 @@ +/** + * @file lv_os_custom.c + * + */ + +/********************* + * INCLUDES + *********************/ +#include "lv_os.h" + +#if LV_USE_OS == LV_OS_CUSTOM +#include "../misc/lv_types.h" +#include "../misc/lv_assert.h" + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * STATIC PROTOTYPES + **********************/ + +/********************** + * STATIC VARIABLES + **********************/ + +/********************** + * MACROS + **********************/ + +/********************** + * GLOBAL FUNCTIONS + **********************/ + +lv_result_t lv_thread_init(lv_thread_t * thread, lv_thread_prio_t prio, void (*callback)(void *), size_t stack_size, + void * user_data) +{ + LV_UNUSED(thread); + LV_UNUSED(callback); + LV_UNUSED(prio); + LV_UNUSED(stack_size); + LV_UNUSED(user_data); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +lv_result_t lv_thread_delete(lv_thread_t * thread) +{ + LV_UNUSED(thread); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +lv_result_t lv_mutex_init(lv_mutex_t * mutex) +{ + LV_UNUSED(mutex); + return LV_RESULT_OK; +} + +lv_result_t lv_mutex_lock(lv_mutex_t * mutex) +{ + LV_UNUSED(mutex); + return LV_RESULT_OK; +} + +lv_result_t lv_mutex_lock_isr(lv_mutex_t * mutex) +{ + LV_UNUSED(mutex); + return LV_RESULT_OK; +} + +lv_result_t lv_mutex_unlock(lv_mutex_t * mutex) +{ + LV_UNUSED(mutex); + return LV_RESULT_OK; +} + +lv_result_t lv_mutex_delete(lv_mutex_t * mutex) +{ + LV_UNUSED(mutex); + return LV_RESULT_OK; +} + +lv_result_t lv_thread_sync_init(lv_thread_sync_t * sync) +{ + LV_UNUSED(sync); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +lv_result_t lv_thread_sync_wait(lv_thread_sync_t * sync) +{ + LV_UNUSED(sync); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +lv_result_t lv_thread_sync_signal(lv_thread_sync_t * sync) +{ + LV_UNUSED(sync); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +lv_result_t lv_thread_sync_delete(lv_thread_sync_t * sync) +{ + LV_UNUSED(sync); + LV_ASSERT(0); + return LV_RESULT_INVALID; +} + +/********************** + * STATIC FUNCTIONS + **********************/ + +#endif /*LV_USE_OS == LV_OS_CUSTOM*/ diff --git a/env_support/cmsis-pack/lv_os_custom.h b/env_support/cmsis-pack/lv_os_custom.h new file mode 100644 index 000000000..92e092623 --- /dev/null +++ b/env_support/cmsis-pack/lv_os_custom.h @@ -0,0 +1,43 @@ +/** + * @file lv_os_custom.h + * + */ + +#ifndef LV_OS_CUSTOM_H +#define LV_OS_CUSTOM_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ +#if LV_USE_OS == LV_OS_CUSTOM + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ +typedef int lv_mutex_t; +typedef int lv_thread_t; +typedef int lv_thread_sync_t; + +/********************** + * GLOBAL PROTOTYPES + **********************/ + +/********************** + * MACROS + **********************/ + +#endif /*LV_USE_OS == LV_OS_CUSTOM*/ + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif /*LV_OS_CUSTOM_H*/