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

Merge pull request #1395 from xennex22/dev-7.0

Browse Source 
Rename/move some defines
This commit is contained in:
embeddedt 2020-02-28 11:46:22 -05:00 committed by GitHub
commit 107aafaf6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_conf_internal.h
View File

@ -733,8 +733,8 @@
#endif
/*Line meter (dependencies: *;)*/
#ifndef LV_USE_LMETER
#define LV_USE_LMETER 1
#ifndef LV_USE_LINEMETER
#define LV_USE_LINEMETER 1
#endif
/*Mask (dependencies: -)*/

2
src/lv_themes/lv_theme_material.h
View File

@ -54,4 +54,4 @@ lv_theme_t * lv_theme_material_init(lv_color_t color_primary, lv_color_t color_s
} /* extern "C" */
#endif
#endif /*LV_THEME_ALIEN_H*/
#endif /*LV_THEME_MATERIAL_H*/

4
src/lv_widgets/lv_gauge.h
View File

@ -18,8 +18,8 @@ extern "C" {
#if LV_USE_GAUGE != 0
/*Testing of dependencies*/
#if LV_USE_LMETER == 0
#error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LMETER 1) "
#if LV_USE_LINEMETER == 0
#error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LINEMETER 1) "
#endif
#include "../lv_core/lv_obj.h"

2
src/lv_widgets/lv_keyboard.c
View File

@ -19,8 +19,6 @@
*********************/
#define LV_OBJX_NAME "lv_keyboard"
#define LV_KEYBOARD_CTRL_BTN_FLAGS (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG)
/**********************
* TYPEDEFS
**********************/

1
src/lv_widgets/lv_keyboard.h
View File

@ -32,6 +32,7 @@ extern "C" {
/*********************
* DEFINES
*********************/
#define LV_KEYBOARD_CTRL_BTN_FLAGS (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG)
/**********************
* TYPEDEFS

4
src/lv_widgets/lv_linemeter.h
View File

@ -15,7 +15,7 @@ extern "C" {
*********************/
#include "../lv_conf_internal.h"
#if LV_USE_LMETER != 0
#if LV_USE_LINEMETER != 0
#include "../lv_core/lv_obj.h"
@ -146,7 +146,7 @@ void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uin
* MACROS
**********************/
#endif /*LV_USE_LMETER*/
#endif /*LV_USE_LINEMETER*/
#ifdef __cplusplus
} /* extern "C" */