Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-01-19 14:36:38 +01:00
commit 7740085a08
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lv_conf_internal.h
View File

@ -748,6 +748,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif #endif
#endif /*LV_TICK_CUSTOM*/ #endif /*LV_TICK_CUSTOM*/
/*================ /*================
* Log settings * Log settings
*===============*/ *===============*/
@ -795,7 +796,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
* If an invalid parameter is found an error log message is printed and * If an invalid parameter is found an error log message is printed and
* the MCU halts at the error. (`LV_USE_LOG` should be enabled) * the MCU halts at the error. (`LV_USE_LOG` should be enabled)
* If you are debugging the MCU you can pause * If you are debugging the MCU you can pause
* the debugger to see exactly where the issue is. * the debugger to see exactly where the issue is.
* *
* The behavior of asserts can be overwritten by redefining them here. * The behavior of asserts can be overwritten by redefining them here.
* E.g. #define LV_ASSERT_MEM(p) <my_assert_code> * E.g. #define LV_ASSERT_MEM(p) <my_assert_code>
@ -872,7 +873,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
* FONT USAGE * FONT USAGE
*===================*/ *===================*/
/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. /* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel.
* The symbols are available via `LV_SYMBOL_...` defines * The symbols are available via `LV_SYMBOL_...` defines
* More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html
* To create a new font go to: https://lvgl.com/ttf-font-to-c-array * To create a new font go to: https://lvgl.com/ttf-font-to-c-array
@ -1987,6 +1988,8 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif #endif
#endif #endif
/*If running without lv_conf.h add typdesf with default value*/ /*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP) #if defined(LV_CONF_SKIP)

2
src/lv_core/lv_indev.c
View File

@ -669,7 +669,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
/*On enter long press toggle edit mode.*/ /*On enter long press toggle edit mode.*/
if(editable) { if(editable) {
/*Don't leave edit mode if there is only one object (nowhere to navigate)*/ /*Don't leave edit mode if there is only one object (nowhere to navigate)*/
if (_lv_ll_get_len(&g->obj_ll) > 1 ) { if(_lv_ll_get_len(&g->obj_ll) > 1) {
lv_group_set_editing(g, lv_group_get_editing(g) ? false : true); /*Toggle edit mode on long press*/ lv_group_set_editing(g, lv_group_get_editing(g) ? false : true); /*Toggle edit mode on long press*/
} }
} }

2
src/lv_misc/lv_area.c
View File

@ -239,7 +239,7 @@ bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, lv_coo
is_in = true; is_in = true;
} }
if (!is_in) return false; if(!is_in) return false;
if(radius == 0) return true; if(radius == 0) return true;
/*Check if the corner points are inside the radius or not*/ /*Check if the corner points are inside the radius or not*/

4
src/lv_misc/lv_fs.c
View File

@ -108,7 +108,7 @@ lv_fs_res_t lv_fs_open(lv_fs_file_t * file_p, const char * path, lv_fs_mode_t mo
const char * real_path = lv_fs_get_real_path(path); const char * real_path = lv_fs_get_real_path(path);
if (file_p->drv->file_size == 0) { /*Is file_d zero size?*/ if(file_p->drv->file_size == 0) { /*Is file_d zero size?*/
/*Pass file_d's address to open_cb, so the implementor can allocate memory byself*/ /*Pass file_d's address to open_cb, so the implementor can allocate memory byself*/
return file_p->drv->open_cb(file_p->drv, &file_p->file_d, real_path, mode); return file_p->drv->open_cb(file_p->drv, &file_p->file_d, real_path, mode);
} }
@ -382,7 +382,7 @@ lv_fs_res_t lv_fs_dir_open(lv_fs_dir_t * rddir_p, const char * path)
const char * real_path = lv_fs_get_real_path(path); const char * real_path = lv_fs_get_real_path(path);
if (rddir_p->drv->rddir_size == 0) { /*Is dir_d zero size?*/ if(rddir_p->drv->rddir_size == 0) { /*Is dir_d zero size?*/
/*Pass dir_d's address to dir_open_cb, so the implementor can allocate memory byself*/ /*Pass dir_d's address to dir_open_cb, so the implementor can allocate memory byself*/
return rddir_p->drv->dir_open_cb(rddir_p->drv, &rddir_p->dir_d, real_path); return rddir_p->drv->dir_open_cb(rddir_p->drv, &rddir_p->dir_d, real_path);
} }