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

Merge branch 'master' of https://github.com/littlevgl/lvgl

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-02-07 14:04:05 +01:00
parent bc7efef537 84ed542b34
commit 624a37c529
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lv_font/lv_symbol_def.h
View File

@@ -12,12 +12,12 @@ extern "C" {
#endif #endif
/* In the font converter use this list as range: /* In the font converter use this list as range:
61441, 61448, 61451, 61452, 61452, 61453, 61457, 61459, 61461, 61465, 61441, 61448, 61451, 61452, 61453, 61457, 61459, 61461, 61465, 61468,
61468, 61473, 61478, 61479, 61480, 61502, 61512, 61515, 61516, 61517, 61473, 61478, 61479, 61480, 61502, 61512, 61515, 61516, 61517, 61521,
61521, 61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556, 61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556, 61559,
61559, 61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61671, 61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61671, 61674,
61674, 61683, 61724, 61732, 61787, 61931, 62016, 62017, 62018, 62019, 61683, 61724, 61732, 61787, 61931, 62016, 62017, 62018, 62019, 62020,
62020, 62087, 62099, 62212, 62189, 62810, 63426, 63650 62087, 62099, 62212, 62189, 62810, 63426, 63650
*/ */
#define LV_SYMBOL_AUDIO "\xef\x80\x81" /*61441, 0xF001*/ #define LV_SYMBOL_AUDIO "\xef\x80\x81" /*61441, 0xF001*/
@@ -93,7 +93,6 @@ enum {
_LV_STR_SYMBOL_CLOSE, _LV_STR_SYMBOL_CLOSE,
_LV_STR_SYMBOL_POWER, _LV_STR_SYMBOL_POWER,
_LV_STR_SYMBOL_SETTINGS, _LV_STR_SYMBOL_SETTINGS,
_LV_STR_SYMBOL_TRASH,
_LV_STR_SYMBOL_HOME, _LV_STR_SYMBOL_HOME,
_LV_STR_SYMBOL_DOWNLOAD, _LV_STR_SYMBOL_DOWNLOAD,
_LV_STR_SYMBOL_DRIVE, _LV_STR_SYMBOL_DRIVE,
@@ -113,6 +112,8 @@ enum {
_LV_STR_SYMBOL_RIGHT, _LV_STR_SYMBOL_RIGHT,
_LV_STR_SYMBOL_PLUS, _LV_STR_SYMBOL_PLUS,
_LV_STR_SYMBOL_MINUS, _LV_STR_SYMBOL_MINUS,
_LV_STR_SYMBOL_EYE_OPEN,
_LV_STR_SYMBOL_EYE_CLOSE,
_LV_STR_SYMBOL_WARNING, _LV_STR_SYMBOL_WARNING,
_LV_STR_SYMBOL_SHUFFLE, _LV_STR_SYMBOL_SHUFFLE,
_LV_STR_SYMBOL_UP, _LV_STR_SYMBOL_UP,
@@ -125,6 +126,7 @@ enum {
_LV_STR_SYMBOL_COPY, _LV_STR_SYMBOL_COPY,
_LV_STR_SYMBOL_SAVE, _LV_STR_SYMBOL_SAVE,
_LV_STR_SYMBOL_CHARGE, _LV_STR_SYMBOL_CHARGE,
_LV_STR_SYMBOL_PASTE,
_LV_STR_SYMBOL_BELL, _LV_STR_SYMBOL_BELL,
_LV_STR_SYMBOL_KEYBOARD, _LV_STR_SYMBOL_KEYBOARD,
_LV_STR_SYMBOL_GPS, _LV_STR_SYMBOL_GPS,
@@ -135,7 +137,12 @@ enum {
_LV_STR_SYMBOL_BATTERY_2, _LV_STR_SYMBOL_BATTERY_2,
_LV_STR_SYMBOL_BATTERY_1, _LV_STR_SYMBOL_BATTERY_1,
_LV_STR_SYMBOL_BATTERY_EMPTY, _LV_STR_SYMBOL_BATTERY_EMPTY,
_LV_STR_SYMBOL_USB,
_LV_STR_SYMBOL_BLUETOOTH, _LV_STR_SYMBOL_BLUETOOTH,
_LV_STR_SYMBOL_TRASH,
_LV_STR_SYMBOL_BACKSPACE,
_LV_STR_SYMBOL_SD_CARD,
_LV_STR_SYMBOL_NEW_LINE,
_LV_STR_SYMBOL_DUMMY, _LV_STR_SYMBOL_DUMMY,
}; };

3
src/lv_misc/lv_color.h
View File

@@ -344,7 +344,6 @@ static inline uint8_t lv_color_to8(lv_color_t color)
static inline uint16_t lv_color_to16(lv_color_t color) static inline uint16_t lv_color_to16(lv_color_t color)
{ {
#if LV_COLOR_DEPTH == 1 #if LV_COLOR_DEPTH == 1
if(color.full == 0) if(color.full == 0)
return 0; return 0;
@@ -374,8 +373,6 @@ static inline uint16_t lv_color_to16(lv_color_t color)
LV_COLOR_SET_B16(ret, LV_COLOR_GET_B(color) >> 3); /* 8 - 5 = 3*/ LV_COLOR_SET_B16(ret, LV_COLOR_GET_B(color) >> 3); /* 8 - 5 = 3*/
return ret.full; return ret.full;
#endif #endif
return 0;
} }
static inline uint32_t lv_color_to32(lv_color_t color) static inline uint32_t lv_color_to32(lv_color_t color)

1
src/lv_objx/lv_label.c
View File

@@ -308,7 +308,6 @@ void lv_label_set_array_text(lv_obj_t * label, const char * array, uint16_t size
void lv_label_set_static_text(lv_obj_t * label, const char * text) void lv_label_set_static_text(lv_obj_t * label, const char * text)
{ {
LV_ASSERT_OBJ(label, LV_OBJX_NAME); LV_ASSERT_OBJ(label, LV_OBJX_NAME);
LV_ASSERT_STR(text);
lv_label_ext_t * ext = lv_obj_get_ext_attr(label); lv_label_ext_t * ext = lv_obj_get_ext_attr(label);
if(ext->static_txt == 0 && ext->text != NULL) { if(ext->static_txt == 0 && ext->text != NULL) {