diff --git a/env_support/cmsis-pack/LVGL.lvgl.1.0.0.pack b/env_support/cmsis-pack/LVGL.lvgl.1.0.1-alpha3.pack similarity index 95% rename from env_support/cmsis-pack/LVGL.lvgl.1.0.0.pack rename to env_support/cmsis-pack/LVGL.lvgl.1.0.1-alpha3.pack index e267e5d119..a0f85c453c 100644 Binary files a/env_support/cmsis-pack/LVGL.lvgl.1.0.0.pack and b/env_support/cmsis-pack/LVGL.lvgl.1.0.1-alpha3.pack differ diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc index 9f3699abdb..241a0f7725 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 + + - LVGL 8.2.0 - Enable LV_TICK_CUSTOM when perf_counter is detected. - Celebrate Spring Festival @@ -149,7 +153,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. diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx index f37c3be92a..612ee8579b 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-01-31T12:31:00 + 2022-02-14T14:3700 - + \ No newline at end of file diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index 6a48b420f2..4d77f792c6 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -91,7 +91,12 @@ #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_ticks() / (SystemCoreClock / 1000ul)) + + #if __PER_COUNTER_VER__ < 10902ul + #define LV_TICK_CUSTOM_SYS_TIME_EXPR ((uint32_t)get_system_ticks() / (SystemCoreClock / 1000ul)) + #else + #define LV_TICK_CUSTOM_SYS_TIME_EXPR get_system_ms() + #endif #endif /*LV_TICK_CUSTOM*/ #else #define LV_TICK_CUSTOM 0