diff --git a/env_support/cmsis-pack/LVGL.lvgl.1.0.2.pack b/env_support/cmsis-pack/LVGL.lvgl.1.0.3-alpha.pack
similarity index 93%
rename from env_support/cmsis-pack/LVGL.lvgl.1.0.2.pack
rename to env_support/cmsis-pack/LVGL.lvgl.1.0.3-alpha.pack
index 94aedeb67..1acdb2e4f 100644
Binary files a/env_support/cmsis-pack/LVGL.lvgl.1.0.2.pack and b/env_support/cmsis-pack/LVGL.lvgl.1.0.3-alpha.pack differ
diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc
index 055c5906d..805619e42 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.3.0-dev
+ - Monthly update for April
+
+
- LVGL 8.3.0-dev
- Monthly update for March
- Add GPU support for Arm-2D library
@@ -326,7 +330,7 @@
-
+
A 2D image processing library from Arm (i.e. Arm-2D) for All Cortex-M processors including Cortex-M0
@@ -337,10 +341,6 @@
/*! \brief enable Arm-2D support*/
#define LV_USE_GPU_ARM2D 1
-/*! \brief disable asynchronouse mode by default */
-#ifndef __ARM_2D_HAS_ASYNC__
-# define __ARM_2D_HAS_ASYNC__ 0
-#endif
diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx
index 2f548185c..f44c61966 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-03-27T20:44:00
+ 2022-04-13T19:22:00
-
+
\ No newline at end of file
diff --git a/env_support/cmsis-pack/README.md b/env_support/cmsis-pack/README.md
index 1cd2def0d..7d181d427 100644
--- a/env_support/cmsis-pack/README.md
+++ b/env_support/cmsis-pack/README.md
@@ -6,7 +6,7 @@
1. Copy the **lv_conf_template.h** to '**cmsis-pack**' directory
-2. Set the macro protector to '1'
+2. Set the macro protector to '1'
```c
...
@@ -15,6 +15,18 @@
...
```
+remove the misleading guide above this code segment.
+
+```c
+/*
+ * Copy this file as `lv_conf.h`
+ * 1. simply next to the `lvgl` folder
+ * 2. or any other places and
+ * - define `LV_CONF_INCLUDE_SIMPLE`
+ * - add the path as include path
+ */
+```
+
3. Add including for '**RTE_Components.h**'
@@ -72,7 +84,7 @@
#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_INCLUDE "perf_counter.h"
#if __PER_COUNTER_VER__ < 10902ul
#define LV_TICK_CUSTOM_SYS_TIME_EXPR ((uint32_t)get_system_ticks() / (SystemCoreClock / 1000ul))
diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h
index dfa20653a..cd9626e7c 100644
--- a/env_support/cmsis-pack/lv_conf_cmsis.h
+++ b/env_support/cmsis-pack/lv_conf_cmsis.h
@@ -3,14 +3,6 @@
* Configuration file for v8.3.0-dev
*/
-/*
- * Copy this file as `lv_conf.h`
- * 1. simply next to the `lvgl` folder
- * 2. or any other places and
- * - define `LV_CONF_INCLUDE_SIMPLE`
- * - add the path as include path
- */
-
/* clang-format off */
#if 1 /*Set it to "1" to enable content*/
@@ -597,6 +589,12 @@
/*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
+
+/*1: Enable a published subscriber based messaging system */
+#define LV_USE_MSG 0
+
/*==================
* EXAMPLES
*==================*/
diff --git a/src/draw/arm2d/lv_gpu_arm2d.c b/src/draw/arm2d/lv_gpu_arm2d.c
index 3f4754481..d2bf8a581 100644
--- a/src/draw/arm2d/lv_gpu_arm2d.c
+++ b/src/draw/arm2d/lv_gpu_arm2d.c
@@ -78,7 +78,7 @@
* STATIC PROTOTYPES
**********************/
-#if __ARM_2D_HAS_ASYNC__
+#if __ARM_2D_HAS_HW_ACC__
LV_ATTRIBUTE_FAST_MEM
static bool lv_draw_arm2d_fill_colour(const arm_2d_tile_t * target_tile,
const arm_2d_region_t * region,
@@ -227,7 +227,7 @@ void lv_draw_arm2d_ctx_init(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
arm2d_draw_ctx->blend = lv_draw_arm2d_blend;
arm2d_draw_ctx->base_draw.wait_for_finish = lv_gpu_arm2d_wait_cb;
-#if !__ARM_2D_HAS_ASYNC__
+#if !__ARM_2D_HAS_HW_ACC__
arm2d_draw_ctx->base_draw.draw_img_decoded = lv_draw_arm2d_img_decoded;
#endif
@@ -241,7 +241,7 @@ void lv_draw_arm2d_ctx_deinit(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
extern void test_flush(lv_color_t * color_p);
-#if __ARM_2D_HAS_ASYNC__
+#if __ARM_2D_HAS_HW_ACC__
LV_ATTRIBUTE_FAST_MEM
static void lv_draw_arm2d_blend(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc)
{