From 4495f428630cc1741bd8bfd977f080e8460e8e8d Mon Sep 17 00:00:00 2001 From: Gabriel Wang Date: Tue, 19 Mar 2024 19:51:58 +0000 Subject: chore(cmsis-pack): prepare for release v8.4.0 --- Kconfig | 2 +- env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack | Bin 5060109 -> 0 bytes env_support/cmsis-pack/LVGL.lvgl.8.4.0.pack | Bin 0 -> 5062023 bytes env_support/cmsis-pack/LVGL.lvgl.pdsc | 10 +++++++--- env_support/cmsis-pack/LVGL.pidx | 4 ++-- env_support/cmsis-pack/README.md | 4 +++- env_support/cmsis-pack/lv_conf_cmsis.h | 7 +++++-- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- lvgl.h | 4 ++-- lvgl.pc.in | 2 +- 12 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack create mode 100644 env_support/cmsis-pack/LVGL.lvgl.8.4.0.pack diff --git a/Kconfig b/Kconfig index 4e9a13b98..ccbbc7b47 100644 --- a/Kconfig +++ b/Kconfig @@ -1,4 +1,4 @@ -# Kconfig file for LVGL v8.0 +# Kconfig file for LVGL v8.4 menu "LVGL configuration" diff --git a/env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack b/env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack deleted file mode 100644 index 535d45cc9..000000000 Binary files a/env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack and /dev/null differ diff --git a/env_support/cmsis-pack/LVGL.lvgl.8.4.0.pack b/env_support/cmsis-pack/LVGL.lvgl.8.4.0.pack new file mode 100644 index 000000000..62e06dfaf Binary files /dev/null and b/env_support/cmsis-pack/LVGL.lvgl.8.4.0.pack differ diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc index 8c4dde888..70999234e 100644 --- a/env_support/cmsis-pack/LVGL.lvgl.pdsc +++ b/env_support/cmsis-pack/LVGL.lvgl.pdsc @@ -36,7 +36,11 @@ https://github.com/lvgl/lvgl.git - + + - LVGL 8.4.0 + - Some minor fixes + + - LVGL 8.3.11 - Add LittleFS Library to LVGL8 - Backport Tiny TTF to LVGL8 @@ -310,7 +314,7 @@ --> - + 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. @@ -443,7 +447,7 @@ - + diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx index 0ee6be1d8..397510b91 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-12-09 + 2024-3-19 - + \ No newline at end of file diff --git a/env_support/cmsis-pack/README.md b/env_support/cmsis-pack/README.md index 911d38dee..6a6cf9465 100644 --- a/env_support/cmsis-pack/README.md +++ b/env_support/cmsis-pack/README.md @@ -35,7 +35,9 @@ remove the misleading guide above this code segment. #define LV_CONF_H #include -#include "RTE_Components.h" +#if defined(_RTE_) + #include "RTE_Components.h" +#endif ... ``` diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index a65a34592..d078011ac 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v8.3.11 + * Configuration file for v8.4.0 */ /* clang-format off */ @@ -10,7 +10,10 @@ #define LV_CONF_H #include -#include "RTE_Components.h" + +#if defined(_RTE_) + #include "RTE_Components.h" +#endif /*==================== COLOR SETTINGS diff --git a/library.json b/library.json index 11697d759..db41d53d4 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "8.3.11", + "version": "8.4.0", "keywords": "graphics, gui, embedded, tft, lvgl", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "repository": { diff --git a/library.properties b/library.properties index bc7411552..61f3eea56 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=8.3.11 +version=8.4.0 author=kisvegabor maintainer=kisvegabor,embeddedt,pete-pjb sentence=Full-featured Graphics Library for Embedded Systems diff --git a/lv_conf_template.h b/lv_conf_template.h index bed77fb8f..1ed255dae 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v8.3.11 + * Configuration file for v8.4.0 */ /* diff --git a/lvgl.h b/lvgl.h index 47700d4e6..72be09d46 100644 --- a/lvgl.h +++ b/lvgl.h @@ -14,8 +14,8 @@ extern "C" { * CURRENT VERSION OF LVGL ***************************/ #define LVGL_VERSION_MAJOR 8 -#define LVGL_VERSION_MINOR 3 -#define LVGL_VERSION_PATCH 11 +#define LVGL_VERSION_MINOR 4 +#define LVGL_VERSION_PATCH 0 #define LVGL_VERSION_INFO "" /********************* diff --git a/lvgl.pc.in b/lvgl.pc.in index 0219c5a48..eeec2b659 100644 --- a/lvgl.pc.in +++ b/lvgl.pc.in @@ -5,6 +5,6 @@ libdir=${prefix}/lib Name: lvgl Description: Light and Versatile Graphics Library URL: https://lvgl.io/ -Version: 8.3.11 +Version: 8.4.0 Cflags: -I${includedir} Libs: -L${libdir} -llvgl -- cgit v1.2.3