Skip to content

Commit a82dc49

Browse files
pre-release for LVGL cmsis-pack v1.0.1 (lvgl#3091)
* pre-release for LVGL cmsis-pack v1.0.1 * update lv_conf_cmsis.h
1 parent 4a766c5 commit a82dc49

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

env_support/cmsis-pack/LVGL.lvgl.pdsc

+6-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
<repository type="git">https://github.com/lvgl/lvgl.git</repository>
3737

3838
<releases>
39-
<release date="2022-01-31" version="1.0.0" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.1.0.0.pack">
39+
<release date="2022-02-14" version="1.0.1-alpha3" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.1.0.1-alpha3.pack">
40+
- LVGL 8.3.0-dev
41+
- Monthly update
42+
</release>
43+
<release date="2022-01-31" version="1.0.0" url="https://github.com/lvgl/lvgl/blob/d851fe0528fcb920fee86c944fe9dbbaf6fbb0c9/env_support/cmsis-pack/LVGL.lvgl.1.0.0.pack?raw=true">
4044
- LVGL 8.2.0
4145
- Enable LV_TICK_CUSTOM when perf_counter is detected.
4246
- Celebrate Spring Festival
@@ -149,7 +153,7 @@
149153
-->
150154

151155
<components>
152-
<bundle Cbundle="LVGL" Cclass="LVGL" Cversion="8.2.0">
156+
<bundle Cbundle="LVGL" Cclass="LVGL" Cversion="8.3.0-dev">
153157
<description>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.</description>
154158
<doc></doc>
155159
<component Cgroup="lvgl" Csub="Essential" >

env_support/cmsis-pack/LVGL.pidx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<index schemaVersion="1.0.0" xs:noNamespaceSchemaLocation="PackIndex.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
33
<vendor>LVGL</vendor>
44
<url>https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/</url>
5-
<timestamp>2022-01-31T12:31:00</timestamp>
5+
<timestamp>2022-02-14T14:3700</timestamp>
66
<pindex>
7-
<pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="1.0.0"/>
7+
<pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="1.0.1-alpha3"/>
88
</pindex>
99
</index>

env_support/cmsis-pack/lv_conf_cmsis.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@
9191
#if LV_TICK_CUSTOM
9292
extern uint32_t SystemCoreClock;
9393
#define LV_TICK_CUSTOM_INCLUDE "perf_counter.h"
94-
#define LV_TICK_CUSTOM_SYS_TIME_EXPR (get_system_ticks() / (SystemCoreClock / 1000ul))
94+
95+
#if __PER_COUNTER_VER__ < 10902ul
96+
#define LV_TICK_CUSTOM_SYS_TIME_EXPR ((uint32_t)get_system_ticks() / (SystemCoreClock / 1000ul))
97+
#else
98+
#define LV_TICK_CUSTOM_SYS_TIME_EXPR get_system_ms()
99+
#endif
95100
#endif /*LV_TICK_CUSTOM*/
96101
#else
97102
#define LV_TICK_CUSTOM 0

0 commit comments

Comments
 (0)