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

Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-06-06 05:55:29 +02:00
commit 81729dfd51
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lv_font/lv_font.h
View File

@ -118,10 +118,21 @@ static inline uint8_t lv_font_get_line_height(const lv_font_t * font_p)
#define LV_FONT_DECLARE(font_name) extern lv_font_t font_name; #define LV_FONT_DECLARE(font_name) extern lv_font_t font_name;
#if LV_FONT_ROBOTO_12
LV_FONT_DECLARE(lv_font_roboto_12) LV_FONT_DECLARE(lv_font_roboto_12)
#endif
#if LV_FONT_ROBOTO_16
LV_FONT_DECLARE(lv_font_roboto_16) LV_FONT_DECLARE(lv_font_roboto_16)
#endif
#if LV_FONT_ROBOTO_22
LV_FONT_DECLARE(lv_font_roboto_22) LV_FONT_DECLARE(lv_font_roboto_22)
#endif
#if LV_FONT_ROBOTO_28
LV_FONT_DECLARE(lv_font_roboto_28) LV_FONT_DECLARE(lv_font_roboto_28)
#endif
/*Declare the custom (user defined) fonts*/ /*Declare the custom (user defined) fonts*/
#ifdef LV_FONT_CUSTOM_DECLARE #ifdef LV_FONT_CUSTOM_DECLARE

2
src/lv_font/lv_symbol_def.h
View File

@ -71,7 +71,7 @@ extern "C" {
/* /*
* following list is generated using * following list is generated using
* cat lv_symbol_def.h | sed -E -n 's/^#define\s+(SYMBOL_\w+).*$/ _LV_STR_\1,/p' * cat src/lv_misc/lv_symbol_def.h | sed -E -n 's/^#define\s+(LV_SYMBOL_\w+).*"$/ _LV_STR_\1,/p'
*/ */
enum { enum {
_LV_STR_SYMBOL_AUDIO, _LV_STR_SYMBOL_AUDIO,