github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(meter): remove #define LV_USE_METER (#5230)

Browse Source 
Signed-off-by: lhdjply <lhdjply@126.com>
This commit is contained in:
lhdjply
2024-01-09 11:05:59 +08:00
committed by GitHub
parent 3f4ba1b379
commit cb800cb793
9 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/__lv_conf.h__
View File

@@ -475,8 +475,6 @@
#define LV_USE_MENU 1 #define LV_USE_MENU 1
#define LV_USE_METER 1
#define LV_USE_MSGBOX 1 #define LV_USE_MSGBOX 1
#define LV_USE_ROLLER 1 /*Requires: lv_label*/ #define LV_USE_ROLLER 1 /*Requires: lv_label*/

3
Kconfig
View File

@@ -985,9 +985,6 @@ menu "LVGL configuration"
config LV_USE_MENU config LV_USE_MENU
bool "Menu." bool "Menu."
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
config LV_USE_METER
bool "Meter."
default y if !LV_CONF_MINIMAL
config LV_USE_MSGBOX config LV_USE_MSGBOX
bool "Msgbox." bool "Msgbox."
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL

2
env_support/cmsis-pack/lv_conf_cmsis.h
View File

@@ -480,8 +480,6 @@
#define LV_USE_MENU 1 #define LV_USE_MENU 1
#define LV_USE_METER 1
#define LV_USE_MSGBOX 1 #define LV_USE_MSGBOX 1
#define LV_USE_ROLLER 1 /*Requires: lv_label*/ #define LV_USE_ROLLER 1 /*Requires: lv_label*/

2
lv_conf_template.h
View File

@@ -500,8 +500,6 @@
#define LV_USE_MENU 1 #define LV_USE_MENU 1
#define LV_USE_METER 1
#define LV_USE_MSGBOX 1 #define LV_USE_MSGBOX 1
#define LV_USE_ROLLER 1 /*Requires: lv_label*/ #define LV_USE_ROLLER 1 /*Requires: lv_label*/

12
src/lv_conf_internal.h
View File

@@ -1622,18 +1622,6 @@
#endif #endif
#endif #endif
#ifndef LV_USE_METER
#ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_METER
#define LV_USE_METER CONFIG_LV_USE_METER
#else
#define LV_USE_METER 0
#endif
#else
#define LV_USE_METER 1
#endif
#endif
#ifndef LV_USE_MSGBOX #ifndef LV_USE_MSGBOX
#ifdef _LV_KCONFIG_PRESENT #ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_MSGBOX #ifdef CONFIG_LV_USE_MSGBOX

30
src/themes/default/lv_theme_default.c
View File

@@ -115,10 +115,6 @@ typedef struct {
lv_style_t table_cell; lv_style_t table_cell;
#endif #endif
#if LV_USE_METER
lv_style_t meter_marker, meter_indic;
#endif
#if LV_USE_TEXTAREA #if LV_USE_TEXTAREA
lv_style_t ta_cursor, ta_placeholder; lv_style_t ta_cursor, ta_placeholder;
#endif #endif
@@ -531,24 +527,6 @@ static void style_init(my_theme_t * theme)
lv_style_set_pad_ver(&theme->styles.menu_separator, PAD_TINY); lv_style_set_pad_ver(&theme->styles.menu_separator, PAD_TINY);
#endif #endif
#if LV_USE_METER
style_init_reset(&theme->styles.meter_marker);
lv_style_set_line_width(&theme->styles.meter_marker, _LV_DPX_CALC(theme->disp_dpi, 5));
lv_style_set_line_color(&theme->styles.meter_marker, theme->color_text);
int32_t meter_size = _LV_DPX_CALC(theme->disp_dpi, 20);
lv_style_set_size(&theme->styles.meter_marker, meter_size, meter_size);
meter_size = _LV_DPX_CALC(theme->disp_dpi, 15);
lv_style_set_pad_left(&theme->styles.meter_marker, meter_size);
style_init_reset(&theme->styles.meter_indic);
lv_style_set_radius(&theme->styles.meter_indic, LV_RADIUS_CIRCLE);
lv_style_set_bg_color(&theme->styles.meter_indic, theme->color_text);
lv_style_set_bg_opa(&theme->styles.meter_indic, LV_OPA_COVER);
lv_style_set_size(&theme->styles.meter_indic, meter_size, meter_size);
#endif
#if LV_USE_TABLE #if LV_USE_TABLE
style_init_reset(&theme->styles.table_cell); style_init_reset(&theme->styles.table_cell);
lv_style_set_border_width(&theme->styles.table_cell, _LV_DPX_CALC(theme->disp_dpi, 1)); lv_style_set_border_width(&theme->styles.table_cell, _LV_DPX_CALC(theme->disp_dpi, 1));
@@ -1025,14 +1003,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
} }
#endif #endif
//#if LV_USE_METER
// else if(lv_obj_check_type(obj, &lv_meter_class)) {
// lv_obj_add_style(obj, &theme->styles.card, 0);
// lv_obj_add_style(obj, &theme->styles.circle, 0);
// lv_obj_add_style(obj, &theme->styles.meter_indic, LV_PART_INDICATOR);
// }
//#endif
#if LV_USE_TEXTAREA #if LV_USE_TEXTAREA
else if(lv_obj_check_type(obj, &lv_textarea_class)) { else if(lv_obj_check_type(obj, &lv_textarea_class)) {
lv_obj_add_style(obj, &theme->styles.card, 0); lv_obj_add_style(obj, &theme->styles.card, 0);

6
src/themes/mono/lv_theme_mono.c
View File

@@ -433,12 +433,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
} }
#endif #endif
//#if LV_USE_METER
// else if(lv_obj_check_type(obj, &lv_meter_class)) {
// lv_obj_add_style(obj, &theme->styles.card, 0);
// }
//#endif
#if LV_USE_TEXTAREA #if LV_USE_TEXTAREA
else if(lv_obj_check_type(obj, &lv_textarea_class)) { else if(lv_obj_check_type(obj, &lv_textarea_class)) {
lv_obj_add_style(obj, &theme->styles.card, 0); lv_obj_add_style(obj, &theme->styles.card, 0);

6
src/themes/simple/lv_theme_simple.c
View File

@@ -356,12 +356,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
} }
#endif #endif
//#if LV_USE_METER
// else if(lv_obj_check_type(obj, &lv_meter_class)) {
// lv_obj_add_style(obj, &theme->styles.light, 0);
// }
//#endif
#if LV_USE_TEXTAREA #if LV_USE_TEXTAREA
else if(lv_obj_check_type(obj, &lv_textarea_class)) { else if(lv_obj_check_type(obj, &lv_textarea_class)) {
lv_obj_add_style(obj, &theme->styles.white, 0); lv_obj_add_style(obj, &theme->styles.white, 0);

1
tests/src/lv_test_conf_minimal.h
View File

@@ -1,5 +1,4 @@
#define LV_MEM_SIZE 65535 #define LV_MEM_SIZE 65535
#define LV_USE_METER 0
#define LV_USE_LOG 1 #define LV_USE_LOG 1
#define LV_USE_ASSERT_NULL 0 #define LV_USE_ASSERT_NULL 0
#define LV_USE_ASSERT_MALLOC 0 #define LV_USE_ASSERT_MALLOC 0