From 783dc6be9ada82980100e40757b908186bbb251a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 22 Sep 2020 10:36:39 +0200 Subject: [PATCH 1/2] update release script --- scripts/release.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index 0a4618d29..8b64a55e0 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -456,7 +456,7 @@ def cleanup(): cmd("rm -fr " + workdir) if __name__ == '__main__': - dev_prepare = 'minor' + dev_prepare = 'bugfix' if(len(sys.argv) != 2): print("Missing argument. Usage ./release.py bugfix | minor | major") print("Use minor by deafult") @@ -474,7 +474,7 @@ if __name__ == '__main__': dev_ver_patch = ver_patch dev_ver_str = ver_str - get_lvgl_version("master") + get_lvgl_version("master") lvgl_prepare() lv_examples_prepare() @@ -496,13 +496,6 @@ if __name__ == '__main__': lvgl_update_master_version() docs_update_latest_version() - get_lvgl_version("dev") - dev_ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev" - merge_to_dev() - - lvgl_update_dev_version() - docs_update_dev_version() - publish_dev() else: #merge_from_dev() From f2bd86ed7cc89c0e5507143acec07d25ce4d8acc Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 22 Sep 2020 10:39:15 +0200 Subject: [PATCH 2/2] prepare to release v7.6.0 --- library.json | 2 +- library.properties | 2 +- lvgl.h | 2 +- src/lv_core/lv_obj.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library.json b/library.json index 1f2dbc776..d324347db 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.5.0", + "version": "7.6.0", "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 930fc4898..3fd5bbc96 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.5.0 +version=7.6.0 author=kisvegabor maintainer=kisvegabor,embeddedt,pete-pjb sentence=Full-featured Graphics Library for Embedded Systems diff --git a/lvgl.h b/lvgl.h index d842d1062..27a5e64b4 100644 --- a/lvgl.h +++ b/lvgl.h @@ -17,7 +17,7 @@ extern "C" { #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 6 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "dev" +#define LVGL_VERSION_INFO "" /********************* * INCLUDES diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index cbde3a207..c555b320a 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -102,9 +102,9 @@ typedef struct { lv_color_t scale_grad_color; lv_color_t scale_end_color; lv_opa_t opa_scale; - uint32_t clip_corder :1; - uint32_t border_post :1; -}style_snapshot_t; + uint32_t clip_corder : 1; + uint32_t border_post : 1; +} style_snapshot_t; typedef enum { STYLE_COMPARE_SAME,