From e728ba19286811da908c7b34814ff8f4e147e659 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 18 Aug 2020 10:22:02 +0200 Subject: [PATCH 1/3] remove debug statements from release.py --- scripts/release.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index 2908ee0ef..141a83444 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -52,7 +52,7 @@ from os import path from datetime import date import sys -upstream_org_url = "https://github.com/kisvegabor/" +upstream_org_url = "https://github.com/lvgl/" workdir = "./release_tmp" ver_major = -1 @@ -98,11 +98,12 @@ def define_set(fn, name, value): f.close() def clone_repos(): - cmd("rm -fr " + workdir) - cmd("mkdir " + workdir) - os.chdir(workdir) - cmd("cp -a ../repos/. .") - return + #For debuging just copy the repos + #cmd("rm -fr " + workdir) + #cmd("mkdir " + workdir) + #os.chdir(workdir) + #cmd("cp -a ../repos/. .") + #return cmd("git clone " + upstream("lvgl-1") + " lvgl; cd lvgl; git checkout master") cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master") @@ -464,4 +465,4 @@ if __name__ == '__main__': publish_dev() cleanup() - \ No newline at end of file + From c0714d9c6b7041a188a58dd402e0e0373f8cad75 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 18 Aug 2020 10:25:19 +0200 Subject: [PATCH 2/3] fix release script --- scripts/release.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index 141a83444..28370c668 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -98,14 +98,15 @@ def define_set(fn, name, value): f.close() def clone_repos(): + cmd("rm -fr " + workdir) + cmd("mkdir " + workdir) + os.chdir(workdir) + #For debuging just copy the repos - #cmd("rm -fr " + workdir) - #cmd("mkdir " + workdir) - #os.chdir(workdir) #cmd("cp -a ../repos/. .") #return - cmd("git clone " + upstream("lvgl-1") + " lvgl; cd lvgl; git checkout master") + cmd("git clone " + upstream("lvgl") + " lvgl; cd lvgl; git checkout master") cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master") cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master") cmd("git clone --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master") From 1088492449df4adc9c7245b149defd9340f3a807 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 18 Aug 2020 10:28:35 +0200 Subject: [PATCH 3/3] prepare to release v7.3.1 --- CHANGELOG.md | 2 +- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- lvgl.h | 2 +- src/lv_api_map.h | 3 ++- src/lv_core/lv_obj.c | 4 ++-- src/lv_widgets/lv_btnmatrix.c | 6 ++++-- src/lv_widgets/lv_linemeter.c | 7 ++++--- src/lv_widgets/lv_table.c | 3 ++- 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e43d6ae20..85372c769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## v7.4.0 (planned on 01.09.2020) *Available in the `dev` branch* -## v7.3.1 (planned on 18.08.2020) +## v7.3.1 (18.08.2020) ### Bugfixes - Fix drawing value string twice diff --git a/library.json b/library.json index 6cb9ab8b3..a6eb48edf 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.3.0", + "version": "7.3.1", "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 712c77392..44897bb54 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.3.0 +version=7.3.1 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 b588ffc3f..e93be3b9d 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.3.0 + * Configuration file for v7.3.1 */ /* diff --git a/lvgl.h b/lvgl.h index c3190f3a5..8052ae20c 100644 --- a/lvgl.h +++ b/lvgl.h @@ -17,7 +17,7 @@ extern "C" { #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 3 #define LVGL_VERSION_PATCH 1 -#define LVGL_VERSION_INFO "dev" +#define LVGL_VERSION_INFO "" /********************* * INCLUDES diff --git a/src/lv_api_map.h b/src/lv_api_map.h index d8e904e8a..6006216cb 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -209,7 +209,8 @@ static inline void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * se #endif -static inline void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs, lv_coord_t y_ofs) +static inline void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs, + lv_coord_t y_ofs) { lv_obj_align_mid(obj, base, align, x_ofs, y_ofs); } diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index c20904733..953da5ac5 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -88,7 +88,7 @@ static void base_dir_refr_children(lv_obj_t * obj); static void obj_align_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, bool x_set, bool y_set, lv_coord_t x_ofs, lv_coord_t y_ofs); static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, bool x_set, bool y_set, - lv_coord_t x_ofs, lv_coord_t y_ofs); + lv_coord_t x_ofs, lv_coord_t y_ofs); #if LV_USE_ANIMATION static lv_style_trans_t * trans_create(lv_obj_t * obj, lv_style_property_t prop, uint8_t part, lv_state_t prev_state, lv_state_t new_state); @@ -3894,7 +3894,7 @@ static void obj_align_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t ali } static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, bool x_set, bool y_set, - lv_coord_t x_ofs, lv_coord_t y_ofs) + lv_coord_t x_ofs, lv_coord_t y_ofs) { lv_coord_t new_x = lv_obj_get_x(obj); lv_coord_t new_y = lv_obj_get_y(obj); diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 722c4180e..651281233 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -1217,10 +1217,12 @@ static uint16_t get_button_from_point(lv_obj_t * btnm, lv_point_t * p) if(btn_area.y1 <= ptop) btn_area.y1 += btnm_cords.y1 - LV_MATH_MIN(ptop, BTN_EXTRA_CLICK_AREA_MAX); else btn_area.y1 += btnm_cords.y1 - pinner; - if(btn_area.x2 >= w - pright - 2) btn_area.x2 += btnm_cords.x1 + LV_MATH_MIN(pright, BTN_EXTRA_CLICK_AREA_MAX); /*-2 for rounding error*/ + if(btn_area.x2 >= w - pright - 2) btn_area.x2 += btnm_cords.x1 + LV_MATH_MIN(pright, + BTN_EXTRA_CLICK_AREA_MAX); /*-2 for rounding error*/ else btn_area.x2 += btnm_cords.x1 + pinner; - if(btn_area.y2 >= h - pbottom - 2) btn_area.y2 += btnm_cords.y1 + LV_MATH_MIN(pbottom, BTN_EXTRA_CLICK_AREA_MAX); /*-2 for rounding error*/ + if(btn_area.y2 >= h - pbottom - 2) btn_area.y2 += btnm_cords.y1 + LV_MATH_MIN(pbottom, + BTN_EXTRA_CLICK_AREA_MAX); /*-2 for rounding error*/ else btn_area.y2 += btnm_cords.y1 + pinner; if(_lv_area_is_point_on(&btn_area, p, 0) != false) { diff --git a/src/lv_widgets/lv_linemeter.c b/src/lv_widgets/lv_linemeter.c index 0de65871c..75019ba46 100644 --- a/src/lv_widgets/lv_linemeter.c +++ b/src/lv_widgets/lv_linemeter.c @@ -393,8 +393,8 @@ void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uin lv_coord_t y_ofs = lmeter->coords.y1 + r_out + top; int16_t angle_ofs = ext->angle_ofs + 90 + (360 - ext->scale_angle) / 2; int16_t level = ext->mirrored ? - (int32_t)((int32_t)(ext->max_value - ext->cur_value) * (ext->line_cnt - 1)) / (ext->max_value - ext->min_value) : - (int32_t)((int32_t)(ext->cur_value - ext->min_value) * (ext->line_cnt - 1)) / (ext->max_value - ext->min_value); + (int32_t)((int32_t)(ext->max_value - ext->cur_value) * (ext->line_cnt - 1)) / (ext->max_value - ext->min_value) : + (int32_t)((int32_t)(ext->cur_value - ext->min_value) * (ext->line_cnt - 1)) / (ext->max_value - ext->min_value); uint8_t i; lv_color_t main_color = lv_obj_get_style_line_color(lmeter, part); @@ -523,7 +523,8 @@ void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uin if((!ext->mirrored && i >= level) || (ext->mirrored && i <= level)) { line_dsc.color = end_color; line_dsc.width = end_line_width; - } else { + } + else { line_dsc.color = lv_color_mix(grad_color, main_color, (255 * i) / ext->line_cnt); } diff --git a/src/lv_widgets/lv_table.c b/src/lv_widgets/lv_table.c index b10cd5960..7bd8e4c8b 100644 --- a/src/lv_widgets/lv_table.c +++ b/src/lv_widgets/lv_table.c @@ -196,7 +196,8 @@ void lv_table_set_row_cnt(lv_obj_t * table, uint16_t row_cnt) ext->row_h = lv_mem_realloc(ext->row_h, ext->row_cnt * sizeof(ext->row_h[0])); LV_ASSERT_MEM(ext->row_h); if(ext->row_h == NULL) return; - } else { + } + else { lv_mem_free(ext->row_h); ext->row_h = NULL; }