From beec11565cf32ab0e2cc1052bbcc74f4fd462e93 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 11:29:08 +0200 Subject: [PATCH 1/8] update changelog --- CHANGELOG.md | 8 +++++--- scripts/release.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5141e6527..455c9634e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,15 @@ ## v7.4.0 (planned on 01.09.2020) +The main new features of v7.4 are run-time font loading, style caching and arc knob with value setting by click. + ### New features -- arc: add set value by click feature -- arc: add `LV_ARC_PART_KNOB` similarly to slider -- send gestures even is the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. - Add `lv_font_load()` function - Loads a `lv_font_t` object from a binary font file - Add `lv_font_free()` function - Frees the memory allocated by the `lv_font_load()` function - Add style caching to reduce acces time of properties with default value +- arc: add set value by click feature +- arc: add `LV_ARC_PART_KNOB` similarly to slider +- send gestures even is the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. ### Bugfixes - Fix color bleeding on border drawing diff --git a/scripts/release.py b/scripts/release.py index 639363dd8..fbde8f8c5 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -305,6 +305,17 @@ def update_release_branches(): cmd("cd docs; " + merge_cmd) def publish_master(): + + #Merge LVGL master to dev first to avoid "merge-to-dev.yml" running asynchronous + os.chdir("./lvgl") + cmd("git checkout dev") + cmd("git merge master -X theirs") + cmd("git add .") + cmd("git commit -am 'Merge master'") + cmd("git push origin dev") + cmd("git checkout master") + os.chdir("../") + pub_cmd = "git push origin master; git push origin " + ver_str cmd("cd lvgl; " + pub_cmd) cmd("cd lv_examples; " + pub_cmd) From 343605ebac1c2a4c684a01cebc970d64aea5e747 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 11:34:10 +0200 Subject: [PATCH 2/8] prepare to release v7.4.0 --- CHANGELOG.md | 2 +- library.json | 2 +- library.properties | 2 +- lvgl.h | 2 +- src/lv_conf_internal.h | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 455c9634e..bcdf6b855 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v7.4.0 (planned on 01.09.2020) +## v7.4.0 (01.09.2020) The main new features of v7.4 are run-time font loading, style caching and arc knob with value setting by click. diff --git a/library.json b/library.json index a6eb48edf..5f6adb3ed 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.3.1", + "version": "7.4.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 44897bb54..4a160a47f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.3.1 +version=7.4.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 fb18d9ff2..ee54e2d80 100644 --- a/lvgl.h +++ b/lvgl.h @@ -17,7 +17,7 @@ extern "C" { #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 4 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "dev" +#define LVGL_VERSION_INFO "" /********************* * INCLUDES diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 8a031535f..0f5f28ac0 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1049,8 +1049,9 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ /*Rotary (dependencies: lv_arc, lv_btn)*/ #ifndef LV_USE_ROTARY -#define LV_USE_ROTARY 1 +#define LV_USE_ROTARY 1 #endif + /*Slider (dependencies: lv_bar)*/ #ifndef LV_USE_SLIDER #define LV_USE_SLIDER 1 From 6d7bd355ed268c1ba504ed7bdf3242aafdda8145 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 11:39:54 +0200 Subject: [PATCH 3/8] fix version lv_conf_template.h --- lv_conf_template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index 508d361fa..97e91762c 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.4.0-dev + * Configuration file for v7.4.0 */ /* From 3d32290ee40de2c5e5e476468bad430084299f20 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 11:59:50 +0200 Subject: [PATCH 4/8] fix version number --- lv_conf_template.h | 2 +- lvgl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index f41d573c2..7f009b082 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.4.0 + * Configuration file for v7.5.0-dev */ /* diff --git a/lvgl.h b/lvgl.h index ee54e2d80..288d48184 100644 --- a/lvgl.h +++ b/lvgl.h @@ -15,9 +15,9 @@ extern "C" { * CURRENT VERSION OF LVGL ***************************/ #define LVGL_VERSION_MAJOR 7 -#define LVGL_VERSION_MINOR 4 +#define LVGL_VERSION_MINOR 5 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "" +#define LVGL_VERSION_INFO "dev" /********************* * INCLUDES From 0104d436e90e41b96c2cf3a1628ae8daa6d32085 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 12:06:21 +0200 Subject: [PATCH 5/8] Update dev version --- lv_conf_template.h | 2 +- lvgl.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index 7f009b082..d4d419a6c 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.5.0-dev + * Configuration file for v7.6.0-dev */ /* diff --git a/lvgl.h b/lvgl.h index 288d48184..1ab541ea0 100644 --- a/lvgl.h +++ b/lvgl.h @@ -14,9 +14,9 @@ extern "C" { /*************************** * CURRENT VERSION OF LVGL ***************************/ -#define LVGL_VERSION_MAJOR 7 -#define LVGL_VERSION_MINOR 5 -#define LVGL_VERSION_PATCH 0 +#define LVGL_VERSION_MAJOR 7 +#define LVGL_VERSION_MINOR 6 +#define LVGL_VERSION_PATCH 0 #define LVGL_VERSION_INFO "dev" /********************* From d9414610522895cba16c990e1854fe6903c3653a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 12:20:19 +0200 Subject: [PATCH 6/8] release script fixes --- scripts/release.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index fbde8f8c5..c06bf5292 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -311,7 +311,7 @@ def publish_master(): cmd("git checkout dev") cmd("git merge master -X theirs") cmd("git add .") - cmd("git commit -am 'Merge master'") + cmd("git commit -am 'Merge master'", False) cmd("git push origin dev") cmd("git checkout master") os.chdir("../") @@ -322,8 +322,8 @@ def publish_master(): cmd("cd lv_drivers; " + pub_cmd) pub_cmd = "git push origin latest; git push origin " + ver_str - cmd("cd docs; " + pub_cmd) - cmd("cd docs; git checkout master; ./update.py " + release_br) + cmd("cd docs; " + pub_cmd) + cmd("cd docs; git checkout master; python 2.7 ./update.py " + release_br) pub_cmd = "git push origin master" cmd("cd blog; " + pub_cmd) @@ -384,9 +384,9 @@ def lvgl_update_dev_version(): os.chdir("./lvgl") cmd("git checkout dev") - define_set("./lvgl.h", "LVGL_VERSION_MAJOR", ver_major) - define_set("./lvgl.h", "LVGL_VERSION_MINOR", ver_minor) - define_set("./lvgl.h", "LVGL_VERSION_PATCH", ver_patch) + define_set("./lvgl.h", "LVGL_VERSION_MAJOR", str(ver_major)) + define_set("./lvgl.h", "LVGL_VERSION_MINOR", str(ver_minor)) + define_set("./lvgl.h", "LVGL_VERSION_PATCH", str(ver_patch)) define_set("./lvgl.h", "LVGL_VERSION_INFO", "\"dev\"") templ = fnmatch.filter(os.listdir('.'), '*templ*') @@ -418,7 +418,7 @@ def publish_dev_and_master(): pub_cmd = "git checkout master; git push origin master" cmd("cd lvgl; " + pub_cmd) - cmd("cd docs; git checkout master; ./update.py latest dev") + cmd("cd docs; git checkout master; python 2.7 ./update.py latest dev") def projs_update(): global proj_list, release_br, ver_str @@ -471,7 +471,7 @@ if __name__ == '__main__': if not (dev_prepare in prepare_type): print("Invalid argument. Usage ./release.py bugfix | minor | major") exit(1) - + clone_repos() get_lvgl_version("master") lvgl_prepare() @@ -509,9 +509,9 @@ if __name__ == '__main__': ver_minor = "0" ver_patch = "0" - dev_ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev" + dev_ver_str = "v" + str(ver_major) + "." + str(ver_minor) + "." + str(ver_patch) + "-dev" - print("Prepare minor version " + ver_str) + print("Prepare minor version " + dev_ver_str) merge_to_dev() merge_from_dev() From fb6e7deadfa96d47ca985cf60acf1a75f35003f6 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 12:24:18 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcdf6b855..adb860656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## v7.5.0 (planned at 15.09.2020) + +### New features +- Add `clean_dcache_cb` and `lv_disp_clean_dcache` to enable users to use their own cache management function +- Add `gpu_wait_cb` to wait until the GPU is working. It allows to run CPU a wait only when the rendered data is needed. + +### Bugfixes + + ## v7.4.0 (01.09.2020) The main new features of v7.4 are run-time font loading, style caching and arc knob with value setting by click. From b4a8a21d265d272e282645367e8a749734681559 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Sep 2020 13:01:21 +0200 Subject: [PATCH 8/8] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index adb860656..5f2e029da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v7.6.0 (TBD) + +### New features + ## v7.5.0 (planned at 15.09.2020) ### New features