From 8e1f54a2131f2342cf6d503f031b242a1a88a87f Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 26 Nov 2017 14:39:22 +0100 Subject: [PATCH] misc integration bugfixes --- lv_conf_templ.h | 9 +++--- lv_draw/lv_draw.h | 2 +- lv_draw/lv_draw_rbasic.c | 2 +- lv_draw/lv_draw_vbasic.c | 4 +-- lv_misc/lv_fonts/dejavu_10.c | 2 +- lv_misc/lv_fonts/dejavu_10.h | 2 +- lv_misc/lv_fonts/dejavu_10_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_10_cyrillic.h | 4 +-- lv_misc/lv_fonts/dejavu_10_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_a.h | 4 +-- lv_misc/lv_fonts/dejavu_10_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_b.h | 4 +-- lv_misc/lv_fonts/dejavu_10_sup.c | 2 +- lv_misc/lv_fonts/dejavu_10_sup.h | 2 +- lv_misc/lv_fonts/dejavu_20.c | 2 +- lv_misc/lv_fonts/dejavu_20.h | 4 +-- lv_misc/lv_fonts/dejavu_20_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_20_cyrillic.h | 4 +-- lv_misc/lv_fonts/dejavu_20_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_a.h | 4 +-- lv_misc/lv_fonts/dejavu_20_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_b.h | 4 +-- lv_misc/lv_fonts/dejavu_20_sup.c | 2 +- lv_misc/lv_fonts/dejavu_20_sup.h | 4 +-- lv_misc/lv_fonts/dejavu_30.c | 2 +- lv_misc/lv_fonts/dejavu_30.h | 4 +-- lv_misc/lv_fonts/dejavu_30_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_30_cyrillic.h | 4 +-- lv_misc/lv_fonts/dejavu_30_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_a.h | 4 +-- lv_misc/lv_fonts/dejavu_30_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_b.h | 4 +-- lv_misc/lv_fonts/dejavu_30_sup.c | 2 +- lv_misc/lv_fonts/dejavu_30_sup.h | 4 +-- lv_misc/lv_fonts/dejavu_60.c | 2 +- lv_misc/lv_fonts/dejavu_60.h | 4 +-- lv_misc/lv_fonts/dejavu_60_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_60_cyrillic.h | 4 +-- lv_misc/lv_fonts/dejavu_60_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_a.h | 4 +-- lv_misc/lv_fonts/dejavu_60_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_b.h | 4 +-- lv_misc/lv_fonts/dejavu_60_sup.c | 2 +- lv_misc/lv_fonts/dejavu_60_sup.h | 4 +-- lv_misc/lv_fonts/dejavu_80.c | 2 +- lv_misc/lv_fonts/dejavu_80.h | 4 +-- lv_misc/lv_fonts/dejavu_80_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_80_cyrillic.h | 4 +-- lv_misc/lv_fonts/dejavu_80_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_a.h | 4 +-- lv_misc/lv_fonts/dejavu_80_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_b.h | 4 +-- lv_misc/lv_fonts/dejavu_80_sup.c | 2 +- lv_misc/lv_fonts/dejavu_80_sup.h | 4 +-- lv_misc/lv_fonts/symbol_10_basic.c | 4 +-- lv_misc/lv_fonts/symbol_10_basic.h | 4 +-- lv_misc/lv_fonts/symbol_10_feedback.c | 4 +-- lv_misc/lv_fonts/symbol_10_feedback.h | 4 +-- lv_misc/lv_fonts/symbol_10_file.c | 4 +-- lv_misc/lv_fonts/symbol_10_file.h | 4 +-- lv_misc/lv_fonts/symbol_20_basic.c | 4 +-- lv_misc/lv_fonts/symbol_20_basic.h | 4 +-- lv_misc/lv_fonts/symbol_20_feedback.c | 4 +-- lv_misc/lv_fonts/symbol_20_feedback.h | 4 +-- lv_misc/lv_fonts/symbol_20_file.c | 4 +-- lv_misc/lv_fonts/symbol_20_file.h | 4 +-- lv_misc/lv_fonts/symbol_30_basic.c | 4 +-- lv_misc/lv_fonts/symbol_30_basic.h | 4 +-- lv_misc/lv_fonts/symbol_30_feedback.c | 4 +-- lv_misc/lv_fonts/symbol_30_feedback.h | 4 +-- lv_misc/lv_fonts/symbol_30_file.c | 4 +-- lv_misc/lv_fonts/symbol_30_file.h | 4 +-- lv_misc/lv_fonts/symbol_40_basic.c | 2 +- lv_misc/lv_fonts/symbol_40_feedback.c | 2 +- lv_misc/lv_fonts/symbol_40_file.c | 2 +- lv_misc/lv_fonts/symbol_60_basic.c | 7 +++-- lv_misc/lv_fonts/symbol_60_basic.h | 4 +-- lv_misc/lv_fonts/symbol_60_feedback.c | 4 +-- lv_misc/lv_fonts/symbol_60_feedback.h | 4 +-- lv_misc/lv_fonts/symbol_60_file.c | 4 +-- lv_misc/lv_fonts/symbol_60_file.h | 4 +-- lv_misc/lv_fonts/symbol_80_basic.c | 4 +-- lv_misc/lv_fonts/symbol_80_basic.h | 4 +-- lv_misc/lv_fonts/symbol_80_feedback.c | 4 +-- lv_misc/lv_fonts/symbol_80_feedback.h | 4 +-- lv_misc/lv_fonts/symbol_80_file.c | 4 +-- lv_misc/lv_fonts/symbol_80_file.h | 4 +-- lv_misc/lv_fonts/symbol_def.h | 4 +-- lv_misc/lv_templ.c | 36 ++++++++++++++++++++++ lv_misc/lv_templ.h | 38 ++++++++++++++++++++++++ lv_misc/lv_txt.c | 14 ++++----- lv_objx/lv_label.c | 6 ++-- lv_objx/lv_label.h | 2 +- lv_objx/lv_ta.c | 8 ++--- 94 files changed, 237 insertions(+), 163 deletions(-) create mode 100644 lv_misc/lv_templ.c create mode 100644 lv_misc/lv_templ.h diff --git a/lv_conf_templ.h b/lv_conf_templ.h index 9f3ce43ce..c1bd91c54 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -61,7 +61,7 @@ /*Color settings*/ #define LV_COLOR_DEPTH 24 -#define LV_LV_COLOR_TRANSP LV_COLOR_LIME /*Images pixels with this color will not be drawn*/ +#define LV_COLOR_TRANSP LV_COLOR_LIME /*Images pixels with this color will not be drawn*/ /*Text settings*/ #define LV_TXT_UTF8 1 @@ -140,16 +140,15 @@ * IMAGE USAGE *================*/ #define LV_IMAGE_ENABLE_ALL 1 /*Unconditionally enable all image maps*/ -#define USE_IMG_BUBBLE_PATTERN 1 //#define USE_IMG_XYZ 1 /*Enable or disable to compile you image map files*/ - -/*lv_obj (base object) settings*/ +/*================== + * LV_OBJ SETTINGS + *==================*/ #define LV_OBJ_FREE_NUM_TYPE uint32_t /*Type of free number attribute (comment out disable free number)*/ #define LV_OBJ_FREE_PTR 1 /*Enable the free pointer attribute*/ #define LV_OBJ_GROUP 1 /*Enable object groups*/ - /*================== * LV OBJ X USAGE *================*/ diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h index 631b85d35..6f7d886b8 100644 --- a/lv_draw/lv_draw.h +++ b/lv_draw/lv_draw.h @@ -30,7 +30,7 @@ typedef struct { uint32_t w:12; /*Width of the image map*/ uint32_t h:12; /*Height of the image map*/ - uint32_t transp:1; /*1: The image contains transparent pixels with LV_LV_COLOR_TRANSP color*/ + uint32_t transp:1; /*1: The image contains transparent pixels with LV_COLOR_TRANSP color*/ uint32_t cd:3; /*Color depth (0: reserved, 1: 8 bit, 2: 16 bit or 3: 24 bit, 4-7: reserved)*/ uint32_t res :4; /*Reserved*/ }lv_img_raw_header_t; diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c index f377135e9..4ef0a8da8 100644 --- a/lv_draw/lv_draw_rbasic.c +++ b/lv_draw/lv_draw_rbasic.c @@ -200,7 +200,7 @@ void lv_rmap(const lv_area_t * cords_p, const lv_area_t * mask_p, map_p += map_width; } }else { - lv_color_t transp_color = LV_LV_COLOR_TRANSP; + lv_color_t transp_color = LV_COLOR_TRANSP; lv_coord_t row; for(row = 0; row < area_get_height(&masked_a); row++) { lv_coord_t col; diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index 58b841da2..42bf4cb2b 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -337,7 +337,7 @@ void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p, } else { /*transp == true: Check all pixels */ lv_coord_t row; lv_coord_t col; - lv_color_t transp_color = LV_LV_COLOR_TRANSP; + lv_color_t transp_color = LV_COLOR_TRANSP; if(recolor_opa == LV_OPA_TRANSP) {/*No recolor*/ if(opa == LV_OPA_COVER) { /*no opa */ @@ -397,7 +397,7 @@ void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p, else { lv_coord_t row; lv_coord_t col; - lv_color_t transp_color = LV_LV_COLOR_TRANSP; + lv_color_t transp_color = LV_COLOR_TRANSP; lv_color_t lv_color_tmp; lv_color_t prev_color = LV_COLOR_BLACK; lv_coord_t map_col; diff --git a/lv_misc/lv_fonts/dejavu_10.c b/lv_misc/lv_fonts/dejavu_10.c index b0fec9c67..3fbff7196 100644 --- a/lv_misc/lv_fonts/dejavu_10.c +++ b/lv_misc/lv_fonts/dejavu_10.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_10 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_10_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_10.h b/lv_misc/lv_fonts/dejavu_10.h index 573566a5e..5696bf1ee 100644 --- a/lv_misc/lv_fonts/dejavu_10.h +++ b/lv_misc/lv_fonts/dejavu_10.h @@ -8,7 +8,7 @@ #if USE_LV_FONT_DEJAVU_10 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_10; diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.c b/lv_misc/lv_fonts/dejavu_10_cyrillic.c index 41838a0eb..568367d15 100644 --- a/lv_misc/lv_fonts/dejavu_10_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_10_cyrillic_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.h b/lv_misc/lv_fonts/dejavu_10_cyrillic.h index c7a88ac4c..ee1a2827d 100644 --- a/lv_misc/lv_fonts/dejavu_10_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_10_cyrillic; #endif /*USE_LV_FONT_DEJAVU_10_CYRILLIC != 0*/ -#endif /*DEJAVU_10_CYRILLIC_H*/ \ No newline at end of file +#endif /*DEJAVU_10_CYRILLIC_H*/ diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c index a5fee78f8..f114ce917 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_10_latin_ext_a_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h index f3c187027..d997a40e7 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "./lv_font.h" extern lv_font_t lv_font_dejavu_10_latin_ext_a; #endif /*USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0*/ -#endif /*DEJAVU_10_LATIN_EXT_A_H*/ \ No newline at end of file +#endif /*DEJAVU_10_LATIN_EXT_A_H*/ diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c index a022db175..973c9dcac 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_10_latin_ext_b_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h index e357c4776..17930918d 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_10_latin_ext_b; #endif /*USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0*/ -#endif /*DEJAVU_10_LATIN_EXT_B_H*/ \ No newline at end of file +#endif /*DEJAVU_10_LATIN_EXT_B_H*/ diff --git a/lv_misc/lv_fonts/dejavu_10_sup.c b/lv_misc/lv_fonts/dejavu_10_sup.c index b8fd939bf..3c537e9f3 100644 --- a/lv_misc/lv_fonts/dejavu_10_sup.c +++ b/lv_misc/lv_fonts/dejavu_10_sup.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_10_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_10_sup_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_10_sup.h b/lv_misc/lv_fonts/dejavu_10_sup.h index 98b056607..8de386473 100644 --- a/lv_misc/lv_fonts/dejavu_10_sup.h +++ b/lv_misc/lv_fonts/dejavu_10_sup.h @@ -8,7 +8,7 @@ #if USE_LV_FONT_DEJAVU_10_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_10_sup; diff --git a/lv_misc/lv_fonts/dejavu_20.c b/lv_misc/lv_fonts/dejavu_20.c index 0b8768305..f23a95a60 100644 --- a/lv_misc/lv_fonts/dejavu_20.c +++ b/lv_misc/lv_fonts/dejavu_20.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_20 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_20_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_20.h b/lv_misc/lv_fonts/dejavu_20.h index ebfefc59b..6f68e17d6 100644 --- a/lv_misc/lv_fonts/dejavu_20.h +++ b/lv_misc/lv_fonts/dejavu_20.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_20 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_20; #endif /*USE_LV_FONT_DEJAVU_20 != 0*/ -#endif /*DEJAVU_20_H*/ \ No newline at end of file +#endif /*DEJAVU_20_H*/ diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.c b/lv_misc/lv_fonts/dejavu_20_cyrillic.c index f1329dbe7..ec2c7e1b7 100644 --- a/lv_misc/lv_fonts/dejavu_20_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_20_cyrillic_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.h b/lv_misc/lv_fonts/dejavu_20_cyrillic.h index 33d97f6ea..057f7d054 100644 --- a/lv_misc/lv_fonts/dejavu_20_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_20_cyrillic; #endif /*USE_LV_FONT_DEJAVU_20_CYRILLIC != 0*/ -#endif /*DEJAVU_20_CYRILLIC_H*/ \ No newline at end of file +#endif /*DEJAVU_20_CYRILLIC_H*/ diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c index 01a624314..30a7958fa 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_20_latin_ext_a_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h index 13dd0b365..bf96f0232 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_20_latin_ext_a; #endif /*USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0*/ -#endif /*DEJAVU_20_LATIN_EXT_A_H*/ \ No newline at end of file +#endif /*DEJAVU_20_LATIN_EXT_A_H*/ diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c index 82dbceea3..23eafde56 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_20_latin_ext_b_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h index 2bed23307..ad81da1e5 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_20_latin_ext_b; #endif /*USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0*/ -#endif /*DEJAVU_20_LATIN_EXT_B_H*/ \ No newline at end of file +#endif /*DEJAVU_20_LATIN_EXT_B_H*/ diff --git a/lv_misc/lv_fonts/dejavu_20_sup.c b/lv_misc/lv_fonts/dejavu_20_sup.c index 44bc4f696..64321cce9 100644 --- a/lv_misc/lv_fonts/dejavu_20_sup.c +++ b/lv_misc/lv_fonts/dejavu_20_sup.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_20_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_20_sup_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_20_sup.h b/lv_misc/lv_fonts/dejavu_20_sup.h index 32e1d6efc..045585a92 100644 --- a/lv_misc/lv_fonts/dejavu_20_sup.h +++ b/lv_misc/lv_fonts/dejavu_20_sup.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_20_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_20_sup; #endif /*USE_LV_FONT_DEJAVU_20_SUP != 0*/ -#endif /*DEJAVU_20_SUP_H*/ \ No newline at end of file +#endif /*DEJAVU_20_SUP_H*/ diff --git a/lv_misc/lv_fonts/dejavu_30.c b/lv_misc/lv_fonts/dejavu_30.c index a5ff1b2ec..db9be67f7 100644 --- a/lv_misc/lv_fonts/dejavu_30.c +++ b/lv_misc/lv_fonts/dejavu_30.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_30 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_30_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_30.h b/lv_misc/lv_fonts/dejavu_30.h index ee051930d..4e1c23faa 100644 --- a/lv_misc/lv_fonts/dejavu_30.h +++ b/lv_misc/lv_fonts/dejavu_30.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_30 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_30; #endif /*USE_LV_FONT_DEJAVU_30 != 0*/ -#endif /*DEJAVU_30_H*/ \ No newline at end of file +#endif /*DEJAVU_30_H*/ diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.c b/lv_misc/lv_fonts/dejavu_30_cyrillic.c index 4743b7875..2adb2217b 100644 --- a/lv_misc/lv_fonts/dejavu_30_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_30_cyrillic_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.h b/lv_misc/lv_fonts/dejavu_30_cyrillic.h index eba0019ab..846e9f777 100644 --- a/lv_misc/lv_fonts/dejavu_30_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_30_cyrillic; #endif /*USE_LV_FONT_DEJAVU_30_CYRILLIC != 0*/ -#endif /*DEJAVU_30_CYRILLIC_H*/ \ No newline at end of file +#endif /*DEJAVU_30_CYRILLIC_H*/ diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c index 7a0177a91..24cafcd05 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_30_latin_ext_a_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h index e8e6513ef..72b876ad1 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_30_latin_ext_a; #endif /*USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0*/ -#endif /*DEJAVU_30_LATIN_EXT_A_H*/ \ No newline at end of file +#endif /*DEJAVU_30_LATIN_EXT_A_H*/ diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c index 22b304cbf..827f366a4 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_30_latin_ext_b_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h index 33e8e8f64..502bd0438 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_30_latin_ext_b; #endif /*USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0*/ -#endif /*DEJAVU_30_LATIN_EXT_B_H*/ \ No newline at end of file +#endif /*DEJAVU_30_LATIN_EXT_B_H*/ diff --git a/lv_misc/lv_fonts/dejavu_30_sup.c b/lv_misc/lv_fonts/dejavu_30_sup.c index ce3681ada..cfa363b56 100644 --- a/lv_misc/lv_fonts/dejavu_30_sup.c +++ b/lv_misc/lv_fonts/dejavu_30_sup.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_30_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_30_sup_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_30_sup.h b/lv_misc/lv_fonts/dejavu_30_sup.h index b59c4ae31..3567bceeb 100644 --- a/lv_misc/lv_fonts/dejavu_30_sup.h +++ b/lv_misc/lv_fonts/dejavu_30_sup.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_30_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_30_sup; #endif /*USE_LV_FONT_DEJAVU_30_SUP != 0*/ -#endif /*DEJAVU_30_SUP_H*/ \ No newline at end of file +#endif /*DEJAVU_30_SUP_H*/ diff --git a/lv_misc/lv_fonts/dejavu_60.c b/lv_misc/lv_fonts/dejavu_60.c index 4f7053ca9..1ee45d8df 100644 --- a/lv_misc/lv_fonts/dejavu_60.c +++ b/lv_misc/lv_fonts/dejavu_60.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_60 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_60_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_60.h b/lv_misc/lv_fonts/dejavu_60.h index 4ddbaa3fd..3e28fadcb 100644 --- a/lv_misc/lv_fonts/dejavu_60.h +++ b/lv_misc/lv_fonts/dejavu_60.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_60 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_60; #endif /*USE_LV_FONT_DEJAVU_60 != 0*/ -#endif /*DEJAVU_60_H*/ \ No newline at end of file +#endif /*DEJAVU_60_H*/ diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.c b/lv_misc/lv_fonts/dejavu_60_cyrillic.c index 00c2e8560..8b7ca1f52 100644 --- a/lv_misc/lv_fonts/dejavu_60_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_60_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_60_cyrillic_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.h b/lv_misc/lv_fonts/dejavu_60_cyrillic.h index 7624cc94d..16318aa5a 100644 --- a/lv_misc/lv_fonts/dejavu_60_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_60_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_60_cyrillic; #endif /*USE_LV_FONT_DEJAVU_60_CYRILLIC != 0*/ -#endif /*DEJAVU_60_CYRILLIC_H*/ \ No newline at end of file +#endif /*DEJAVU_60_CYRILLIC_H*/ diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c index df3cb8c3a..395771793 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_60_latin_ext_a_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h index aee2e3115..0408908d7 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_60_latin_ext_a; #endif /*USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0*/ -#endif /*DEJAVU_60_LATIN_EXT_A_H*/ \ No newline at end of file +#endif /*DEJAVU_60_LATIN_EXT_A_H*/ diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c index aed413436..f4379c27f 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_60_latin_ext_b_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h index 24bcee68d..dea1b62ce 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_60_latin_ext_b; #endif /*USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0*/ -#endif /*DEJAVU_60_LATIN_EXT_B_H*/ \ No newline at end of file +#endif /*DEJAVU_60_LATIN_EXT_B_H*/ diff --git a/lv_misc/lv_fonts/dejavu_60_sup.c b/lv_misc/lv_fonts/dejavu_60_sup.c index 94d90f941..13026ccf2 100644 --- a/lv_misc/lv_fonts/dejavu_60_sup.c +++ b/lv_misc/lv_fonts/dejavu_60_sup.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_60_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_60_sup_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_60_sup.h b/lv_misc/lv_fonts/dejavu_60_sup.h index ec5d69f29..12927eec3 100644 --- a/lv_misc/lv_fonts/dejavu_60_sup.h +++ b/lv_misc/lv_fonts/dejavu_60_sup.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_60_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_60_sup; #endif /*USE_LV_FONT_DEJAVU_60_SUP != 0*/ -#endif /*DEJAVU_60_SUP_H*/ \ No newline at end of file +#endif /*DEJAVU_60_SUP_H*/ diff --git a/lv_misc/lv_fonts/dejavu_80.c b/lv_misc/lv_fonts/dejavu_80.c index ea1c67aa5..f04add16f 100644 --- a/lv_misc/lv_fonts/dejavu_80.c +++ b/lv_misc/lv_fonts/dejavu_80.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_80 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_80_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_80.h b/lv_misc/lv_fonts/dejavu_80.h index 28dec4f93..8bf97df2b 100644 --- a/lv_misc/lv_fonts/dejavu_80.h +++ b/lv_misc/lv_fonts/dejavu_80.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_80 != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_80; #endif /*USE_LV_FONT_DEJAVU_80 != 0*/ -#endif /*DEJAVU_80_H*/ \ No newline at end of file +#endif /*DEJAVU_80_H*/ diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.c b/lv_misc/lv_fonts/dejavu_80_cyrillic.c index e8336ede8..434b552c1 100644 --- a/lv_misc/lv_fonts/dejavu_80_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_80_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_80_cyrillic_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.h b/lv_misc/lv_fonts/dejavu_80_cyrillic.h index c9c562013..c6c78373d 100644 --- a/lv_misc/lv_fonts/dejavu_80_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_80_CYRILLIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_80_cyrillic; #endif /*USE_LV_FONT_DEJAVU_80_CYRILLIC != 0*/ -#endif /*DEJAVU_80_CYRILLIC_H*/ \ No newline at end of file +#endif /*DEJAVU_80_CYRILLIC_H*/ diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c index 0c5014c88..1f763f498 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_80_latin_ext_a_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h index bd650a575..c17d55e05 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_80_latin_ext_a; #endif /*USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0*/ -#endif /*DEJAVU_80_LATIN_EXT_A_H*/ \ No newline at end of file +#endif /*DEJAVU_80_LATIN_EXT_A_H*/ diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c index c239c6174..9d65347ca 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_80_latin_ext_b_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h index 4fc7b2305..e0f78342e 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_80_latin_ext_b; #endif /*USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0*/ -#endif /*DEJAVU_80_LATIN_EXT_B_H*/ \ No newline at end of file +#endif /*DEJAVU_80_LATIN_EXT_B_H*/ diff --git a/lv_misc/lv_fonts/dejavu_80_sup.c b/lv_misc/lv_fonts/dejavu_80_sup.c index c59aa3a7f..a09a933cf 100644 --- a/lv_misc/lv_fonts/dejavu_80_sup.c +++ b/lv_misc/lv_fonts/dejavu_80_sup.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_DEJAVU_80_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t dejavu_80_sup_bitmap[] = diff --git a/lv_misc/lv_fonts/dejavu_80_sup.h b/lv_misc/lv_fonts/dejavu_80_sup.h index 4b1976efd..607cfb0e5 100644 --- a/lv_misc/lv_fonts/dejavu_80_sup.h +++ b/lv_misc/lv_fonts/dejavu_80_sup.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_DEJAVU_80_SUP != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_80_sup; #endif /*USE_LV_FONT_DEJAVU_80_SUP != 0*/ -#endif /*DEJAVU_80_SUP_H*/ \ No newline at end of file +#endif /*DEJAVU_80_SUP_H*/ diff --git a/lv_misc/lv_fonts/symbol_10_basic.c b/lv_misc/lv_fonts/symbol_10_basic.c index 2d0be21b0..808f8c68c 100644 --- a/lv_misc/lv_fonts/symbol_10_basic.c +++ b/lv_misc/lv_fonts/symbol_10_basic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_10_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_10_basic_bitmap[] = @@ -191,7 +191,7 @@ static const uint8_t symbol_10_basic_width[] = lv_font_t lv_font_symbol_10_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_10_basic.h b/lv_misc/lv_fonts/symbol_10_basic.h index 4c403ca62..2cf22703f 100644 --- a/lv_misc/lv_fonts/symbol_10_basic.h +++ b/lv_misc/lv_fonts/symbol_10_basic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_10_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_10_basic; #endif /*USE_LV_FONT_SYMBOL_10_BASIC != 0*/ -#endif /*SYMBOL_10_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_10_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_10_feedback.c b/lv_misc/lv_fonts/symbol_10_feedback.c index 2a5a535ae..07a24cca6 100644 --- a/lv_misc/lv_fonts/symbol_10_feedback.c +++ b/lv_misc/lv_fonts/symbol_10_feedback.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_10_feedback_bitmap[] = @@ -203,7 +203,7 @@ static const uint8_t symbol_10_feedback_width[] = lv_font_t lv_font_symbol_10_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_10_feedback.h b/lv_misc/lv_fonts/symbol_10_feedback.h index 5ff04990d..7dee09c2a 100644 --- a/lv_misc/lv_fonts/symbol_10_feedback.h +++ b/lv_misc/lv_fonts/symbol_10_feedback.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_10_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_10_feedback; #endif /*USE_LV_FONT_SYMBOL_10_FEEDBACK != 0*/ -#endif /*SYMBOL_10_FEEDBACK_H*/ \ No newline at end of file +#endif /*SYMBOL_10_FEEDBACK_H*/ diff --git a/lv_misc/lv_fonts/symbol_10_file.c b/lv_misc/lv_fonts/symbol_10_file.c index b6dc8ab32..73bca34fd 100644 --- a/lv_misc/lv_fonts/symbol_10_file.c +++ b/lv_misc/lv_fonts/symbol_10_file.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_10_file_bitmap[] = @@ -277,7 +277,7 @@ static const uint8_t symbol_10_file_width[] = lv_font_t lv_font_symbol_10_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_10_file.h b/lv_misc/lv_fonts/symbol_10_file.h index cef1a3dc7..aa695551e 100644 --- a/lv_misc/lv_fonts/symbol_10_file.h +++ b/lv_misc/lv_fonts/symbol_10_file.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_10_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_10_file; #endif /*USE_LV_FONT_SYMBOL_10_FILE != 0*/ -#endif /*SYMBOL_10_FILE_H*/ \ No newline at end of file +#endif /*SYMBOL_10_FILE_H*/ diff --git a/lv_misc/lv_fonts/symbol_20_basic.c b/lv_misc/lv_fonts/symbol_20_basic.c index 70e6ea08f..dd5c1c38f 100644 --- a/lv_misc/lv_fonts/symbol_20_basic.c +++ b/lv_misc/lv_fonts/symbol_20_basic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_20_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_20_basic_bitmap[] = @@ -331,7 +331,7 @@ static const uint8_t symbol_20_basic_width[] = lv_font_t lv_font_symbol_20_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_20_basic.h b/lv_misc/lv_fonts/symbol_20_basic.h index 0697e85d2..66ff0d1d0 100644 --- a/lv_misc/lv_fonts/symbol_20_basic.h +++ b/lv_misc/lv_fonts/symbol_20_basic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_20_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_20_basic; #endif /*USE_LV_FONT_SYMBOL_20_BASIC != 0*/ -#endif /*SYMBOL_20_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_20_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_20_feedback.c b/lv_misc/lv_fonts/symbol_20_feedback.c index 84b9aeb99..fbebc0ebc 100644 --- a/lv_misc/lv_fonts/symbol_20_feedback.c +++ b/lv_misc/lv_fonts/symbol_20_feedback.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_20_feedback_bitmap[] = @@ -353,7 +353,7 @@ static const uint8_t symbol_20_feedback_width[] = lv_font_t lv_font_symbol_20_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_20_feedback.h b/lv_misc/lv_fonts/symbol_20_feedback.h index e5f8d012c..7ce726921 100644 --- a/lv_misc/lv_fonts/symbol_20_feedback.h +++ b/lv_misc/lv_fonts/symbol_20_feedback.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_20_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_20_feedback; #endif /*USE_LV_FONT_SYMBOL_20_FEEDBACK != 0*/ -#endif /*SYMBOL_20_FEEDBACK_H*/ \ No newline at end of file +#endif /*SYMBOL_20_FEEDBACK_H*/ diff --git a/lv_misc/lv_fonts/symbol_20_file.c b/lv_misc/lv_fonts/symbol_20_file.c index 204cbba1b..f97fa55d3 100644 --- a/lv_misc/lv_fonts/symbol_20_file.c +++ b/lv_misc/lv_fonts/symbol_20_file.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_20_file_bitmap[] = @@ -487,7 +487,7 @@ static const uint8_t symbol_20_file_width[] = lv_font_t lv_font_symbol_20_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_20_file.h b/lv_misc/lv_fonts/symbol_20_file.h index 41edd920d..5ab4ff1ca 100644 --- a/lv_misc/lv_fonts/symbol_20_file.h +++ b/lv_misc/lv_fonts/symbol_20_file.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_20_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_20_file; #endif /*USE_LV_FONT_SYMBOL_20_FILE != 0*/ -#endif /*SYMBOL_20_FILE_H*/ \ No newline at end of file +#endif /*SYMBOL_20_FILE_H*/ diff --git a/lv_misc/lv_fonts/symbol_30_basic.c b/lv_misc/lv_fonts/symbol_30_basic.c index f3bc49589..f77dd8629 100644 --- a/lv_misc/lv_fonts/symbol_30_basic.c +++ b/lv_misc/lv_fonts/symbol_30_basic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_30_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_30_basic_bitmap[] = @@ -471,7 +471,7 @@ static const uint8_t symbol_30_basic_width[] = lv_font_t lv_font_symbol_30_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_30_basic.h b/lv_misc/lv_fonts/symbol_30_basic.h index e4d9458ba..d66927b90 100644 --- a/lv_misc/lv_fonts/symbol_30_basic.h +++ b/lv_misc/lv_fonts/symbol_30_basic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_30_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_30_basic; #endif /*USE_LV_FONT_SYMBOL_30_BASIC != 0*/ -#endif /*SYMBOL_30_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_30_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_30_feedback.c b/lv_misc/lv_fonts/symbol_30_feedback.c index c5ea3c1bf..0efa7169c 100644 --- a/lv_misc/lv_fonts/symbol_30_feedback.c +++ b/lv_misc/lv_fonts/symbol_30_feedback.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_30_feedback_bitmap[] = @@ -503,7 +503,7 @@ static const uint8_t symbol_30_feedback_width[] = lv_font_t lv_font_symbol_30_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_30_feedback.h b/lv_misc/lv_fonts/symbol_30_feedback.h index ae5671aee..d5374962b 100644 --- a/lv_misc/lv_fonts/symbol_30_feedback.h +++ b/lv_misc/lv_fonts/symbol_30_feedback.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_30_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_30_feedback; #endif /*USE_LV_FONT_SYMBOL_30_FEEDBACK != 0*/ -#endif /*SYMBOL_30_FEEDBACK_H*/ \ No newline at end of file +#endif /*SYMBOL_30_FEEDBACK_H*/ diff --git a/lv_misc/lv_fonts/symbol_30_file.c b/lv_misc/lv_fonts/symbol_30_file.c index 2f92eeead..c4d7d331b 100644 --- a/lv_misc/lv_fonts/symbol_30_file.c +++ b/lv_misc/lv_fonts/symbol_30_file.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_30_file_bitmap[] = @@ -697,7 +697,7 @@ static const uint8_t symbol_30_file_width[] = lv_font_t lv_font_symbol_30_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_30_file.h b/lv_misc/lv_fonts/symbol_30_file.h index 6dcbf0bef..de1c0a92f 100644 --- a/lv_misc/lv_fonts/symbol_30_file.h +++ b/lv_misc/lv_fonts/symbol_30_file.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_30_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_30_file; #endif /*USE_LV_FONT_SYMBOL_30_FILE != 0*/ -#endif /*SYMBOL_30_FILE_H*/ \ No newline at end of file +#endif /*SYMBOL_30_FILE_H*/ diff --git a/lv_misc/lv_fonts/symbol_40_basic.c b/lv_misc/lv_fonts/symbol_40_basic.c index 04f1dd64e..61bf5cec3 100644 --- a/lv_misc/lv_fonts/symbol_40_basic.c +++ b/lv_misc/lv_fonts/symbol_40_basic.c @@ -611,7 +611,7 @@ static const uint8_t symbol_40_basic_width[] = lv_font_t lv_font_symbol_40_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_40_feedback.c b/lv_misc/lv_fonts/symbol_40_feedback.c index 2aa285298..d615a1888 100644 --- a/lv_misc/lv_fonts/symbol_40_feedback.c +++ b/lv_misc/lv_fonts/symbol_40_feedback.c @@ -653,7 +653,7 @@ static const uint8_t symbol_40_feedback_width[] = lv_font_t lv_font_symbol_40_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_40_file.c b/lv_misc/lv_fonts/symbol_40_file.c index 31b3bc714..23acefd7a 100644 --- a/lv_misc/lv_fonts/symbol_40_file.c +++ b/lv_misc/lv_fonts/symbol_40_file.c @@ -907,7 +907,7 @@ static const uint8_t symbol_40_file_width[] = lv_font_t lv_font_symbol_40_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_60_basic.c b/lv_misc/lv_fonts/symbol_60_basic.c index 86dbedfc0..98bdbba2d 100644 --- a/lv_misc/lv_fonts/symbol_60_basic.c +++ b/lv_misc/lv_fonts/symbol_60_basic.c @@ -1,7 +1,8 @@ #include "lv_conf.h" + #if USE_LV_FONT_SYMBOL_60_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_60_basic_bitmap[] = @@ -891,7 +892,7 @@ static const uint8_t symbol_60_basic_width[] = lv_font_t lv_font_symbol_60_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else @@ -904,4 +905,4 @@ lv_font_t lv_font_symbol_60_basic = symbol_60_basic_width, /*Glyph widths (columns)*/ }; -#endif /*SYMBOL_60_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_60_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_60_basic.h b/lv_misc/lv_fonts/symbol_60_basic.h index 918446009..0cd155742 100644 --- a/lv_misc/lv_fonts/symbol_60_basic.h +++ b/lv_misc/lv_fonts/symbol_60_basic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_60_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_60_basic; #endif /*USE_LV_FONT_SYMBOL_60_BASIC != 0*/ -#endif /*SYMBOL_60_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_60_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_60_feedback.c b/lv_misc/lv_fonts/symbol_60_feedback.c index c3bc6ee53..b40261c32 100644 --- a/lv_misc/lv_fonts/symbol_60_feedback.c +++ b/lv_misc/lv_fonts/symbol_60_feedback.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_60_feedback_bitmap[] = @@ -953,7 +953,7 @@ static const uint8_t symbol_60_feedback_width[] = lv_font_t lv_font_symbol_60_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_60_feedback.h b/lv_misc/lv_fonts/symbol_60_feedback.h index c0dd785fb..3c8c8ea0f 100644 --- a/lv_misc/lv_fonts/symbol_60_feedback.h +++ b/lv_misc/lv_fonts/symbol_60_feedback.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_60_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_60_feedback; #endif /*USE_LV_FONT_SYMBOL_60_FEEDBACK != 0*/ -#endif /*SYMBOL_60_FEEDBACK_H*/ \ No newline at end of file +#endif /*SYMBOL_60_FEEDBACK_H*/ diff --git a/lv_misc/lv_fonts/symbol_60_file.c b/lv_misc/lv_fonts/symbol_60_file.c index fc286e964..5083bfbe1 100644 --- a/lv_misc/lv_fonts/symbol_60_file.c +++ b/lv_misc/lv_fonts/symbol_60_file.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_60_file_bitmap[] = @@ -1327,7 +1327,7 @@ static const uint8_t symbol_60_file_width[] = lv_font_t lv_font_symbol_60_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_60_file.h b/lv_misc/lv_fonts/symbol_60_file.h index eee7f82b1..b20609d6b 100644 --- a/lv_misc/lv_fonts/symbol_60_file.h +++ b/lv_misc/lv_fonts/symbol_60_file.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_60_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_60_file; #endif /*USE_LV_FONT_SYMBOL_60_FILE != 0*/ -#endif /*SYMBOL_60_FILE_H*/ \ No newline at end of file +#endif /*SYMBOL_60_FILE_H*/ diff --git a/lv_misc/lv_fonts/symbol_80_basic.c b/lv_misc/lv_fonts/symbol_80_basic.c index 8cee7466e..f84c9dfc0 100644 --- a/lv_misc/lv_fonts/symbol_80_basic.c +++ b/lv_misc/lv_fonts/symbol_80_basic.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_80_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_80_basic_bitmap[] = @@ -1171,7 +1171,7 @@ static const uint8_t symbol_80_basic_width[] = lv_font_t lv_font_symbol_80_basic = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_80_basic.h b/lv_misc/lv_fonts/symbol_80_basic.h index 32c4a8394..cdb10f605 100644 --- a/lv_misc/lv_fonts/symbol_80_basic.h +++ b/lv_misc/lv_fonts/symbol_80_basic.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_80_BASIC != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_80_basic; #endif /*USE_LV_FONT_SYMBOL_80_BASIC != 0*/ -#endif /*SYMBOL_80_BASIC_H*/ \ No newline at end of file +#endif /*SYMBOL_80_BASIC_H*/ diff --git a/lv_misc/lv_fonts/symbol_80_feedback.c b/lv_misc/lv_fonts/symbol_80_feedback.c index 82b84343e..7cf07391e 100644 --- a/lv_misc/lv_fonts/symbol_80_feedback.c +++ b/lv_misc/lv_fonts/symbol_80_feedback.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_80_feedback_bitmap[] = @@ -1253,7 +1253,7 @@ static const uint8_t symbol_80_feedback_width[] = lv_font_t lv_font_symbol_80_feedback = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_80_feedback.h b/lv_misc/lv_fonts/symbol_80_feedback.h index 0f0cff954..a4fee17df 100644 --- a/lv_misc/lv_fonts/symbol_80_feedback.h +++ b/lv_misc/lv_fonts/symbol_80_feedback.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_80_FEEDBACK != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_80_feedback; #endif /*USE_LV_FONT_SYMBOL_80_FEEDBACK != 0*/ -#endif /*SYMBOL_80_FEEDBACK_H*/ \ No newline at end of file +#endif /*SYMBOL_80_FEEDBACK_H*/ diff --git a/lv_misc/lv_fonts/symbol_80_file.c b/lv_misc/lv_fonts/symbol_80_file.c index c698689b5..ee3b1a793 100644 --- a/lv_misc/lv_fonts/symbol_80_file.c +++ b/lv_misc/lv_fonts/symbol_80_file.c @@ -1,7 +1,7 @@ #include "lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" /*Store the image of the letters (glyph) */ static const uint8_t symbol_80_file_bitmap[] = @@ -1747,7 +1747,7 @@ static const uint8_t symbol_80_file_width[] = lv_font_t lv_font_symbol_80_file = { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_80_file.h b/lv_misc/lv_fonts/symbol_80_file.h index 3a1b70a12..82f31e2e9 100644 --- a/lv_misc/lv_fonts/symbol_80_file.h +++ b/lv_misc/lv_fonts/symbol_80_file.h @@ -8,10 +8,10 @@ #if USE_LV_FONT_SYMBOL_80_FILE != 0 #include -#include "../lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_80_file; #endif /*USE_LV_FONT_SYMBOL_80_FILE != 0*/ -#endif /*SYMBOL_80_FILE_H*/ \ No newline at end of file +#endif /*SYMBOL_80_FILE_H*/ diff --git a/lv_misc/lv_fonts/symbol_def.h b/lv_misc/lv_fonts/symbol_def.h index 033bc84b3..0e00f0218 100644 --- a/lv_misc/lv_fonts/symbol_def.h +++ b/lv_misc/lv_fonts/symbol_def.h @@ -20,7 +20,7 @@ extern "C" { * - Reserved: 0xE060..0xE07F */ -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 #define SYMBOL_GLYPH_FIRST 0xC0 #define SYMBOL_GLYPH_LAST 0xFF @@ -143,7 +143,7 @@ extern "C" { #define SYMBOL_BATTERY_EMPTY "\xEE\x81\x8D" #define SYMBOL_BLUETOOTH "\xEE\x81\x8E" -#endif /*TXT_UTF8*/ +#endif /*LV_TXT_UTF8*/ #ifdef __cplusplus } /* extern "C" */ diff --git a/lv_misc/lv_templ.c b/lv_misc/lv_templ.c new file mode 100644 index 000000000..308c6d9cb --- /dev/null +++ b/lv_misc/lv_templ.c @@ -0,0 +1,36 @@ +/** + * @file lv_templ.c + * + */ + +/********************* + * INCLUDES + *********************/ + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * STATIC PROTOTYPES + **********************/ + +/********************** + * STATIC VARIABLES + **********************/ + +/********************** + * MACROS + **********************/ + +/********************** + * GLOBAL FUNCTIONS + **********************/ + +/********************** + * STATIC FUNCTIONS + **********************/ diff --git a/lv_misc/lv_templ.h b/lv_misc/lv_templ.h new file mode 100644 index 000000000..6cdcba599 --- /dev/null +++ b/lv_misc/lv_templ.h @@ -0,0 +1,38 @@ +/** + * @file lv_templ.h + * + */ + +#ifndef LV_TEMPL_H +#define LV_TEMPL_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * GLOBAL PROTOTYPES + **********************/ + +/********************** + * MACROS + **********************/ + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*LV_TEMPL_H*/ diff --git a/lv_misc/lv_txt.c b/lv_misc/lv_txt.c index 33d0aa2bd..1e6ac44bf 100644 --- a/lv_misc/lv_txt.c +++ b/lv_misc/lv_txt.c @@ -259,7 +259,7 @@ void lv_txt_ins(char * txt_buf, uint32_t pos, const char * ins_txt) uint32_t old_len = strlen(txt_buf); uint32_t ins_len = strlen(ins_txt); uint32_t new_len = ins_len + old_len; -#if TXT_UTF8 != 0 +#if LV_TXT_UTF8 != 0 pos = txt_utf8_get_byte_id(txt_buf, pos); /*Convert to byte index instead of letter index*/ #endif /*Copy the second part into the end to make place to text to insert*/ @@ -282,7 +282,7 @@ void lv_txt_cut(char * txt, uint32_t pos, uint32_t len) { uint32_t old_len = strlen(txt); -#if TXT_UTF8 != 0 +#if LV_TXT_UTF8 != 0 pos = txt_utf8_get_byte_id(txt, pos); /*Convert to byte index instead of letter index*/ len = txt_utf8_get_byte_id(&txt[pos], len); #endif @@ -351,7 +351,7 @@ uint32_t txt_unicode_to_utf8(uint32_t letter_uni) */ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 if(i == NULL) return txt[1]; /*Get the next char */ uint8_t letter = txt[*i] ; @@ -431,7 +431,7 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i) */ uint32_t lv_txt_utf8_prev(const char * txt, uint32_t * i) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 if(i == NULL) return *(txt- 1); /*Get the prev. char */ (*i)--; @@ -471,7 +471,7 @@ uint32_t lv_txt_utf8_prev(const char * txt, uint32_t * i) */ uint32_t txt_utf8_get_byte_id(const char * txt, uint32_t utf8_id) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 return utf8_id; /*In Non UTF-8 no difference*/ #else uint32_t i; @@ -494,7 +494,7 @@ uint32_t txt_utf8_get_byte_id(const char * txt, uint32_t utf8_id) */ uint32_t lv_txt_utf8_get_char_id(const char * txt, uint32_t byte_id) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 return byte_id; /*In Non UTF-8 no difference*/ #else uint32_t i = 0; @@ -518,7 +518,7 @@ uint32_t lv_txt_utf8_get_char_id(const char * txt, uint32_t byte_id) */ uint32_t lv_txt_get_length(const char * txt) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 return strlen(txt); #else uint32_t len = 0; diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c index 378a17e31..1c2e218bb 100644 --- a/lv_objx/lv_label.c +++ b/lv_objx/lv_label.c @@ -569,7 +569,7 @@ void lv_label_ins_text(lv_obj_t * label, uint32_t pos, const char * txt) ext->text = lv_mem_realloc(ext->text, new_len + 1); if(pos == LV_LABEL_POS_LAST) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 pos = old_len; #else pos = lv_txt_get_length(ext->text); @@ -812,7 +812,7 @@ static void lv_label_refr_text(lv_obj_t * label) uint32_t letter_id = lv_label_get_letter_on(label, &p); -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 /*Save letters under the dots and replace them with dots*/ uint8_t i; for(i = 0; i < LV_LABEL_DOT_NUM; i++) { @@ -862,7 +862,7 @@ static void lv_label_revert_dots(lv_obj_t *label) lv_label_ext_t * ext = lv_obj_get_ext_attr(label); if(ext->long_mode != LV_LABEL_LONG_DOT) return; if(ext->dot_end == LV_LABEL_DOT_END_INV) return; -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 uint32_t i; for(i = 0; i <= LV_LABEL_DOT_NUM; i++) { ext->text[ext->dot_end - i] = ext->dot_tmp[LV_LABEL_DOT_NUM - i]; diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h index af2583d66..5c43d9d4e 100644 --- a/lv_objx/lv_label.h +++ b/lv_objx/lv_label.h @@ -54,7 +54,7 @@ typedef struct /*New data for this type */ char * text; /*Text of the label*/ lv_label_long_mode_t long_mode; /*Determinate what to do with the long texts*/ -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 char dot_tmp[LV_LABEL_DOT_NUM + 1]; /*Store the character which are replaced by dots (Handled by the library)*/ #else char dot_tmp[LV_LABEL_DOT_NUM * 4 + 1]; /*Store the character which are replaced by dots (Handled by the library)*/ diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index d282e26ec..057ecf894 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -267,7 +267,7 @@ void lv_ta_del_char(lv_obj_t * ta) } if(ext->pwd_mode != 0) { -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 lv_txt_cut(ext->pwd_tmp, ext->cursor.pos - 1, 1); #else uint32_t byte_pos = txt_utf8_get_byte_id(ext->pwd_tmp, ext->cursor.pos - 1); @@ -773,7 +773,7 @@ static bool lv_ta_scrollable_design(lv_obj_t * scrl, const lv_area_t * mask, lv_ uint16_t cur_pos = lv_ta_get_cursor_pos(ta); const char * txt = lv_label_get_text(ta_ext->label); uint32_t byte_pos; -#if TXT_UTF8 != 0 +#if LV_TXT_UTF8 != 0 byte_pos = txt_utf8_get_byte_id(txt, cur_pos); #else byte_pos = cur_pos; @@ -826,7 +826,7 @@ static bool lv_ta_scrollable_design(lv_obj_t * scrl, const lv_area_t * mask, lv_ lv_draw_rect(&cur_area, mask, &cur_style); /*Get the current letter*/ -#if TXT_UTF8 == 0 +#if LV_TXT_UTF8 == 0 char letter_buf[2]; letter_buf[0] = txt[byte_pos]; letter_buf[1] = '\0'; @@ -919,7 +919,7 @@ static lv_res_t lv_ta_signal(lv_obj_t * ta, lv_signal_t sign, void * param) else if(c == LV_GROUP_KEY_UP) lv_ta_cursor_up(ta); else if(c == LV_GROUP_KEY_DOWN) lv_ta_cursor_down(ta); else { -#if TXT_UTF8 != 0 +#if LV_TXT_UTF8 != 0 /*Swap the bytes (UTF-8 is big endian, but the MCUs are little endian)*/ if((c & 0x80) == 0) { /*ASCII*/ lv_ta_add_char(ta, (char)c);