Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-08-18 02:38:01 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

chore(cmsis-pack): monthly catch-up (#6129)

Browse Source
This commit is contained in:
Gabriel Wang
2024-05-03 09:52:42 +02:00
committed by GitHub
parent 9aa95c3f47
commit 4d773ae1c1
6 changed files with 117 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
env_support/cmsis-pack/LVGL.lvgl.9.1.1-dev1.pack → env_support/cmsis-pack/LVGL.lvgl.9.1.1-dev2.pack
BIN
View File
Binary file not shown.
env_support/cmsis-pack/LVGL.lvgl.pdsc
+16 -8
View File
@@ -36,7 +36,7 @@
<repository type="git">https://github.com/lvgl/lvgl.git</repository>
<releases>
<release date="2024-03-24" version="9.1.1-dev1" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.9.1.1-dev1.pack">
<release date="2024-04-30" version="9.1.1-dev2" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.9.1.1-dev2.pack">
- LVGL 9.1.1-dev
</release>
<release date="2024-03-19" version="9.1.0" url="https://github.com/lvgl/lvgl/raw/v9.1.0/env_support/cmsis-pack/LVGL.lvgl.9.1.0.pack">
@@ -488,6 +488,8 @@
<!-- src/draw/sw/blend -->
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend.c" />
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c" />
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend_to_l8.c" />
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend_to_al88.c" />
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c" />
<file category="sourceC" name="src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c" />
<file category="sourceAsm" name="src/draw/sw/blend/neon/lv_blend_neon.S" condition="NEON GNU Assembler"/>
@@ -521,6 +523,7 @@
<file category="sourceC" name="src/font/lv_font_montserrat_46.c" />
<file category="sourceC" name="src/font/lv_font_montserrat_48.c" />
<file category="sourceC" name="src/font/lv_font_simsun_16_cjk.c" />
<file category="sourceC" name="src/font/lv_font_simsun_14_cjk.c" />
<file category="sourceC" name="src/font/lv_font_unscii_8.c" />
<file category="sourceC" name="src/font/lv_font_unscii_16.c" />
@@ -566,6 +569,7 @@
<file category="sourceC" name="src/misc/cache/lv_cache.c" />
<file category="sourceC" name="src/misc/cache/lv_cache_entry.c" />
<file category="sourceC" name="src/misc/cache/lv_image_cache.c" />
<file category="sourceC" name="src/misc/cache/lv_image_header_cache.c" />
<!-- src/stdlib-->
<file category="sourceC" name="src/stdlib/lv_mem.c" />
@@ -598,6 +602,7 @@
<file category="sourceC" name="src/widgets/button/lv_button.c" />
<file category="sourceC" name="src/widgets/buttonmatrix/lv_buttonmatrix.c" />
<file category="sourceC" name="src/widgets/calendar/lv_calendar.c" />
<file category="sourceC" name="src/widgets/calendar/lv_calendar_chinese.c" />
<file category="sourceC" name="src/widgets/calendar/lv_calendar_header_arrow.c" />
<file category="sourceC" name="src/widgets/calendar/lv_calendar_header_dropdown.c" />
<file category="sourceC" name="src/widgets/canvas/lv_canvas.c" />
@@ -644,18 +649,18 @@
<file category="sourceC" name="src/osal/lv_os_none.c"/>
<!-- general -->
<file category="preIncludeGlobal" name="lv_conf_cmsis.h" attr="config" version="2.1.5" />
<file category="preIncludeGlobal" name="lv_conf_cmsis.h" attr="config" version="2.1.6" />
<file category="sourceC" name="lv_cmsis_pack.c" />
<file category="header" name="lvgl.h" />
<file category="doc" name="README.md"/>
<!-- code template -->
<file category="header" name="examples/porting/lv_port_disp_template.h" attr="template" select="Display port template" version="2.1.0"/>
<file category="sourceC" name="examples/porting/lv_port_disp_template.c" attr="template" select="Display port template" version="2.1.0"/>
<file category="header" name="examples/porting/lv_port_indev_template.h" attr="template" select="Input devices port template" version="2.1.0"/>
<file category="sourceC" name="examples/porting/lv_port_indev_template.c" attr="template" select="Input devices port template" version="2.1.0"/>
<file category="header" name="examples/porting/lv_port_fs_template.h" attr="template" select="File system port template" version="2.1.0"/>
<file category="sourceC" name="examples/porting/lv_port_fs_template.c" attr="template" select="File system port template" version="2.1.0"/>
<file category="header" name="examples/porting/lv_port_disp_template.h" attr="template" select="Display port template" version="2.2.0"/>
<file category="sourceC" name="examples/porting/lv_port_disp_template.c" attr="template" select="Display port template" version="2.2.0"/>
<file category="header" name="examples/porting/lv_port_indev_template.h" attr="template" select="Input devices port template" version="2.2.0"/>
<file category="sourceC" name="examples/porting/lv_port_indev_template.c" attr="template" select="Input devices port template" version="2.2.0"/>
<file category="header" name="examples/porting/lv_port_fs_template.h" attr="template" select="File system port template" version="2.2.0"/>
<file category="sourceC" name="examples/porting/lv_port_fs_template.c" attr="template" select="File system port template" version="2.2.0"/>
</files>
<Pre_Include_Global_h>
@@ -1303,6 +1308,7 @@
<files>
<!-- src/libs/fsdrv -->
<file category="sourceCpp" name="src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp" />
<file category="sourceCpp" name="src/libs/fsdrv/lv_fs_arduino_sd.cpp" />
</files>
<RTE_Components_h>
@@ -1760,9 +1766,11 @@
<!-- demos/render -->
<file category="sourceC" name="demos/render/assets/img_render_arc_bg.c" />
<file category="sourceC" name="demos/render/assets/img_render_lvgl_logo_argb8888.c" />
<file category="sourceC" name="demos/render/assets/img_render_lvgl_logo_l8.c" />
<file category="sourceC" name="demos/render/assets/img_render_lvgl_logo_rgb565.c" />
<file category="sourceC" name="demos/render/assets/img_render_lvgl_logo_rgb888.c" />
<file category="sourceC" name="demos/render/assets/img_render_lvgl_logo_xrgb8888.c" />
</files>
</component>
env_support/cmsis-pack/LVGL.pidx
+2 -2
View File
@@ -2,8 +2,8 @@
<index schemaVersion="1.0.0" xs:noNamespaceSchemaLocation="PackIndex.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
<vendor>LVGL</vendor>
<url>https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/</url>
<timestamp>2024-03-24</timestamp>
<timestamp>2024-04-30</timestamp>
<pindex>
<pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="9.1.1-dev1"/>
<pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="9.1.1-dev2"/>
</pindex>
</index>
env_support/cmsis-pack/gen_pack.sh
+1
View File
@@ -54,6 +54,7 @@ PACK_BASE_FILES="
../../LICENCE.txt
../../README.md
../../lvgl.h
../../lv_version.h
lv_conf_cmsis.h
lv_cmsis_pack.txt
"
env_support/cmsis-pack/lv_conf_cmsis.h
+7 -3
View File
@@ -148,9 +148,6 @@
#endif
#endif
/* Set stack size of drawing thread. Unit is byte. If Thorvg is enabled, 128kB is required tested on simulator.*/
#define LV_DRAW_THREAD_STACKSIZE 32768
#if LV_USE_DRAW_VGLITE
/* Enable blit quality degradation workaround recommended for screen's dimension > 352 pixels. */
#define LV_USE_VGLITE_BLIT_SPLIT 0
@@ -224,6 +221,11 @@
*0: User need to register a callback with `lv_log_register_print_cb()`*/
#define LV_LOG_PRINTF 1
/*Set callback to print the logs.
*E.g `my_print`. The prototype should be `void my_print(lv_log_level_t level, const char * buf)`
*Can be overwritten by `lv_log_register_print_cb`*/
//#define LV_LOG_PRINT_CB
/*1: Enable print timestamp;
*0: Disable print timestamp*/
#define LV_LOG_USE_TIMESTAMP 1
@@ -412,6 +414,7 @@
/*Demonstrate special features*/
#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_14_CJK 0 /*1000 most common CJK radicals*/
#define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/
/*Pixel perfect monospace fonts*/
@@ -510,6 +513,7 @@
#define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}
#define LV_USE_CALENDAR_HEADER_ARROW 1
#define LV_USE_CALENDAR_HEADER_DROPDOWN 1
#define LV_USE_CALENDAR_CHINESE 0
#endif /*LV_USE_CALENDAR*/
#define LV_USE_CANVAS 1
src/draw/sw/blend/arm2d/lv_blend_arm2d.h
+91 -2
View File
@@ -453,6 +453,15 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_arm2d(_lv_draw_sw_
int16_t des_stride = dsc->dest_stride / sizeof(uint16_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_to_rgb565((uint32_t *)dsc->src_buf,
src_stride,
(uint16_t *)dsc->dest_buf,
des_stride,
&draw_size);
#else
uint16_t * tmp_buf = (uint16_t *)lv_malloc(dsc->dest_stride * dsc->dest_h);
if(NULL == tmp_buf) {
return LV_RESULT_INVALID;
@@ -474,6 +483,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_arm2d(_lv_draw_sw_
&draw_size);
lv_free(tmp_buf);
#endif
return LV_RESULT_OK;
}
@@ -483,10 +493,21 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_with_opa_arm2d(_lv
int16_t des_stride = dsc->dest_stride / sizeof(uint16_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_rgb565_with_opacity((uint32_t *)dsc->src_buf,
src_stride,
(uint16_t *)dsc->dest_buf,
des_stride,
&draw_size,
dsc->opa);
#else
uint16_t * tmp_buf = (uint16_t *)lv_malloc(dsc->dest_stride * dsc->dest_h);
if(NULL == tmp_buf) {
return LV_RESULT_INVALID;
}
uint8_t * tmp_msk = (uint8_t *)lv_malloc(des_stride * dsc->dest_h);
if(NULL == tmp_msk) {
lv_free(tmp_buf);
@@ -522,6 +543,8 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_with_opa_arm2d(_lv
lv_free(tmp_msk);
lv_free(tmp_buf);
#endif
return LV_RESULT_OK;
}
@@ -531,6 +554,17 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_with_mask_arm2d(_l
int16_t des_stride = dsc->dest_stride / sizeof(uint16_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_rgb565_with_src_mask((uint32_t *)dsc->src_buf,
src_stride,
(uint8_t *)dsc->mask_buf,
dsc->mask_stride,
&draw_size,
(uint16_t *)dsc->dest_buf,
des_stride,
&draw_size);
#else
uint16_t * tmp_buf = (uint16_t *)lv_malloc(dsc->dest_stride * dsc->dest_h);
if(NULL == tmp_buf) {
return LV_RESULT_INVALID;
@@ -572,6 +606,8 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_with_mask_arm2d(_l
lv_free(tmp_msk);
lv_free(tmp_buf);
#endif
return LV_RESULT_OK;
}
@@ -581,6 +617,17 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_mix_mask_opa_arm2d
int16_t des_stride = dsc->dest_stride / sizeof(uint16_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_rgb565_with_src_mask_and_opacity((uint32_t *)dsc->src_buf,
src_stride,
(uint8_t *)dsc->mask_buf,
dsc->mask_stride,
&draw_size,
(uint16_t *)dsc->dest_buf,
des_stride,
&draw_size,
dsc->opa);
#else
uint16_t * tmp_buf = (uint16_t *)lv_malloc(dsc->dest_stride * dsc->dest_h);
if(NULL == tmp_buf) {
return LV_RESULT_INVALID;
@@ -623,6 +670,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb565_mix_mask_opa_arm2d
lv_free(tmp_msk);
lv_free(tmp_buf);
#endif
return LV_RESULT_OK;
}
@@ -936,6 +984,13 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_arm2d(_lv_draw_sw_
int16_t des_stride = dsc->dest_stride / sizeof(uint32_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_to_cccn888((uint32_t *)dsc->src_buf,
src_stride,
(uint32_t *)dsc->dest_buf,
des_stride,
&draw_size);
#else
__arm_2d_impl_cccn888_src_chn_msk_copy((uint32_t *)dsc->src_buf,
src_stride,
(uint32_t *)((uintptr_t)(dsc->src_buf) + 3),
@@ -944,7 +999,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_arm2d(_lv_draw_sw_
(uint32_t *)dsc->dest_buf,
des_stride,
&draw_size);
#endif
return LV_RESULT_OK;
}
@@ -959,6 +1014,15 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_with_opa_arm2d(_lv
int16_t des_stride = dsc->dest_stride / sizeof(uint32_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_cccn888_with_opacity((uint32_t *)dsc->src_buf,
src_stride,
(uint32_t *)dsc->dest_buf,
des_stride,
&draw_size,
dsc->opa);
#else
uint8_t * tmp_msk = (uint8_t *)lv_malloc(des_stride * dsc->dest_h);
if(NULL == tmp_msk) {
return LV_RESULT_INVALID;
@@ -985,6 +1049,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_with_opa_arm2d(_lv
&draw_size);
lv_free(tmp_msk);
#endif
return LV_RESULT_OK;
}
@@ -1000,6 +1065,17 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_with_mask_arm2d(_l
int16_t des_stride = dsc->dest_stride / sizeof(uint32_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_cccn888_with_src_mask((uint32_t *)dsc->src_buf,
src_stride,
(uint8_t *)dsc->mask_buf,
dsc->mask_stride,
&draw_size,
(uint32_t *)dsc->dest_buf,
des_stride,
&draw_size);
#else
__arm_2d_impl_cccn888_src_chn_msk_des_msk_copy((uint32_t *)dsc->src_buf,
src_stride,
(uint32_t *)((uintptr_t)(dsc->src_buf) + 3),
@@ -1011,6 +1087,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_with_mask_arm2d(_l
dsc->mask_stride,
&draw_size,
&draw_size);
#endif
return LV_RESULT_OK;
}
@@ -1026,6 +1103,18 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_mix_mask_opa_arm2d
int16_t des_stride = dsc->dest_stride / sizeof(uint32_t);
int16_t src_stride = dsc->src_stride / sizeof(uint32_t);
#if ARM_2D_VERSION >= 10106ul
__arm_2d_impl_ccca8888_tile_copy_to_cccn888_with_src_mask_and_opacity((uint32_t *)dsc->src_buf,
src_stride,
(uint8_t *)dsc->mask_buf,
dsc->mask_stride,
&draw_size,
(uint32_t *)dsc->dest_buf,
des_stride,
&draw_size,
dsc->opa);
#else
__arm_2d_impl_gray8_colour_filling_with_opacity((uint8_t *)dsc->mask_buf,
dsc->mask_stride,
&draw_size,
@@ -1043,7 +1132,7 @@ static inline lv_result_t _lv_argb8888_blend_normal_to_rgb888_mix_mask_opa_arm2d
dsc->mask_stride,
&draw_size,
&draw_size);
#endif
return LV_RESULT_OK;
}