aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Wang <gabriel.wang@arm.com>2023-05-03 09:11:24 +0100
committerGitHub <noreply@github.com>2023-05-03 10:11:24 +0200
commit2b56e04205481daa6575bd5f7ab5df59d11676eb (patch)
tree850c6738ea95092afe0aeb2eec2a4b29c89aad9b
parent177900b033c8cd126b0e95473ab897e4ad99e13d (diff)
downloadlvgl-8.3.7.tar.gz
lvgl-8.3.7.zip
chore(cmsis-pack): update cmsis-pack for v8.3.7 (#4203)v8.3.7
-rw-r--r--env_support/cmsis-pack/LVGL.lvgl.8.3.7.pack (renamed from env_support/cmsis-pack/LVGL.lvgl.8.3.7-dev1.pack)bin4970899 -> 4971308 bytes
-rw-r--r--env_support/cmsis-pack/LVGL.lvgl.pdsc9
-rw-r--r--env_support/cmsis-pack/LVGL.pidx4
-rw-r--r--env_support/cmsis-pack/lv_conf_cmsis.h2
-rw-r--r--library.json2
-rw-r--r--library.properties2
-rw-r--r--lv_conf_template.h2
-rw-r--r--lvgl.h2
-rw-r--r--src/draw/arm2d/lv_gpu_arm2d.c44
9 files changed, 54 insertions, 13 deletions
diff --git a/env_support/cmsis-pack/LVGL.lvgl.8.3.7-dev1.pack b/env_support/cmsis-pack/LVGL.lvgl.8.3.7.pack
index 000c1de66..e6c23f54a 100644
--- a/env_support/cmsis-pack/LVGL.lvgl.8.3.7-dev1.pack
+++ b/env_support/cmsis-pack/LVGL.lvgl.8.3.7.pack
Binary files differ
diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc
index f26b0fe03..53eb987c6 100644
--- a/env_support/cmsis-pack/LVGL.lvgl.pdsc
+++ b/env_support/cmsis-pack/LVGL.lvgl.pdsc
@@ -36,8 +36,9 @@
<repository type="git">https://github.com/lvgl/lvgl.git</repository>
<releases>
- <release date="2023-04-28" version="8.3.7-dev1" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.8.3.7-dev1.pack">
- - LVGL 8.3.7 dev
+ <release date="2023-04-28" version="8.3.7" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.8.3.7.pack">
+ - LVGL 8.3.7
+ - Minor updates
</release>
<release date="2023-04-02" version="8.3.6" url="https://raw.githubusercontent.com/lvgl/lvgl/master/env_support/cmsis-pack/LVGL.lvgl.8.3.6.pack">
- LVGL 8.3.6 release
@@ -269,7 +270,7 @@
-->
<components>
- <bundle Cbundle="LVGL" Cclass="LVGL" Cversion="8.3.7-dev">
+ <bundle Cbundle="LVGL" Cclass="LVGL" Cversion="8.3.7">
<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>
<doc></doc>
<component Cgroup="lvgl" Csub="Essential" >
@@ -446,7 +447,7 @@
</files>
</component>
- <component Cgroup="lvgl" Csub="GPU Arm-2D" condition="LVGL-GPU-Arm-2D" Cversion="1.2.1">
+ <component Cgroup="lvgl" Csub="GPU Arm-2D" condition="LVGL-GPU-Arm-2D" Cversion="1.2.2">
<description>A 2D image processing library from Arm (i.e. Arm-2D) for All Cortex-M processors including Cortex-M0</description>
<files>
<file category="sourceC" name="src/draw/arm2d/lv_gpu_arm2d.c" condition="Arm-2D"/>
diff --git a/env_support/cmsis-pack/LVGL.pidx b/env_support/cmsis-pack/LVGL.pidx
index db23b8196..8603c605f 100644
--- a/env_support/cmsis-pack/LVGL.pidx
+++ b/env_support/cmsis-pack/LVGL.pidx
@@ -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>2023-02-06T12:22:00</timestamp>
+ <timestamp>2023-05-03</timestamp>
<pindex>
- <pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/release/v8.3/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="8.3.6"/>
+ <pdsc url="https://raw.githubusercontent.com/lvgl/lvgl/release/v8.3/env_support/cmsis-pack/" vendor="LVGL" name="lvgl" version="8.3.7"/>
</pindex>
</index> \ 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 a6a06a791..fdbbef378 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.6
+ * Configuration file for v8.3.7
*/
/* clang-format off */
diff --git a/library.json b/library.json
index 704b057b2..389d8e842 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
{
"name": "lvgl",
- "version": "8.3.6",
+ "version": "8.3.7",
"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 19de5008b..c8f7ae9c1 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
name=lvgl
-version=8.3.6
+version=8.3.7
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 f36af2a28..86ca20764 100644
--- a/lv_conf_template.h
+++ b/lv_conf_template.h
@@ -1,6 +1,6 @@
/**
* @file lv_conf.h
- * Configuration file for v8.3.6
+ * Configuration file for v8.3.7
*/
/*
diff --git a/lvgl.h b/lvgl.h
index 6eedc7f23..985c796c9 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -15,7 +15,7 @@ extern "C" {
***************************/
#define LVGL_VERSION_MAJOR 8
#define LVGL_VERSION_MINOR 3
-#define LVGL_VERSION_PATCH 6
+#define LVGL_VERSION_PATCH 7
#define LVGL_VERSION_INFO ""
/*********************
diff --git a/src/draw/arm2d/lv_gpu_arm2d.c b/src/draw/arm2d/lv_gpu_arm2d.c
index 132268ab9..c42f23872 100644
--- a/src/draw/arm2d/lv_gpu_arm2d.c
+++ b/src/draw/arm2d/lv_gpu_arm2d.c
@@ -3,6 +3,24 @@
*
*/
+/*
+ * Copyright (C) 2010-2023 Arm Limited or its affiliates. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/*********************
* INCLUDES
*********************/
@@ -94,6 +112,8 @@
arm_2dp_rgb565_tile_transform_with_src_mask_and_opacity_prepare
#define arm_2d_tile_transform_with_opacity_prepare \
arm_2dp_rgb565_tile_transform_with_opacity_prepare
+#define arm_2d_tile_transform_only_with_opacity_prepare \
+ arm_2dp_rgb565_tile_transform_only_with_opacity_prepare
#define arm_2d_tile_transform_prepare \
arm_2dp_rgb565_tile_transform_prepare
@@ -131,6 +151,8 @@
arm_2dp_cccn888_tile_transform_with_src_mask_and_opacity_prepare
#define arm_2d_tile_transform_with_opacity_prepare \
arm_2dp_cccn888_tile_transform_with_opacity_prepare
+#define arm_2d_tile_transform_only_with_opacity_prepare \
+ arm_2dp_cccn888_tile_transform_only_with_opacity_prepare
#define arm_2d_tile_transform_prepare \
arm_2dp_cccn888_tile_transform_prepare
@@ -317,7 +339,7 @@
lv_color_t *rgb_tmp_buf = NULL; \
if(draw_dsc->recolor_opa > LV_OPA_MIN) { \
rgb_tmp_buf \
- = lv_malloc(src_w * src_h * sizeof(lv_color_t)); \
+ = lv_mem_buf_get(src_w * src_h * sizeof(lv_color_t)); \
if (NULL == rgb_tmp_buf) { \
LV_LOG_WARN( \
"Failed to allocate memory for accelerating recolour, " \
@@ -345,7 +367,7 @@
#define __RECOLOUR_END() \
} while(0); \
if (NULL != rgb_tmp_buf) { \
- lv_free(rgb_tmp_buf); \
+ lv_mem_buf_release(rgb_tmp_buf); \
} \
} while(0); \
src_buf = src_buf_org;
@@ -1288,6 +1310,24 @@ static void lv_draw_arm2d_img_decoded(struct _lv_draw_ctx_t * draw_ctx,
);
is_accelerated = true;
}
+ #if ARM_2D_VERISON >= 10103
+ else if (LV_IMG_CF_TRUE_COLOR == cf) {
+ __ARM_2D_PREPARE_TRANS_AND_TARGET_REGION(
+ arm_2d_tile_transform_only_with_opacity_prepare,
+ &source_tile,
+ source_center,
+ ARM_2D_ANGLE((draw_dsc->angle / 10.0f)),
+ draw_dsc->zoom / 256.0f,
+ blend_dsc.opa);
+
+ arm_2d_tile_transform(
+ &target_tile,
+ &target_region,
+ NULL
+ );
+ is_accelerated = true;
+ }
+ #endif
else if (LV_IMG_CF_RGB565A8 == cf) {
static arm_2d_tile_t mask_tile;
mask_tile = source_tile;