diff --git a/lv_conf_checker.h b/lv_conf_checker.h index 969d79873..e693539d0 100644 --- a/lv_conf_checker.h +++ b/lv_conf_checker.h @@ -61,7 +61,7 @@ #endif #if LV_MEM_CUSTOM == 0 #ifndef LV_MEM_SIZE -# define LV_MEM_SIZE (32U * 1024U) /*Size memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ +# define LV_MEM_SIZE (32U * 1024U) /*Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ #endif #ifndef LV_MEM_ATTR # define LV_MEM_ATTR /*Complier prefix for big array declaration*/ @@ -152,15 +152,14 @@ #ifndef LV_USE_GROUP #define LV_USE_GROUP 1 /*1: Enable object groups (for keyboards)*/ #endif +#if LV_USE_GROUP +#endif /*LV_USE_GROUP*/ #ifndef LV_USE_GPU #define LV_USE_GPU 1 /*1: Enable GPU interface*/ #endif #ifndef LV_USE_FILESYSTEM #define LV_USE_FILESYSTEM 1 /*1: Enable file system (might be required for images*/ #endif -#ifndef LV_USE_I18N -#define LV_USE_I18N 1 /*1: Enable InternationalizatioN (multi-language) support*/ -#endif #ifndef LV_USE_USER_DATA_SINGLE #define LV_USE_USER_DATA_SINGLE 1 /*1: Add a `user_data` to drivers and objects*/ #endif @@ -228,25 +227,25 @@ #define LV_USE_THEME_TEMPL 0 /*Just for test*/ #endif #ifndef LV_USE_THEME_DEFAULT -#define LV_USE_THEME_DEFAULT 1 /*Built mainly from the built-in styles. Consumes very few RAM*/ +#define LV_USE_THEME_DEFAULT 0 /*Built mainly from the built-in styles. Consumes very few RAM*/ #endif #ifndef LV_USE_THEME_ALIEN -#define LV_USE_THEME_ALIEN 1 /*Dark futuristic theme*/ +#define LV_USE_THEME_ALIEN 0 /*Dark futuristic theme*/ #endif #ifndef LV_USE_THEME_NIGHT -#define LV_USE_THEME_NIGHT 1 /*Dark elegant theme*/ +#define LV_USE_THEME_NIGHT 0 /*Dark elegant theme*/ #endif #ifndef LV_USE_THEME_MONO -#define LV_USE_THEME_MONO 1 /*Mono color theme for monochrome displays*/ +#define LV_USE_THEME_MONO 0 /*Mono color theme for monochrome displays*/ #endif #ifndef LV_USE_THEME_MATERIAL -#define LV_USE_THEME_MATERIAL 1 /*Flat theme with bold colors and light shadows*/ +#define LV_USE_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows*/ #endif #ifndef LV_USE_THEME_ZEN -#define LV_USE_THEME_ZEN 1 /*Peaceful, mainly light theme */ +#define LV_USE_THEME_ZEN 0 /*Peaceful, mainly light theme */ #endif #ifndef LV_USE_THEME_NEMO -#define LV_USE_THEME_NEMO 1 /*Water-like theme based on the movie "Finding Nemo"*/ +#define LV_USE_THEME_NEMO 0 /*Water-like theme based on the movie "Finding Nemo"*/ #endif /*================== @@ -309,7 +308,7 @@ #endif #ifndef LV_USE_FONT_MONOSPACE_8 -#define LV_USE_FONT_MONOSPACE_8 1 +#define LV_USE_FONT_MONOSPACE_8 0 #endif /* Optionally declare your custom fonts here. @@ -331,7 +330,7 @@ * LV_OBJ SETTINGS *==================*/ #ifndef LV_OBJ_REALIGN -#define LV_OBJ_REALIGN 1 /*Enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ +#define LV_OBJ_REALIGN 0 /*Enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ #endif /*================== diff --git a/lv_conf_templ.h b/lv_conf_templ.h index 14918fb28..199f81087 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -46,7 +46,7 @@ * to store the graphical objects and other data */ #define LV_MEM_CUSTOM 0 /*1: use custom malloc/free, 0: use the built-in lv_mem_alloc/lv_mem_free*/ #if LV_MEM_CUSTOM == 0 -# define LV_MEM_SIZE (32U * 1024U) /*Size memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ +# define LV_MEM_SIZE (32U * 1024U) /*Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ # define LV_MEM_ATTR /*Complier prefix for big array declaration*/ # define LV_MEM_ADR 0 /*Set an address for memory pool instead of allocation it as an array. Can be in external SRAM too.*/ # define LV_MEM_AUTO_DEFRAG 1 /*Automatically defrag on free*/ @@ -93,7 +93,6 @@ typedef void * lv_group_user_data_t; #endif /*LV_USE_GROUP*/ #define LV_USE_GPU 1 /*1: Enable GPU interface*/ #define LV_USE_FILESYSTEM 1 /*1: Enable file system (might be required for images*/ -#define LV_USE_I18N 1 /*1: Enable InternationalizatioN (multi-language) support*/ #define LV_USE_USER_DATA_SINGLE 1 /*1: Add a `user_data` to drivers and objects*/ #define LV_USE_USER_DATA_MULTI 0 /*1: Add separate `user_data` for every callback*/ @@ -134,13 +133,13 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t #define LV_THEME_LIVE_UPDATE 0 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/ #define LV_USE_THEME_TEMPL 0 /*Just for test*/ -#define LV_USE_THEME_DEFAULT 1 /*Built mainly from the built-in styles. Consumes very few RAM*/ -#define LV_USE_THEME_ALIEN 1 /*Dark futuristic theme*/ -#define LV_USE_THEME_NIGHT 1 /*Dark elegant theme*/ -#define LV_USE_THEME_MONO 1 /*Mono color theme for monochrome displays*/ -#define LV_USE_THEME_MATERIAL 1 /*Flat theme with bold colors and light shadows*/ -#define LV_USE_THEME_ZEN 1 /*Peaceful, mainly light theme */ -#define LV_USE_THEME_NEMO 1 /*Water-like theme based on the movie "Finding Nemo"*/ +#define LV_USE_THEME_DEFAULT 0 /*Built mainly from the built-in styles. Consumes very few RAM*/ +#define LV_USE_THEME_ALIEN 0 /*Dark futuristic theme*/ +#define LV_USE_THEME_NIGHT 0 /*Dark elegant theme*/ +#define LV_USE_THEME_MONO 0 /*Mono color theme for monochrome displays*/ +#define LV_USE_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows*/ +#define LV_USE_THEME_ZEN 0 /*Peaceful, mainly light theme */ +#define LV_USE_THEME_NEMO 0 /*Water-like theme based on the movie "Finding Nemo"*/ /*================== * FONT USAGE @@ -169,7 +168,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t #define LV_USE_FONT_DEJAVU_40_CYRILLIC 0 #define LV_USE_FONT_SYMBOL_40 0 -#define LV_USE_FONT_MONOSPACE_8 1 +#define LV_USE_FONT_MONOSPACE_8 0 /* Optionally declare your custom fonts here. * You can use these fonts as default font too @@ -186,7 +185,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t * LV_OBJ SETTINGS *==================*/ typedef void * lv_obj_user_data_t; /*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ -#define LV_OBJ_REALIGN 1 /*Enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ +#define LV_OBJ_REALIGN 0 /*Enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ /*================== * LV OBJ X USAGE diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c index b81d71cb4..711b8708b 100644 --- a/lv_core/lv_refr.c +++ b/lv_core/lv_refr.c @@ -192,6 +192,7 @@ static void lv_refr_task(void * param) /*Call monitor cb if present*/ if(disp_refr->driver.monitor_cb) { + printf("%d ms\n", lv_tick_elaps(start)); disp_refr->driver.monitor_cb(&disp_refr->driver, lv_tick_elaps(start), px_num); } } @@ -528,10 +529,10 @@ static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p) */ static void lv_refr_vdb_flush(void) { - lv_disp_buf_t * vdb = lv_disp_get_buf(lv_refr_get_disp_refreshing()); + lv_disp_buf_t * vdb = lv_disp_get_buf(disp_refr); /*In double buffered mode wait until the other buffer is flushed before flushing the current one*/ - if(vdb->buf1 && vdb->buf2) { + if(lv_disp_is_double_buf(disp_refr)) { while(vdb->flushing); } diff --git a/lv_themes/lv_theme_zen.c b/lv_themes/lv_theme_zen.c index df0dd9b73..a7181ba51 100644 --- a/lv_themes/lv_theme_zen.c +++ b/lv_themes/lv_theme_zen.c @@ -760,8 +760,9 @@ static void win_init(void) #if LV_USE_GROUP -static void style_mod(lv_style_t * style) +static void style_mod(lv_group_t * group, lv_style_t * style) { + (void) group; /*Unused*/ #if LV_COLOR_DEPTH != 1 /*Make the style to be a little bit orange*/ style->body.border.opa = LV_OPA_COVER; @@ -776,8 +777,10 @@ static void style_mod(lv_style_t * style) #endif } -static void style_mod_edit(lv_style_t * style) +static void style_mod_edit(lv_group_t * group, lv_style_t * style) { + (void) group; /*Unused*/ + #if LV_COLOR_DEPTH != 1 /*Make the style to be a little bit orange*/ style->body.border.opa = LV_OPA_COVER;