diff --git a/CHANGELOG.md b/CHANGELOG.md index 04e84cf20..5f2e029da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,29 @@ # Changelog -## v7.4.0 (planned on 01.09.2020) +## v7.6.0 (TBD) + +### New features + +## 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. ### 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 -- 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. +- 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/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/lv_conf_template.h b/lv_conf_template.h index 3fd14924c..d4d419a6c 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.6.0-dev */ /* diff --git a/lvgl.h b/lvgl.h index fb18d9ff2..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 4 -#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" /********************* diff --git a/r.patch b/r.patch new file mode 100644 index 000000000..e3f80d539 --- /dev/null +++ b/r.patch @@ -0,0 +1,62 @@ +diff --git a/scripts/release.py b/scripts/release.py +index c06bf529..3a7f27b8 100755 +--- a/scripts/release.py ++++ b/scripts/release.py +@@ -59,6 +59,9 @@ proj_list = [ "lv_sim_eclipse_sdl"] + ver_major = -1 + ver_minor = -1 + ver_patch = -1 ++dev_ver_major = -1 ++dev_ver_minor = -1 ++dev_ver_patch = -1 + + ver_str = "" + dev_ver_str = "" +@@ -309,7 +312,7 @@ 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 merge master -X ours") # Use ours to keep the version numbers + cmd("git add .") + cmd("git commit -am 'Merge master'", False) + cmd("git push origin dev") +@@ -473,6 +476,11 @@ if __name__ == '__main__': + exit(1) + + clone_repos() ++ get_lvgl_version("dev") ++ dev_ver_major = ver_major ++ dev_ver_minor = ver_minor ++ dev_ver_patch = ver_patch ++ + get_lvgl_version("master") + lvgl_prepare() + lv_examples_prepare() +@@ -483,16 +491,17 @@ if __name__ == '__main__': + update_release_branches() + publish_master() + ++ projs_update() ++ + if dev_prepare == 'bugfix': + ver_patch = str(int(ver_patch) + 1) +- ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev" ++ ver_str = "v" + str(ver_major) + "." + str(ver_minor) + "." + str(ver_patch) + "-dev" + + print("Prepare bugfix version " + ver_str) + + 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() + +@@ -520,6 +529,5 @@ if __name__ == '__main__': + docs_update_dev_version() + publish_dev_and_master() + +- projs_update() + cleanup() + diff --git a/scripts/release.py b/scripts/release.py index 639363dd8..c06bf5292 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -305,14 +305,25 @@ 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'", False) + 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) 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) @@ -373,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*') @@ -407,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 @@ -460,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() @@ -498,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() diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d43134241..0f5f28ac0 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1047,6 +1047,11 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #endif #endif +/*Rotary (dependencies: lv_arc, lv_btn)*/ +#ifndef LV_USE_ROTARY +#define LV_USE_ROTARY 1 +#endif + /*Slider (dependencies: lv_bar)*/ #ifndef LV_USE_SLIDER #define LV_USE_SLIDER 1