From b1a7dbadcdf34c5a26f90a02ae7103c3a68a5d34 Mon Sep 17 00:00:00 2001 From: defogprog <22955033+defogprog@users.noreply.github.com> Date: Sat, 28 Nov 2020 19:19:46 +0200 Subject: [PATCH 01/13] Add 8px and 10px montserrat fonts to build (#1941) --- src/lv_font/lv_font.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk index 5b2f8bc05..31fdbd710 100644 --- a/src/lv_font/lv_font.mk +++ b/src/lv_font/lv_font.mk @@ -1,6 +1,8 @@ CSRCS += lv_font.c CSRCS += lv_font_fmt_txt.c CSRCS += lv_font_loader.c +CSRCS += lv_font_montserrat_8.c +CSRCS += lv_font_montserrat_10.c CSRCS += lv_font_montserrat_12.c CSRCS += lv_font_montserrat_14.c CSRCS += lv_font_montserrat_16.c From bc2ca71bf53518a31f83f5e84fca9084edfe398f Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 28 Nov 2020 19:57:14 -0500 Subject: [PATCH 02/13] Fix #1942: lv_textarea_set_pwd_mode not changing to bullets Thanks to @fvanroie for investigating. --- src/lv_widgets/lv_textarea.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index 2233ce281..9f4773c8a 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -715,8 +715,9 @@ void lv_textarea_set_pwd_mode(lv_obj_t * ta, bool en) lv_textarea_ext_t * ext = lv_obj_get_ext_attr(ta); if(ext->pwd_mode == en) return; + ext->pwd_mode = en == false ? 0 : 1; /*Pwd mode is now enabled*/ - if(ext->pwd_mode == 0 && en != false) { + if(en != false) { char * txt = lv_label_get_text(ext->label); size_t len = strlen(txt); ext->pwd_tmp = lv_mem_alloc(len + 1); @@ -730,15 +731,13 @@ void lv_textarea_set_pwd_mode(lv_obj_t * ta, bool en) lv_textarea_clear_selection(ta); } /*Pwd mode is now disabled*/ - else if(ext->pwd_mode == 1 && en == false) { + else { lv_textarea_clear_selection(ta); lv_label_set_text(ext->label, ext->pwd_tmp); lv_mem_free(ext->pwd_tmp); ext->pwd_tmp = NULL; } - ext->pwd_mode = en == false ? 0 : 1; - refr_cursor_area(ta); } From 73f4156aad0f6ac0e6af6667b7df662e8e30f800 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 1 Dec 2020 05:25:43 -0500 Subject: [PATCH 03/13] fix(material): make button pressed color darker (#1940) --- src/lv_themes/lv_theme_material.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index f885f73c9..9da688732 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -27,7 +27,7 @@ /*BUTTON*/ #define COLOR_BTN (IS_LIGHT ? lv_color_hex(0xffffff) : lv_color_hex(0x586273)) -#define COLOR_BTN_PR (IS_LIGHT ? lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_10) : lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_30)) +#define COLOR_BTN_PR (IS_LIGHT ? lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_20) : lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_30)) #define COLOR_BTN_CHK (theme.color_primary) #define COLOR_BTN_CHK_PR (lv_color_darken(theme.color_primary, LV_OPA_30)) From e43d6da389d94a97d2b6120670ca38571ce44df3 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 11:40:21 +0100 Subject: [PATCH 04/13] simplify touch handling in the Arduino example --- examples/LVGL_Arduino.ino | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/examples/LVGL_Arduino.ino b/examples/LVGL_Arduino.ino index 4e777c19e..658fd9d8e 100644 --- a/examples/LVGL_Arduino.ino +++ b/examples/LVGL_Arduino.ino @@ -36,26 +36,11 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) bool touched = tft.getTouch(&touchX, &touchY, 600); - if(!touched) - { + if(!touched) { data->state = LV_INDEV_STATE_REL; - return false; - } - else - { + } else { data->state = LV_INDEV_STATE_PR; - } - - if(touchX>screenWidth || touchY > screenHeight) - { - Serial.println("Y or y outside of expected parameters.."); - Serial.print("y:"); - Serial.print(touchX); - Serial.print(" x:"); - Serial.print(touchY); - } - else - { + /*Set the coordinates*/ data->point.x = touchX; data->point.y = touchY; @@ -65,7 +50,6 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) Serial.print("Data y"); Serial.println(touchY); - } return false; /*Return `false` because we are not buffering and no more data to read*/ From 5b09c3879d50f254807277b2680896b0aa3b9e13 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 12:15:59 +0100 Subject: [PATCH 05/13] Update ROADMAP.md --- docs/ROADMAP.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 7b22b1e36..07a065ad4 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -27,7 +27,9 @@ Planned to November/December 2020 - Simplified File system interface ([feat/new_fs_api](https://github.com/lvgl/lvgl/tree/feat/new-fs-api) branch) to make porting easier - Work in progress - Remove the align parameter from `lv_canvas_draw_text` -- Make the `copy` parameter of `create` functions deprecated +- Remove the copy paramter from create functions +- Style selectors and style-based states See [#1832](https://github.com/lvgl/lvgl/issues/1832) +- Add Object Orianted system [#1919](https://github.com/lvgl/lvgl/issues/1919) ## v8.1 - Add radio button widget @@ -39,8 +41,6 @@ Planned to November/December 2020 ## v9 - Simplify `group`s. Discussion is [here](https://forum.lvgl.io/t/lv-group-tabindex/2927/3). - Consider direct binary font format support -- Remove the copy paramter from create functions -- Style selectors and style-based states See [#1832](https://github.com/lvgl/lvgl/issues/1832) - Optimize line and cirle drawing and masking - Reconsider color format management for run time color format setting, and custom color format usage. (Also [RGB888](https://github.com/lvgl/lvgl/issues/1722)) - 9-patch support for `lv_imgbtn`. From c52482efa2762f0d779448d016b3f2bba4b9665d Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 12:19:45 +0100 Subject: [PATCH 06/13] Update ROADMAP.md --- docs/ROADMAP.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 07a065ad4..df66c671b 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -44,6 +44,10 @@ Planned to November/December 2020 - Optimize line and cirle drawing and masking - Reconsider color format management for run time color format setting, and custom color format usage. (Also [RGB888](https://github.com/lvgl/lvgl/issues/1722)) - 9-patch support for `lv_imgbtn`. +- Handle stride. See [#1858](https://github.com/lvgl/lvgl/issues/1858) +- Make gradients more versatile +- Make image transformations more versatile +- Allow snapshoting object to tranfrom them as images ## v10 - Remove property level states From 4e5b2624012059c9d326a7d517fa75726c69fe36 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 12:50:42 +0100 Subject: [PATCH 07/13] refactor(roller): rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE --- CHANGELOG.md | 1 + src/lv_api_map.h | 5 +++++ src/lv_widgets/lv_roller.c | 10 +++++----- src/lv_widgets/lv_roller.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 509bfc5c4..6294f639a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - fix(polygon draw) join adjacent points if they are on the same coordinate - fix(linemeter) fix invalidation when setting new value - fix(table) add missing invalidation when changeing cell type +- refactor(roller) rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE ## v7.7.2 (17.11.2020) ### Bugfixes diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 6006216cb..a543507e1 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -186,6 +186,11 @@ static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page) * V7.0 COMPATIBILITY *--------------------*/ #if LV_USE_API_EXTENSION_V7 + +#if LV_USE_ROLLER +#define LV_ROLLER_MODE_INFINITE LV_ROLLER_MODE_INIFINITE +#endif + #if LV_USE_WIN static inline lv_obj_t * lv_win_add_btn(lv_obj_t * win, const void * img_src) diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index 0e8b12ceb..08477ab11 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -177,7 +177,7 @@ void lv_roller_set_options(lv_obj_t * roller, const char * options, lv_roller_mo lv_label_set_text(label, options); } else { - ext->mode = LV_ROLLER_MODE_INIFINITE; + ext->mode = LV_ROLLER_MODE_INFINITE; size_t opt_len = strlen(options) + 1; /*+1 to add '\n' after option lists*/ char * opt_extra = _lv_mem_buf_get(opt_len * LV_ROLLER_INF_PAGES); @@ -238,7 +238,7 @@ void lv_roller_set_selected(lv_obj_t * roller, uint16_t sel_opt, lv_anim_enable_ lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); /*In infinite mode interpret the new ID relative to the currently visible "page"*/ - if(ext->mode == LV_ROLLER_MODE_INIFINITE) { + if(ext->mode == LV_ROLLER_MODE_INFINITE) { int32_t sel_opt_signed = sel_opt; uint16_t page = ext->sel_opt_id / LV_ROLLER_INF_PAGES; @@ -302,7 +302,7 @@ uint16_t lv_roller_get_selected(const lv_obj_t * roller) LV_ASSERT_OBJ(roller, LV_OBJX_NAME); lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); - if(ext->mode == LV_ROLLER_MODE_INIFINITE) { + if(ext->mode == LV_ROLLER_MODE_INFINITE) { uint16_t real_id_cnt = ext->option_cnt / LV_ROLLER_INF_PAGES; return ext->sel_opt_id % real_id_cnt; } @@ -355,7 +355,7 @@ uint16_t lv_roller_get_option_cnt(const lv_obj_t * roller) LV_ASSERT_OBJ(roller, LV_OBJX_NAME); lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); - if(ext->mode == LV_ROLLER_MODE_INIFINITE) { + if(ext->mode == LV_ROLLER_MODE_INFINITE) { return ext->option_cnt / LV_ROLLER_INF_PAGES; } else { @@ -1005,7 +1005,7 @@ static void inf_normalize(void * scrl) lv_obj_t * roller = lv_obj_get_parent(roller_scrl); lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); - if(ext->mode == LV_ROLLER_MODE_INIFINITE) { + if(ext->mode == LV_ROLLER_MODE_INFINITE) { uint16_t real_id_cnt = ext->option_cnt / LV_ROLLER_INF_PAGES; ext->sel_opt_id = ext->sel_opt_id % real_id_cnt; ext->sel_opt_id += (LV_ROLLER_INF_PAGES / 2) * real_id_cnt; /*Select the middle page*/ diff --git a/src/lv_widgets/lv_roller.h b/src/lv_widgets/lv_roller.h index a71e1c551..f23857a45 100644 --- a/src/lv_widgets/lv_roller.h +++ b/src/lv_widgets/lv_roller.h @@ -37,7 +37,7 @@ extern "C" { /** Roller mode. */ enum { LV_ROLLER_MODE_NORMAL, /**< Normal mode (roller ends at the end of the options). */ - LV_ROLLER_MODE_INIFINITE, /**< Infinite mode (roller can be scrolled forever). */ + LV_ROLLER_MODE_INFINITE, /**< Infinite mode (roller can be scrolled forever). */ }; typedef uint8_t lv_roller_mode_t; From bf08ff444ee8fd3a370ac7c039788eebdf92885f Mon Sep 17 00:00:00 2001 From: Carlos Diaz Date: Tue, 1 Dec 2020 08:04:20 -0600 Subject: [PATCH 08/13] Update Kconfig. (#1917) * Kconfig: Add missing _HEX to LV_COLOR_TRANSP option. * lv_conf_checker: Define LV_CONF_SKIP if CONFIG_LV_CONF_SKIP is defined. * fix(indev): disabled object shouldn't absorb clicks but let the parent to be clicked * Update README.md * fix(arabic): support processing again alraedy processed texts with _lv_txt_ap_proc * fix(textarea): support Arabic letter connections fixes #1888 * Fix #1924: incorrect date on changelog December 1st is two weeks from 7.7.2 release. * Kconfig: Fix LV_CONF_MINIMAL related options. * fix(arabic): support Arabic letter connections fixes #1920 * fix(arabic): support Arabic letter connections in value string property * Update CHANGELOG.md * Update CHANGELOG.md * Kconfig: Add Zephyr specific code. * fix: fix double include in lv_obj.c fix #1926 * Removed trailing semi-colon from macros (#1928) * Removed commented out test definition Removed commented out test definition LV_BUILD_TEST * Remove blank line * Fix comment spelling * Added blank line * Removed trailing semi-colon in macros * fix(indev): in LV_INDEV_TYPE_BUTTON recognize 1 cycle long presses too Fixes https://forum.lvgl.io/t/bug-in-indev-button-proc-misses-buttons-that-are-pressed-for-a-single-callback/3699 * fix(arc): make arc work with encoder fixes https://forum.lvgl.io/t/lv-arc-with-encoder-lv-group/3769 * fix(slider): adjusting the left knob too with encoder https://forum.lvgl.io/t/slider-with-2-knobs-and-encoder-functionality/3770 * fix(arc_draw): remove statments that do nothing fix #1930 * Change LV_DRAW_BUF_MAX_NUM to LV_MEM_BUF_MAX_NUM (#1931) * Update CHANGELOG.md * fix(draw polygon): join adjacent points if they are on the same coordinate * fix(draw polygon): fix memory leak and vertex joining * fix(style): invalidate cache on every PART Inherited properties on parts other than MAIN needs to be recached on property change beacuse they are inherted from MAIN fixes #1933 * fix(anim): fix bounce path * fix(slider): do not let edit left knob in non-range mode * Update ROADMAP.md * Fix hardfault when DCache is disabled with no callback (#1935) * fix(linemeter): fix invalidation when setting new value The old complex but more optimal invalidation was buggy in some cases fixes #1904 * fix(linemeter): fix invalidation when setting new value The old complex but more optimal invalidation was buggy in some cases fixes #1904 * fix(table): add missing invalidation when changeing cell type fixes https://forum.lvgl.io/t/bug-of-table-click-to-change-style/3842 * CMakeLists.txt: Let the user configure whether LV_ATTRIBUTE_FAST_MEM is IRAM_ATTR (#1939) * fix(slider): fix left/right knob control with encoder * fix(img): increase the size of invalidated area in lv_img_set_zoom Becasue of the pivot placement there can be some rounding errors * feat(perf_monitor): add lv_refr_get_fps_avg() * Add 8px and 10px montserrat fonts to build (#1941) * Fix #1942: lv_textarea_set_pwd_mode not changing to bullets Thanks to @fvanroie for investigating. * fix(material): make button pressed color darker (#1940) * simplify touch handling in the Arduino example * Update ROADMAP.md * Update ROADMAP.md * feat(lv_conf_kconfig): add LV_CONF_KCONFIG_EXTERNAL_INCLUDE Co-authored-by: Gabor Kiss-Vamosi Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com> Co-authored-by: xennex22 <25083624+xennex22@users.noreply.github.com> Co-authored-by: incity <610455681@qq.com> Co-authored-by: Andrey Co-authored-by: defogprog <22955033+defogprog@users.noreply.github.com> --- Kconfig | 20 ++++++++++------ scripts/lv_conf_checker.py | 4 ++++ src/lv_conf_kconfig.h | 22 ++++++++++------- src/lv_conf_zephyr.h | 49 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 src/lv_conf_zephyr.h diff --git a/Kconfig b/Kconfig index 3561e062e..11447f631 100644 --- a/Kconfig +++ b/Kconfig @@ -58,7 +58,7 @@ menu "LVGL configuration" Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`. - config LV_COLOR_TRANSP + config LV_COLOR_TRANSP_HEX hex "Images pixels with this color will not be drawn (with chroma keying)." depends on LV_COLOR_SCREEN_TRANSP range 0x000000 0xFFFFFF @@ -332,7 +332,7 @@ menu "LVGL configuration" bool "Enable Montserrat 12" config LV_FONT_MONTSERRAT_14 bool "Enable Montserrat 14" - default y + default y if !LV_CONF_MINIMAL config LV_FONT_MONTSERRAT_16 bool "Enable Montserrat 16" config LV_FONT_MONTSERRAT_18 @@ -369,6 +369,7 @@ menu "LVGL configuration" bool "Enable Montserrat 48" config LV_FONT_UNSCII_8 bool "Enable UNSCII 8 (Perfect monospace font)" + default y if LV_CONF_MINIMAL config LV_FONT_UNSCII_16 bool "Enable UNSCII 16 (Perfect monospace font)" config LV_FONT_MONTSERRAT12SUBPX @@ -383,7 +384,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_SMALL prompt "Select theme default small font" - default LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 + default LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_SMALL_UNSCII_8 if LV_CONF_MINIMAL help Select theme default small font @@ -472,7 +474,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_NORMAL prompt "Select theme default normal font" - default LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 + default LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_NORMAL_UNSCII_8 if LV_CONF_MINIMAL help Select theme default normal font @@ -561,7 +564,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_SUBTITLE prompt "Select theme default subtitle font" - default LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 + default LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 if LV_CONF_MINIMAL help Select theme default subtitle font @@ -650,7 +654,8 @@ menu "LVGL configuration" choice LV_FONT_DEFAULT_TITLE prompt "Select theme default title font" - default LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 + default LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 if !LV_CONF_MINIMAL + default LV_FONT_DEFAULT_TITLE_UNSCII_8 if LV_CONF_MINIMAL help Select theme default title font @@ -751,7 +756,8 @@ menu "LVGL configuration" choice LV_THEME_DEFAULT_INIT prompt "Select theme default init" - default LV_THEME_DEFAULT_INIT_MATERIAL + default LV_THEME_DEFAULT_INIT_MATERIAL if !LV_CONF_MINIMAL + default LV_THEME_DEFAULT_INIT_EMPTY if LV_CONF_MINIMAL help Select theme default init diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index bed793bf2..bc3e008ec 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -38,6 +38,10 @@ fout.write( /* Handle special Kconfig options */ #include "lv_conf_kconfig.h" +#ifdef CONFIG_LV_CONF_SKIP +#define LV_CONF_SKIP +#endif + /* If "lv_conf.h" is available from here try to use it later.*/ #if defined __has_include # if __has_include("lv_conf.h") diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index e3f91e800..c9a5ce8db 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -10,14 +10,20 @@ extern "C" { #endif -#if defined ESP_PLATFORM -#include "sdkconfig.h" -#include "esp_attr.h" -#endif - -#ifdef __NuttX__ -#include -#endif +#ifdef LV_CONF_KCONFIG_EXTERNAL_INCLUDE +# include LV_CONF_KCONFIG_EXTERNAL_INCLUDE +#else + +# if defined ESP_PLATFORM +# include "sdkconfig.h" +# include "esp_attr.h" +# endif + +# ifdef __NuttX__ +# include +# endif + +#endif /*LV_CONF_KCONFIG_EXTERNAL_INCLUDE*/ /******************* * LV_MEM_SIZE diff --git a/src/lv_conf_zephyr.h b/src/lv_conf_zephyr.h new file mode 100644 index 000000000..a140ccd61 --- /dev/null +++ b/src/lv_conf_zephyr.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2020 Jan Van Winkel + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifdef __ZEPHYR__ + +#include + +#define LV_MEM_CUSTOM 1 + +#define LV_MEMCPY_MEMSET_STD 1 + +#ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL + +#define LV_MEM_CUSTOM_INCLUDE "kernel.h" +#define LV_MEM_CUSTOM_ALLOC k_malloc +#define LV_MEM_CUTOM_FREE k_free + +#elif defined(CONFIG_LVGL_MEM_POOL_HEAP_LIB_C) + +#define LV_MEM_CUSTOM_INCLUDE "stdlib.h" +#define LV_MEM_CUSTOM_ALLOC malloc +#define LV_MEM_CUTOM_FREE free + +#else + +#define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h" +#define LV_MEM_CUSTOM_ALLOC lvgl_malloc +#define LV_MEM_CUTOM_FREE lvgl_free + +#endif + +#define LV_ENABLE_GC 0 + +#define LV_TICK_CUSTOM 1 +#define LV_TICK_CUSTOM_INCLUDE "kernel.h" +#define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32()) + +#define LV_SPRINTF_CUSTOM 1 + +#if LV_SPRINTF_CUSTOM +#define LV_SPRINTF_INCLUDE "stdio.h" +#define lv_snprintf snprintf +#define lv_vsnprintf vsnprintf +#endif + +#endif From 51f95f32869ffdbb40afe68cb1c238a7c7abd2fe Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 15:08:50 +0100 Subject: [PATCH 09/13] Release v7.8.0 --- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- src/lv_conf_internal.h | 6 +- src/lv_conf_kconfig.h | 556 ++++++++++++++++---------------- src/lv_conf_zephyr.h | 62 ++-- src/lv_core/lv_refr.c | 4 +- src/lv_draw/lv_draw_triangle.c | 2 +- src/lv_font/lv_font_unscii_16.c | 5 +- src/lv_font/lv_font_unscii_8.c | 5 +- src/lv_gpu/lv_gpu_stm32_dma2d.c | 7 +- src/lv_misc/lv_txt_ap.c | 5 +- src/lv_widgets/lv_arc.c | 6 +- src/lv_widgets/lv_slider.c | 3 +- src/lv_widgets/lv_slider.h | 2 +- 15 files changed, 337 insertions(+), 332 deletions(-) diff --git a/library.json b/library.json index 31a87f814..d1cdb16c7 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.7.2", + "version": "7.8.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 3ddc574c3..b96e1590a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.7.2 +version=7.8.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 7e2aeb3a0..f2f9fa247 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.7.2-dev + * Configuration file for v7.8.0-dev */ /* diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index c24c0131a..5bf85131d 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -19,6 +19,10 @@ /* Handle special Kconfig options */ #include "lv_conf_kconfig.h" +#ifdef CONFIG_LV_CONF_SKIP +#define LV_CONF_SKIP +#endif + /* If "lv_conf.h" is available from here try to use it later.*/ #if defined __has_include # if __has_include("lv_conf.h") @@ -1318,7 +1322,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ /* Support bidirectional texts. * Allows mixing Left-to-Right and Right-to-Left texts. - * The direction will be processed according to the Unicode Bidirectional Algorithm: + * The direction will be processed according to the Unicode Bidirectioanl Algorithm: * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ #ifndef LV_USE_BIDI # ifdef CONFIG_LV_USE_BIDI diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index c9a5ce8db..5757c94db 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -30,9 +30,9 @@ extern "C" { *******************/ #ifndef LV_MEM_SIZE - #if defined (CONFIG_LV_MEM_SIZE_BYTES) - #define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_BYTES * 1024U) - #endif +#if defined (CONFIG_LV_MEM_SIZE_BYTES) +#define CONFIG_LV_MEM_SIZE (CONFIG_LV_MEM_SIZE_BYTES * 1024U) +#endif #endif /******************* @@ -40,11 +40,11 @@ extern "C" { *******************/ #ifndef LV_COLOR_TRANSP - #if defined (CONFIG_LV_COLOR_TRANSP_HEX) - #define CONFIG_LV_COLOR_TRANSP lv_color_hex(CONFIG_LV_COLOR_TRANSP_HEX) - #else - #define CONFIG_LV_COLOR_TRANSP LV_COLOR_LIME - #endif +#if defined (CONFIG_LV_COLOR_TRANSP_HEX) +#define CONFIG_LV_COLOR_TRANSP lv_color_hex(CONFIG_LV_COLOR_TRANSP_HEX) +#else +#define CONFIG_LV_COLOR_TRANSP LV_COLOR_LIME +#endif #endif /******************* @@ -52,31 +52,31 @@ extern "C" { *******************/ #ifndef LV_THEME_DEFAULT_INIT - #if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_TEMPLATE) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_template_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MATERIAL) - #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_material_init - #elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MONO) - #define LV_THEME_DEFAULT_INIT lv_theme_mono_init - #endif +#if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_TEMPLATE) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_template_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MATERIAL) +#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_material_init +#elif defined (CONFIG_LV_THEME_DEFAULT_INIT_MONO) +#define LV_THEME_DEFAULT_INIT lv_theme_mono_init +#endif #endif /******************* * COLOR SELECTION *******************/ - + #ifndef LV_THEME_DEFAULT_COLOR_PRIMARY - #ifdef CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY - #define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY) - #endif +#ifdef CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY +#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_PRIMARY) #endif - +#endif + #ifndef LV_THEME_DEFAULT_COLOR_SECONDARY - #ifdef CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY - #define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY) - #endif +#ifdef CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY +#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(CONFIG_LV_THEME_DEFAULT_COLOR_SECONDARY) +#endif #endif /******************** @@ -92,255 +92,255 @@ extern "C" { * SMALL FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_SMALL - #if defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_SMALL_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_SMALL_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_SMALL &lv_font_simsun_16_cjk +#endif #endif /*------------------ * NORMAL FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_NORMAL - #if defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_NORMAL_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_NORMAL &lv_font_simsun_16_cjk +#endif #endif /*------------------ * SUBTITLE FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_SUBTITLE - #if defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_SUBTITLE_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_simsun_16_cjk +#endif #endif /*------------------ * TITLE FONT *-----------------*/ #ifndef LV_THEME_DEFAULT_FONT_TITLE - #if defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_8 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_10 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_10 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_12 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_14 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_14 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_16 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_18 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_18 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_20 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_20 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_22 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_22 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_24 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_24 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_26 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_26 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_28 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_30 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_32 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_32 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_34 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_34 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_36 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_36 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_38 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_38 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_40 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_40 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_42 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_42 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_44 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_44 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_46 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_46 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_48 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_48 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_8 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_8 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_16 - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_16 - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT12SUBPX - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12_subpx - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT28COMPRESSED - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28_compressed - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_DEJAVU_16_PERSIAN_HEBREW - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_dejavu_16_persian_hebrew - #elif defined CONFIG_LV_FONT_DEFAULT_TITLE_SIMSUN_16_CJK - #define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_simsun_16_cjk - #endif +#if defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_8 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_10 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_10 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_12 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_14 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_14 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_16 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_18 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_18 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_20 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_20 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_22 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_22 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_24 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_24 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_26 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_26 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_28 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_30 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_32 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_32 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_34 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_34 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_36 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_36 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_38 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_38 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_40 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_40 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_42 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_42 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_44 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_44 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_46 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_46 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT_48 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_48 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_8 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_8 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_UNSCII_16 +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_unscii_16 +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT12SUBPX +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_12_subpx +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_MONTSERRAT28COMPRESSED +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_28_compressed +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_DEJAVU_16_PERSIAN_HEBREW +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_dejavu_16_persian_hebrew +#elif defined CONFIG_LV_FONT_DEFAULT_TITLE_SIMSUN_16_CJK +#define CONFIG_LV_THEME_DEFAULT_FONT_TITLE &lv_font_simsun_16_cjk +#endif #endif /*------------------ * TEXT ENCODING *-----------------*/ #ifndef LV_TEXT_ENC - #ifdef CONFIG_LV_TXT_ENC_UTF8 - #define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 - #elif defined CONFIG_LV_TXT_ENC_ASCII - #define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII - #endif +#ifdef CONFIG_LV_TXT_ENC_UTF8 +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 +#elif defined CONFIG_LV_TXT_ENC_ASCII +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII +#endif #endif /*------------------ @@ -348,13 +348,13 @@ extern "C" { *-----------------*/ #ifndef LV_BIDI_BASE_DIR_DEF - #ifdef CONFIG_LV_BIDI_DIR_LTR - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_LTR - #elif defined CONFIG_LV_BIDI_DIR_RTL - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_RTL - #elif defined CONFIG_LV_BIDI_DIR_AUTO - #define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO - #endif +#ifdef CONFIG_LV_BIDI_DIR_LTR +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_LTR +#elif defined CONFIG_LV_BIDI_DIR_RTL +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_RTL +#elif defined CONFIG_LV_BIDI_DIR_AUTO +#define CONFIG_LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO +#endif #endif /*------------------ @@ -362,13 +362,13 @@ extern "C" { *-----------------*/ #ifndef LV_USE_EXT_CLICK_AREA - #ifdef CONFIG_LV_USE_EXT_CLICK_AREA_OFF - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF - #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_TINY - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY - #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_FULL - #define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL - #endif +#ifdef CONFIG_LV_USE_EXT_CLICK_AREA_OFF +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF +#elif defined CONFIG_LV_USE_EXT_CLICK_AREA_TINY +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY +#elif defined CONFIG_LV_USE_EXT_CLICK_AREA_FULL +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL +#endif #endif /*------------------ @@ -376,13 +376,13 @@ extern "C" { *-----------------*/ #ifndef LV_LINEMETER_PRECISE - #ifdef CONFIG_LV_LINEMETER_PRECISE_NO_EXTRA_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 0 - #elif defined CONFIG_LV_LINEMETER_PRECISE_SOME_EXTRA_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 1 - #elif defined CONFIG_LV_LINEMETER_PRECISE_BEST_PRECISION - #define CONFIG_LV_LINEMETER_PRECISE 2 - #endif +#ifdef CONFIG_LV_LINEMETER_PRECISE_NO_EXTRA_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 0 +#elif defined CONFIG_LV_LINEMETER_PRECISE_SOME_EXTRA_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 1 +#elif defined CONFIG_LV_LINEMETER_PRECISE_BEST_PRECISION +#define CONFIG_LV_LINEMETER_PRECISE 2 +#endif #endif @@ -391,13 +391,13 @@ extern "C" { *-----------------*/ #ifndef LV_SPINNER_DEF_ANIM - #ifdef CONFIG_LV_SPINNER_TYPE_SPINNING_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC - #elif defined CONFIG_LV_SPINNER_TYPE_FILLSPIN_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_FILLSPIN_ARC - #elif defined CONFIG_LV_SPINNER_TYPE_CONSTANT_ARC - #define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_CONSTANT_ARC - #endif +#ifdef CONFIG_LV_SPINNER_TYPE_SPINNING_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC +#elif defined CONFIG_LV_SPINNER_TYPE_FILLSPIN_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_FILLSPIN_ARC +#elif defined CONFIG_LV_SPINNER_TYPE_CONSTANT_ARC +#define CONFIG_LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_CONSTANT_ARC +#endif #endif #ifdef __cplusplus diff --git a/src/lv_conf_zephyr.h b/src/lv_conf_zephyr.h index a140ccd61..e4e338f2b 100644 --- a/src/lv_conf_zephyr.h +++ b/src/lv_conf_zephyr.h @@ -6,44 +6,44 @@ #ifdef __ZEPHYR__ -#include + #include -#define LV_MEM_CUSTOM 1 + #define LV_MEM_CUSTOM 1 -#define LV_MEMCPY_MEMSET_STD 1 + #define LV_MEMCPY_MEMSET_STD 1 -#ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL + #ifdef CONFIG_LVGL_MEM_POOL_HEAP_KERNEL -#define LV_MEM_CUSTOM_INCLUDE "kernel.h" -#define LV_MEM_CUSTOM_ALLOC k_malloc -#define LV_MEM_CUTOM_FREE k_free + #define LV_MEM_CUSTOM_INCLUDE "kernel.h" + #define LV_MEM_CUSTOM_ALLOC k_malloc + #define LV_MEM_CUTOM_FREE k_free -#elif defined(CONFIG_LVGL_MEM_POOL_HEAP_LIB_C) + #elif defined(CONFIG_LVGL_MEM_POOL_HEAP_LIB_C) -#define LV_MEM_CUSTOM_INCLUDE "stdlib.h" -#define LV_MEM_CUSTOM_ALLOC malloc -#define LV_MEM_CUTOM_FREE free + #define LV_MEM_CUSTOM_INCLUDE "stdlib.h" + #define LV_MEM_CUSTOM_ALLOC malloc + #define LV_MEM_CUTOM_FREE free -#else + #else -#define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h" -#define LV_MEM_CUSTOM_ALLOC lvgl_malloc -#define LV_MEM_CUTOM_FREE lvgl_free - -#endif - -#define LV_ENABLE_GC 0 - -#define LV_TICK_CUSTOM 1 -#define LV_TICK_CUSTOM_INCLUDE "kernel.h" -#define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32()) - -#define LV_SPRINTF_CUSTOM 1 - -#if LV_SPRINTF_CUSTOM -#define LV_SPRINTF_INCLUDE "stdio.h" -#define lv_snprintf snprintf -#define lv_vsnprintf vsnprintf -#endif + #define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h" + #define LV_MEM_CUSTOM_ALLOC lvgl_malloc + #define LV_MEM_CUTOM_FREE lvgl_free + + #endif + + #define LV_ENABLE_GC 0 + + #define LV_TICK_CUSTOM 1 + #define LV_TICK_CUSTOM_INCLUDE "kernel.h" + #define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32()) + + #define LV_SPRINTF_CUSTOM 1 + + #if LV_SPRINTF_CUSTOM + #define LV_SPRINTF_INCLUDE "stdio.h" + #define lv_snprintf snprintf + #define lv_vsnprintf vsnprintf + #endif #endif diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index 1c0d74d17..0c25671ee 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -55,8 +55,8 @@ static void lv_refr_vdb_flush(void); static uint32_t px_num; static lv_disp_t * disp_refr; /*Display being refreshed*/ #if LV_USE_PERF_MONITOR -static uint32_t fps_sum_cnt; -static uint32_t fps_sum_all; + static uint32_t fps_sum_cnt; + static uint32_t fps_sum_all; #endif /********************** diff --git a/src/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c index 162b8d28e..e5775a7e2 100644 --- a/src/lv_draw/lv_draw_triangle.c +++ b/src/lv_draw/lv_draw_triangle.c @@ -65,7 +65,7 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are uint16_t pcnt = 0; p[0] = points[0]; for(i = 0; i < point_cnt - 1; i++) { - if(points[i].x != points[i+1].x ||points[i].y != points[i+1].y) { + if(points[i].x != points[i + 1].x || points[i].y != points[i + 1].y) { p[pcnt] = points[i]; pcnt++; } diff --git a/src/lv_font/lv_font_unscii_16.c b/src/lv_font/lv_font_unscii_16.c index 7b3f69340..16bfc255d 100644 --- a/src/lv_font/lv_font_unscii_16.c +++ b/src/lv_font/lv_font_unscii_16.c @@ -7,7 +7,7 @@ ******************************************************************************/ #ifndef LV_FONT_UNSCII_16 -#define LV_FONT_UNSCII_16 1 + #define LV_FONT_UNSCII_16 1 #endif #if LV_FONT_UNSCII_16 @@ -583,8 +583,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { /*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ +static const lv_font_fmt_txt_cmap_t cmaps[] = { { .range_start = 32, .range_length = 96, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY diff --git a/src/lv_font/lv_font_unscii_8.c b/src/lv_font/lv_font_unscii_8.c index b08fb0090..4438d82e5 100644 --- a/src/lv_font/lv_font_unscii_8.c +++ b/src/lv_font/lv_font_unscii_8.c @@ -7,7 +7,7 @@ ******************************************************************************/ #ifndef LV_FONT_UNSCII_8 -#define LV_FONT_UNSCII_8 1 + #define LV_FONT_UNSCII_8 1 #endif #if LV_FONT_UNSCII_8 @@ -419,8 +419,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { /*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ +static const lv_font_fmt_txt_cmap_t cmaps[] = { { .range_start = 32, .range_length = 96, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c index 74b0a7201..d94e87abf 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.c +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c @@ -226,7 +226,8 @@ void lv_gpu_stm32_dma2d_wait_cb(lv_disp_drv_t * drv) while(DMA2D->CR & DMA2D_CR_START_Msk) { drv->wait_cb(drv); } - } else { + } + else { while(DMA2D->CR & DMA2D_CR_START_Msk); } } @@ -241,8 +242,8 @@ static void invalidate_cache(void) if(disp->driver.clean_dcache_cb) disp->driver.clean_dcache_cb(&disp->driver); else { #if __CORTEX_M >= 0x07 - if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk) - SCB_CleanInvalidateDCache(); + if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk) + SCB_CleanInvalidateDCache(); #endif } } diff --git a/src/lv_misc/lv_txt_ap.c b/src/lv_misc/lv_txt_ap.c index 4c68a2773..1a868ee2d 100644 --- a/src/lv_misc/lv_txt_ap.c +++ b/src/lv_misc/lv_txt_ap.c @@ -211,11 +211,10 @@ static uint32_t lv_ap_get_char_index(uint16_t c) for(uint8_t i = 0; ap_chars_map[i].char_end_form; i++) { if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE)) return i; - else if (c == ap_chars_map[i].char_end_form //is it an End form + else if(c == ap_chars_map[i].char_end_form //is it an End form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Begining form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form - || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) //is it an isolated form - { + || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) { //is it an isolated form return i; } } diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index 4b2105bab..95e7557b8 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -860,12 +860,14 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param) res = lv_event_send(arc, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RES_OK) return res; } - }else if(sign == LV_SIGNAL_GET_EDITABLE) { + } + else if(sign == LV_SIGNAL_GET_EDITABLE) { #if LV_USE_GROUP bool * editable = (bool *)param; *editable = true; #endif - }else if(sign == LV_SIGNAL_CLEANUP) { + } + else if(sign == LV_SIGNAL_CLEANUP) { lv_obj_clean_style_list(arc, LV_ARC_PART_KNOB); lv_obj_clean_style_list(arc, LV_ARC_PART_INDIC); } diff --git a/src/lv_widgets/lv_slider.c b/src/lv_widgets/lv_slider.c index 0c12bff66..5c77f1ef1 100644 --- a/src/lv_widgets/lv_slider.c +++ b/src/lv_widgets/lv_slider.c @@ -400,7 +400,8 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par ext->left_knob_focus = 0; lv_group_set_editing(g, false); } - } else { + } + else { lv_group_set_editing(g, false); } } diff --git a/src/lv_widgets/lv_slider.h b/src/lv_widgets/lv_slider.h index 0a04a731d..2f0d86a44 100644 --- a/src/lv_widgets/lv_slider.h +++ b/src/lv_widgets/lv_slider.h @@ -49,7 +49,7 @@ typedef struct { lv_area_t right_knob_area; int16_t * value_to_set; /* Which bar value to set */ uint8_t dragging : 1; /*1: the slider is being dragged*/ - uint8_t left_knob_focus :1; /*1: with encoder now the right knob can be adjusted*/ + uint8_t left_knob_focus : 1; /*1: with encoder now the right knob can be adjusted*/ } lv_slider_ext_t; /** Built-in styles of slider*/ From 2c0ca033191a8bfa032aafc11d9343e22dcf6aff Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 15:13:30 +0100 Subject: [PATCH 10/13] Update master version --- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- lvgl.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library.json b/library.json index d1cdb16c7..d962711d9 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.8.0", + "version": "7.8.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 b96e1590a..afe11b4cd 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.8.0 +version=7.8.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 f2f9fa247..c1f016189 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.8.0-dev + * Configuration file for v7.8.1-dev */ /* diff --git a/lvgl.h b/lvgl.h index 94a9301d0..2583fc422 100644 --- a/lvgl.h +++ b/lvgl.h @@ -16,8 +16,8 @@ extern "C" { ***************************/ #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 8 -#define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "" +#define LVGL_VERSION_PATCH 1 +#define LVGL_VERSION_INFO "dev" /********************* * INCLUDES From 4f6fb723ef6558b7cfa435f618ba19d0d9c08c39 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 1 Dec 2020 15:27:44 +0100 Subject: [PATCH 11/13] fix roller LV_ROLLER_MODE_INIFINITE refactoring --- src/lv_api_map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_api_map.h b/src/lv_api_map.h index a543507e1..f5f7a5402 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -188,7 +188,7 @@ static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page) #if LV_USE_API_EXTENSION_V7 #if LV_USE_ROLLER -#define LV_ROLLER_MODE_INFINITE LV_ROLLER_MODE_INIFINITE +#define LV_ROLLER_MODE_INIFINITE LV_ROLLER_MODE_INFINITE #endif #if LV_USE_WIN From 70d00469c63699763e6feacda8de1f1ec3462e2b Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 2 Dec 2020 09:25:48 +0100 Subject: [PATCH 12/13] fix build errors --- lvgl.h | 6 -- src/lv_api_map.h | 202 ------------------------------------ src/lv_core/lv_obj_scroll.c | 6 ++ 3 files changed, 6 insertions(+), 208 deletions(-) diff --git a/lvgl.h b/lvgl.h index e25598a2d..649e0002f 100644 --- a/lvgl.h +++ b/lvgl.h @@ -14,15 +14,9 @@ extern "C" { /*************************** * CURRENT VERSION OF LVGL ***************************/ -<<<<<<< HEAD #define LVGL_VERSION_MAJOR 8 #define LVGL_VERSION_MINOR 0 #define LVGL_VERSION_PATCH 0 -======= -#define LVGL_VERSION_MAJOR 7 -#define LVGL_VERSION_MINOR 8 -#define LVGL_VERSION_PATCH 1 ->>>>>>> master #define LVGL_VERSION_INFO "dev" /********************* diff --git a/src/lv_api_map.h b/src/lv_api_map.h index b9d64e764..c3d8f5062 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -27,209 +27,7 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ -<<<<<<< HEAD static inline LV_ATTRIBUTE_TIMER_HANDLER uint32_t lv_task_handler(void) -======= -/*--------------------- - * V6.0 COMPATIBILITY - *--------------------*/ -#if LV_USE_API_EXTENSION_V6 - -static inline void lv_task_once(lv_task_t * task) -{ - lv_task_set_repeat_count(task, 1); -} - -#if LV_USE_CHECKBOX - -#define lv_checkbox_set_static_text lv_checkbox_set_text_static - -#endif - -#if LV_USE_CHART - -#define lv_chart_get_point_cnt lv_chart_get_point_count - -#endif - - -#if LV_USE_DROPDOWN - -static inline void lv_dropdown_set_draw_arrow(lv_obj_t * ddlist, bool en) -{ - if(en) lv_dropdown_set_symbol(ddlist, LV_SYMBOL_DOWN); - else lv_dropdown_set_symbol(ddlist, NULL); -} - -static inline bool lv_dropdown_get_draw_arrow(lv_obj_t * ddlist) -{ - if(lv_dropdown_get_symbol(ddlist)) return true; - else return false; -} - -#define lv_dropdown_set_static_options lv_dropdown_set_options_static - -#endif - -#if LV_USE_BAR - -/** - * Make the bar symmetric to zero. The indicator will grow from zero instead of the minimum - * position. - * @param bar pointer to a bar object - * @param en true: enable disable symmetric behavior; false: disable - * @deprecated As of v7.0, you should use `lv_bar_set_type` instead. - */ -static inline void lv_bar_set_sym(lv_obj_t * bar, bool en) -{ - if(en) - lv_bar_set_type(bar, LV_BAR_TYPE_SYMMETRICAL); - else - lv_bar_set_type(bar, LV_BAR_TYPE_NORMAL); -} - -/** - * Get whether the bar is symmetric or not. - * @param bar pointer to a bar object - * @return true: symmetric is enabled; false: disable - * @deprecated As of v7.0, you should use `lv_bar_get_type` instead. - */ -static inline bool lv_bar_get_sym(lv_obj_t * bar) -{ - return lv_bar_get_type(bar) == LV_BAR_TYPE_SYMMETRICAL; -} - -#endif - -#if LV_USE_LABEL - -#define lv_label_set_static_text lv_label_set_text_static - -#endif - -#if LV_USE_SLIDER - -/** - * Make the slider symmetric to zero. The indicator will grow from zero instead of the minimum - * position. - * @param slider pointer to a bar object - * @param en true: enable disable symmetric behavior; false: disable - * @deprecated As of v7.0, you should use `lv_slider_set_type` instead. - */ -static inline void lv_slider_set_sym(lv_obj_t * slider, bool en) -{ - lv_bar_set_sym(slider, en); -} - -/** - * Get whether the slider is symmetric or not. - * @param slider pointer to a slider object - * @return true: symmetric is enabled; false: disable - * @deprecated As of v7.0, you should use `lv_slider_get_type` instead. - */ -static inline bool lv_slider_get_sym(lv_obj_t * slider) -{ - return lv_bar_get_sym(slider); -} - -#endif - -#if LV_USE_ROLLER - -/** - * Set a fixed width for the roller. - * @param roller pointer to a roller object - * @param w width - * @deprecated As of v7.0, you should use `lv_roller_set_auto_fit` and set the width normally instead. - */ -static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w) -{ - lv_roller_set_auto_fit(roller, false); - lv_obj_set_width(roller, w); -} - - -#endif - - -#if LV_USE_PAGE -#define lv_scrlbar_mode_t lv_scrollbar_mode_t - -#define LV_SCRLBAR_MODE_OFF LV_SCROLLBAR_MODE_OFF -#define LV_SCRLBAR_MODE_ON LV_SCROLLBAR_MODE_ON -#define LV_SCRLBAR_MODE_DRAG LV_SCROLLBAR_MODE_DRAG -#define LV_SCRLBAR_MODE_AUTO LV_SCROLLBAR_MODE_AUTO -#define LV_SCRLBAR_MODE_HIDE LV_SCROLLBAR_MODE_HIDE -#define LV_SCRLBAR_MODE_UNHIDE LV_SCROLLBAR_MODE_UNHIDE - - -static inline void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_scrlbar_mode_t sb_mode) -{ - lv_page_set_scrollbar_mode(page, sb_mode); -} -static inline lv_scrollbar_mode_t lv_page_get_scrlbar_mode(lv_obj_t * page) -{ - return lv_page_get_scrollbar_mode(page); -} - - -static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page) -{ - return lv_page_get_scrollable(page); -} -#endif - - -#endif /*LV_USE_API_EXTENSION_V6*/ - - - - -/*--------------------- - * V7.0 COMPATIBILITY - *--------------------*/ -#if LV_USE_API_EXTENSION_V7 - -#if LV_USE_ROLLER -#define LV_ROLLER_MODE_INIFINITE LV_ROLLER_MODE_INFINITE -#endif - -#if LV_USE_WIN - -static inline lv_obj_t * lv_win_add_btn(lv_obj_t * win, const void * img_src) -{ - return lv_win_add_btn_right(win, img_src); -} - -#endif - -#if LV_USE_CHART -static inline void lv_chart_set_range(lv_obj_t * chart, lv_coord_t ymin, lv_coord_t ymax) -{ - lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax); -} - - -static inline void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * series) -{ - lv_chart_clear_series(chart, series); -} - -#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) -{ - lv_obj_align_mid(obj, base, align, x_ofs, y_ofs); -} - -static inline void lv_obj_align_origo_x(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs) -{ - lv_obj_align_mid_y(obj, base, align, x_ofs); -} - -static inline void lv_obj_align_origo_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t y_ofs) ->>>>>>> master { return lv_timer_handler(); } diff --git a/src/lv_core/lv_obj_scroll.c b/src/lv_core/lv_obj_scroll.c index b32d91956..05fab8e54 100644 --- a/src/lv_core/lv_obj_scroll.c +++ b/src/lv_core/lv_obj_scroll.c @@ -300,8 +300,10 @@ void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable #endif } else { /*Remove pending animations*/ +#if LV_USE_ANIMATION lv_anim_del(obj, (lv_anim_exec_xcb_t) scroll_anim_y_cb); lv_anim_del(obj, (lv_anim_exec_xcb_t) scroll_anim_x_cb); +#endif _lv_obj_scroll_by_raw(obj, x, y); } } @@ -314,13 +316,17 @@ void lv_obj_scroll_to(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable void lv_obj_scroll_to_x(lv_obj_t * obj, lv_coord_t x, lv_anim_enable_t anim_en) { +#if LV_USE_ANIMATION lv_anim_del(obj, (lv_anim_exec_xcb_t) scroll_anim_x_cb); +#endif lv_obj_scroll_by(obj, -x + lv_obj_get_scroll_x(obj), 0, anim_en); } void lv_obj_scroll_to_y(lv_obj_t * obj, lv_coord_t y, lv_anim_enable_t anim_en) { +#if LV_USE_ANIMATION lv_anim_del(obj, (lv_anim_exec_xcb_t) scroll_anim_y_cb); +#endif lv_obj_scroll_by(obj, 0, -y + lv_obj_get_scroll_y(obj), anim_en); } From fe5796f268e12f63a32c61d841ee4f5e5386887c Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 2 Dec 2020 09:38:23 +0100 Subject: [PATCH 13/13] refactor(scroll): lv_obj_scroll_to_obj -> lv_obj_scroll_to_child --- src/lv_core/lv_obj.c | 2 +- src/lv_core/lv_obj_scroll.c | 2 +- src/lv_core/lv_obj_scroll.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index a417343bc..9210b8542 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -1935,7 +1935,7 @@ static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param) lv_obj_t * parent = lv_obj_get_parent(obj); lv_obj_t * child = obj; while(parent && lv_obj_has_flag(child, LV_OBJ_FLAG_FOCUS_SCROLL)) { - lv_obj_scroll_to_obj(parent, child, LV_ANIM_ON); + lv_obj_scroll_to_child(parent, child, LV_ANIM_ON); child = parent; parent = lv_obj_get_parent(parent); } diff --git a/src/lv_core/lv_obj_scroll.c b/src/lv_core/lv_obj_scroll.c index 05fab8e54..1244cb498 100644 --- a/src/lv_core/lv_obj_scroll.c +++ b/src/lv_core/lv_obj_scroll.c @@ -330,7 +330,7 @@ void lv_obj_scroll_to_y(lv_obj_t * obj, lv_coord_t y, lv_anim_enable_t anim_en) lv_obj_scroll_by(obj, 0, -y + lv_obj_get_scroll_y(obj), anim_en); } -void lv_obj_scroll_to_obj(lv_obj_t * obj, lv_obj_t * child, lv_anim_enable_t anim_en) +void lv_obj_scroll_to_child(lv_obj_t * obj, lv_obj_t * child, lv_anim_enable_t anim_en) { lv_coord_t pleft = lv_obj_get_style_pad_left(obj, LV_OBJ_PART_MAIN); lv_coord_t pright = lv_obj_get_style_pad_right(obj, LV_OBJ_PART_MAIN); diff --git a/src/lv_core/lv_obj_scroll.h b/src/lv_core/lv_obj_scroll.h index d40706b0b..649feac7f 100644 --- a/src/lv_core/lv_obj_scroll.h +++ b/src/lv_core/lv_obj_scroll.h @@ -232,7 +232,7 @@ void lv_obj_scroll_to_y(struct _lv_obj_t * obj, lv_coord_t y, lv_anim_enable_t a * @param child pointer to an object to which scrolling should happen * @param anim_en LV_ANIM_ON: scroll with animation; LV_ANIM_OFF: scroll immediately */ -void lv_obj_scroll_to_obj(struct _lv_obj_t * obj, struct _lv_obj_t * child, lv_anim_enable_t anim_en); +void lv_obj_scroll_to_child(struct _lv_obj_t * obj, struct _lv_obj_t * child, lv_anim_enable_t anim_en); /********************** * MACROS