diff --git a/CHANGELOG.md b/CHANGELOG.md index 271e5f3d5..0947a95b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - 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 -## v7.3.1 (planned on 18.08.2020) +## v7.3.1 (18.08.2020) ### Bugfixes - Fix drawing value string twice @@ -25,6 +25,7 @@ - Limit extra button click area of button matrix's buttons. With large paddings it was counter intuitive. (Gaps are mapped to button when clicked). - Fix `lv_btnmatrix_set_one_check` not forcing exactly one button to be checked - Fix color picker invalidation in rectangle mode +- Init disabled days to gray color in calendar ## v7.3.0 (04.08.2020) 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 5331e20e4..6faeafad3 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.6.0-dev-dev */ /* diff --git a/lvgl.h b/lvgl.h index 59a0422c2..5d1361cd7 100644 --- a/lvgl.h +++ b/lvgl.h @@ -15,9 +15,9 @@ extern "C" { * CURRENT VERSION OF LVGL ***************************/ /*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 5 +#define LVGL_VERSION_PATCH 0 #define LVGL_VERSION_INFO "dev" /********************* diff --git a/scripts/release.py b/scripts/release.py index 2908ee0ef..28370c668 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 @@ -101,10 +101,12 @@ def clone_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") + #For debuging just copy the repos + #cmd("cp -a ../repos/. .") + #return + + 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") @@ -464,4 +466,4 @@ if __name__ == '__main__': publish_dev() cleanup() - \ No newline at end of file + 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 b94b2139c..3db3ae401 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); @@ -4058,7 +4058,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_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index 30b747e1c..435cdf49f 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -566,7 +566,7 @@ static void calendar_init(void) lv_style_set_radius(&styles->calendar_date_nums, LV_STATE_DEFAULT, LV_DPX(4)); lv_style_set_text_color(&styles->calendar_date_nums, LV_STATE_CHECKED, IS_LIGHT ? lv_color_hex(0x31404f) : LV_COLOR_WHITE); - + lv_style_set_text_color(&styles->calendar_date_nums, LV_STATE_DISABLED, LV_COLOR_GRAY); lv_style_set_bg_opa(&styles->calendar_date_nums, LV_STATE_CHECKED, IS_LIGHT ? LV_OPA_20 : LV_OPA_40); lv_style_set_bg_opa(&styles->calendar_date_nums, LV_STATE_PRESSED, LV_OPA_20); lv_style_set_bg_opa(&styles->calendar_date_nums, LV_STATE_FOCUSED, LV_OPA_COVER); diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 3b0cfb343..8f334225d 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -1223,10 +1223,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 d98a5f391..cd7f291c0 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 a9d2f7e02..b71135176 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; }