From c890dc8d430a131957e4d1b96e552e6d8907c294 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 26 Nov 2017 23:57:39 +0100 Subject: [PATCH] use only relative include paths --- lv_draw/lv_draw.c | 2 +- lv_draw/lv_draw_rbasic.c | 2 +- lv_draw/lv_draw_vbasic.c | 2 +- lv_draw/lv_draw_vbasic.h | 2 +- lv_misc/lv_anim.c | 3 ++- lv_misc/lv_color.h | 6 +++--- lv_misc/lv_font.c | 2 +- lv_misc/lv_font.h | 6 +++--- 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 | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_10_latin_ext_b.h | 2 +- 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 | 2 +- lv_misc/lv_fonts/dejavu_20_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_20_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_20_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_20_sup.c | 2 +- lv_misc/lv_fonts/dejavu_20_sup.h | 2 +- lv_misc/lv_fonts/dejavu_30.c | 2 +- lv_misc/lv_fonts/dejavu_30.h | 2 +- lv_misc/lv_fonts/dejavu_30_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_30_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_30_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_30_sup.c | 2 +- lv_misc/lv_fonts/dejavu_30_sup.h | 2 +- lv_misc/lv_fonts/dejavu_40.c | 2 +- lv_misc/lv_fonts/dejavu_40.h | 2 +- lv_misc/lv_fonts/dejavu_40_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_40_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_40_sup.c | 2 +- lv_misc/lv_fonts/dejavu_40_sup.h | 2 +- lv_misc/lv_fonts/dejavu_60.c | 2 +- lv_misc/lv_fonts/dejavu_60.h | 2 +- lv_misc/lv_fonts/dejavu_60_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_60_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_60_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_60_sup.c | 2 +- lv_misc/lv_fonts/dejavu_60_sup.h | 2 +- lv_misc/lv_fonts/dejavu_80.c | 2 +- lv_misc/lv_fonts/dejavu_80.h | 2 +- lv_misc/lv_fonts/dejavu_80_cyrillic.c | 2 +- lv_misc/lv_fonts/dejavu_80_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_a.c | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_b.c | 2 +- lv_misc/lv_fonts/dejavu_80_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_80_sup.c | 2 +- lv_misc/lv_fonts/dejavu_80_sup.h | 2 +- lv_misc/lv_fonts/symbol_10_basic.c | 2 +- lv_misc/lv_fonts/symbol_10_basic.h | 2 +- lv_misc/lv_fonts/symbol_10_feedback.c | 2 +- lv_misc/lv_fonts/symbol_10_feedback.h | 2 +- lv_misc/lv_fonts/symbol_10_file.c | 2 +- lv_misc/lv_fonts/symbol_10_file.h | 2 +- lv_misc/lv_fonts/symbol_20_basic.c | 2 +- lv_misc/lv_fonts/symbol_20_basic.h | 2 +- lv_misc/lv_fonts/symbol_20_feedback.c | 2 +- lv_misc/lv_fonts/symbol_20_feedback.h | 2 +- lv_misc/lv_fonts/symbol_20_file.c | 2 +- lv_misc/lv_fonts/symbol_20_file.h | 2 +- lv_misc/lv_fonts/symbol_30_basic.c | 2 +- lv_misc/lv_fonts/symbol_30_basic.h | 2 +- lv_misc/lv_fonts/symbol_30_feedback.c | 2 +- lv_misc/lv_fonts/symbol_30_feedback.h | 2 +- lv_misc/lv_fonts/symbol_30_file.c | 2 +- lv_misc/lv_fonts/symbol_30_file.h | 2 +- lv_misc/lv_fonts/symbol_40_basic.c | 2 +- lv_misc/lv_fonts/symbol_40_basic.h | 2 +- lv_misc/lv_fonts/symbol_40_feedback.c | 2 +- lv_misc/lv_fonts/symbol_40_feedback.h | 2 +- lv_misc/lv_fonts/symbol_40_file.c | 2 +- lv_misc/lv_fonts/symbol_40_file.h | 2 +- lv_misc/lv_fonts/symbol_60_basic.c | 2 +- lv_misc/lv_fonts/symbol_60_basic.h | 2 +- lv_misc/lv_fonts/symbol_60_feedback.c | 2 +- lv_misc/lv_fonts/symbol_60_feedback.h | 2 +- lv_misc/lv_fonts/symbol_60_file.c | 2 +- lv_misc/lv_fonts/symbol_60_file.h | 2 +- lv_misc/lv_fonts/symbol_80_basic.c | 2 +- lv_misc/lv_fonts/symbol_80_basic.h | 2 +- lv_misc/lv_fonts/symbol_80_feedback.c | 2 +- lv_misc/lv_fonts/symbol_80_feedback.h | 2 +- lv_misc/lv_fonts/symbol_80_file.c | 2 +- lv_misc/lv_fonts/symbol_80_file.h | 2 +- lv_misc/lv_fonts/symbol_def.h | 2 +- lv_misc/lv_mem.c | 2 +- lv_misc/lv_mem.h | 2 -- lv_misc/lv_task.h | 1 - lv_misc/lv_txt.c | 19 ++++++++++--------- lv_misc/lv_txt.h | 4 ++-- lv_misc/lv_ufs.c | 2 +- lv_misc/lv_ufs.h | 1 - lv_obj/lv_group.h | 2 +- lv_obj/lv_indev.c | 4 ++-- lv_obj/lv_obj.c | 2 -- lv_obj/lv_obj.h | 4 ++-- lv_obj/lv_refr.c | 4 ++-- lv_obj/lv_style.c | 2 +- lv_obj/lv_vdb.c | 2 +- lv_obj/lv_vdb.h | 2 +- lv_objx/lv_bar.c | 2 +- lv_objx/lv_bar.h | 2 +- lv_objx/lv_btn.c | 2 +- lv_objx/lv_btn.h | 4 ++-- lv_objx/lv_btnm.c | 4 ++-- lv_objx/lv_btnm.h | 2 +- lv_objx/lv_cb.c | 2 +- lv_objx/lv_cb.h | 2 +- lv_objx/lv_chart.c | 2 +- lv_objx/lv_chart.h | 2 +- lv_objx/lv_cont.c | 2 +- lv_objx/lv_cont.h | 2 +- lv_objx/lv_ddlist.c | 2 +- lv_objx/lv_ddlist.h | 2 +- lv_objx/lv_gauge.c | 2 +- lv_objx/lv_gauge.h | 2 +- lv_objx/lv_img.c | 2 +- lv_objx/lv_img.h | 2 +- lv_objx/lv_kb.c | 2 +- lv_objx/lv_kb.h | 2 +- lv_objx/lv_label.c | 5 +---- lv_objx/lv_label.h | 4 ++-- lv_objx/lv_led.c | 2 +- lv_objx/lv_led.h | 2 +- lv_objx/lv_line.c | 2 +- lv_objx/lv_line.h | 2 +- lv_objx/lv_list.c | 6 +++--- lv_objx/lv_list.h | 2 +- lv_objx/lv_lmeter.c | 2 +- lv_objx/lv_lmeter.h | 2 +- lv_objx/lv_mbox.c | 2 +- lv_objx/lv_mbox.h | 2 +- lv_objx/lv_objx_templ.c | 2 +- lv_objx/lv_objx_templ.h | 2 +- lv_objx/lv_page.c | 2 +- lv_objx/lv_page.h | 2 +- lv_objx/lv_roller.c | 2 +- lv_objx/lv_roller.h | 2 +- lv_objx/lv_slider.c | 2 +- lv_objx/lv_slider.h | 2 +- lv_objx/lv_sw.c | 2 +- lv_objx/lv_sw.h | 2 +- lv_objx/lv_ta.c | 4 ++-- lv_objx/lv_ta.h | 2 +- lv_objx/lv_tabview.c | 2 +- lv_objx/lv_tabview.h | 4 ++-- lv_objx/lv_win.c | 2 +- lv_objx/lv_win.h | 2 +- lv_themes/lv_theme.c | 1 - lv_themes/lv_theme.h | 4 ++-- lv_themes/lv_theme_alien.c | 3 --- lv_themes/lv_theme_alien.h | 2 +- lv_themes/lv_theme_default.c | 3 --- lv_themes/lv_theme_default.h | 2 +- lv_themes/lv_theme_night.c | 3 --- lv_themes/lv_theme_night.h | 2 +- lv_themes/lv_theme_templ.c | 2 -- lv_themes/lv_theme_templ.h | 2 +- lvgl.h | 8 -------- 179 files changed, 195 insertions(+), 222 deletions(-) diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index 6c9132cc1..3db2c601d 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c index 4ef0a8da8..5b30f9eda 100644 --- a/lv_draw/lv_draw_rbasic.c +++ b/lv_draw/lv_draw_rbasic.c @@ -8,7 +8,7 @@ *********************/ #include "../lv_hal/lv_hal_disp.h" #include "lv_draw_rbasic.h" -#include "lv_conf.h" +#include "../../lv_conf.h" #include "../lv_misc/lv_font.h" /********************* diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index 42bf4cb2b..79c86eabc 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -3,7 +3,7 @@ * */ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h index 8221ee5a8..3cf48b897 100644 --- a/lv_draw/lv_draw_vbasic.h +++ b/lv_draw/lv_draw_vbasic.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if LV_VDB_SIZE != 0 diff --git a/lv_misc/lv_anim.c b/lv_misc/lv_anim.c index 0cdc70f9f..09b3bf68b 100644 --- a/lv_misc/lv_anim.c +++ b/lv_misc/lv_anim.c @@ -6,9 +6,10 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include +#include "../lv_hal/lv_hal_tick.h" #include "lv_task.h" #include "lv_anim.h" #include "lv_math.h" diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h index ce5f5715d..a995e3bfd 100644 --- a/lv_misc/lv_color.h +++ b/lv_misc/lv_color.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include @@ -304,8 +304,8 @@ lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r, uint8_t g, uint8_t b); * MACROS **********************/ -#endif /*USE_COLOR*/ - #ifdef __cplusplus } /* extern "C" */ #endif + +#endif /*USE_COLOR*/ diff --git a/lv_misc/lv_font.c b/lv_misc/lv_font.c index 0053a8f56..40ae9553e 100644 --- a/lv_misc/lv_font.c +++ b/lv_misc/lv_font.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include "lv_font.h" diff --git a/lv_misc/lv_font.h b/lv_misc/lv_font.h index f486e69fa..364dcee2f 100644 --- a/lv_misc/lv_font.h +++ b/lv_misc/lv_font.h @@ -14,7 +14,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include @@ -167,9 +167,9 @@ static inline uint8_t lv_font_get_width_scale(const lv_font_t * font_p, uint32_t #include "lv_fonts/symbol_80_file.h" #include "lv_fonts/symbol_80_feedback.h" -#endif /*USE_FONT*/ - #ifdef __cplusplus } /* extern "C" */ #endif +#endif /*USE_FONT*/ + diff --git a/lv_misc/lv_fonts/dejavu_10.c b/lv_misc/lv_fonts/dejavu_10.c index 3fbff7196..c1b07268e 100644 --- a/lv_misc/lv_fonts/dejavu_10.c +++ b/lv_misc/lv_fonts/dejavu_10.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_10.h b/lv_misc/lv_fonts/dejavu_10.h index 5696bf1ee..4cc8a18aa 100644 --- a/lv_misc/lv_fonts/dejavu_10.h +++ b/lv_misc/lv_fonts/dejavu_10.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10 != 0 diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.c b/lv_misc/lv_fonts/dejavu_10_cyrillic.c index 568367d15..26f0217ea 100644 --- a/lv_misc/lv_fonts/dejavu_10_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.h b/lv_misc/lv_fonts/dejavu_10_cyrillic.h index ee1a2827d..489c6b18d 100644 --- a/lv_misc/lv_fonts/dejavu_10_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 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 f114ce917..5d4b75fe1 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0 #include #include "../lv_font.h" 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 d997a40e7..2f3639605 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0 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 973c9dcac..34f50d4bd 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0 #include #include "../lv_font.h" 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 17930918d..3d219b08c 100644 --- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_10_sup.c b/lv_misc/lv_fonts/dejavu_10_sup.c index 3c537e9f3..5d51c74bd 100644 --- a/lv_misc/lv_fonts/dejavu_10_sup.c +++ b/lv_misc/lv_fonts/dejavu_10_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_10_sup.h b/lv_misc/lv_fonts/dejavu_10_sup.h index 8de386473..cb5e538ab 100644 --- a/lv_misc/lv_fonts/dejavu_10_sup.h +++ b/lv_misc/lv_fonts/dejavu_10_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_10_SUP != 0 diff --git a/lv_misc/lv_fonts/dejavu_20.c b/lv_misc/lv_fonts/dejavu_20.c index f23a95a60..934688c17 100644 --- a/lv_misc/lv_fonts/dejavu_20.c +++ b/lv_misc/lv_fonts/dejavu_20.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_20.h b/lv_misc/lv_fonts/dejavu_20.h index 6f68e17d6..b6dfb467a 100644 --- a/lv_misc/lv_fonts/dejavu_20.h +++ b/lv_misc/lv_fonts/dejavu_20.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20 != 0 diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.c b/lv_misc/lv_fonts/dejavu_20_cyrillic.c index ec2c7e1b7..6480e87e9 100644 --- a/lv_misc/lv_fonts/dejavu_20_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.h b/lv_misc/lv_fonts/dejavu_20_cyrillic.h index 057f7d054..5489f58f0 100644 --- a/lv_misc/lv_fonts/dejavu_20_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 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 30a7958fa..02f651b8b 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0 #include #include "../lv_font.h" 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 bf96f0232..812e2e2c8 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0 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 23eafde56..45f8993ff 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0 #include #include "../lv_font.h" 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 ad81da1e5..c13280c1d 100644 --- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_20_sup.c b/lv_misc/lv_fonts/dejavu_20_sup.c index 64321cce9..92dde9251 100644 --- a/lv_misc/lv_fonts/dejavu_20_sup.c +++ b/lv_misc/lv_fonts/dejavu_20_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_20_sup.h b/lv_misc/lv_fonts/dejavu_20_sup.h index 045585a92..4471bb7f0 100644 --- a/lv_misc/lv_fonts/dejavu_20_sup.h +++ b/lv_misc/lv_fonts/dejavu_20_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_20_SUP != 0 diff --git a/lv_misc/lv_fonts/dejavu_30.c b/lv_misc/lv_fonts/dejavu_30.c index db9be67f7..581d3524b 100644 --- a/lv_misc/lv_fonts/dejavu_30.c +++ b/lv_misc/lv_fonts/dejavu_30.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_30.h b/lv_misc/lv_fonts/dejavu_30.h index 4e1c23faa..cc224f831 100644 --- a/lv_misc/lv_fonts/dejavu_30.h +++ b/lv_misc/lv_fonts/dejavu_30.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30 != 0 diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.c b/lv_misc/lv_fonts/dejavu_30_cyrillic.c index 2adb2217b..f4b7b262c 100644 --- a/lv_misc/lv_fonts/dejavu_30_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.h b/lv_misc/lv_fonts/dejavu_30_cyrillic.h index 846e9f777..3c49736c1 100644 --- a/lv_misc/lv_fonts/dejavu_30_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 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 24cafcd05..57eeadb27 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0 #include #include "../lv_font.h" 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 72b876ad1..2142855c0 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0 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 827f366a4..8dfd922ab 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0 #include #include "../lv_font.h" 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 502bd0438..13ccdd82c 100644 --- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_30_sup.c b/lv_misc/lv_fonts/dejavu_30_sup.c index cfa363b56..e8d9184e5 100644 --- a/lv_misc/lv_fonts/dejavu_30_sup.c +++ b/lv_misc/lv_fonts/dejavu_30_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_30_sup.h b/lv_misc/lv_fonts/dejavu_30_sup.h index 3567bceeb..76493dd4f 100644 --- a/lv_misc/lv_fonts/dejavu_30_sup.h +++ b/lv_misc/lv_fonts/dejavu_30_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_30_SUP != 0 diff --git a/lv_misc/lv_fonts/dejavu_40.c b/lv_misc/lv_fonts/dejavu_40.c index 563fb7ca8..45249c69a 100644 --- a/lv_misc/lv_fonts/dejavu_40.c +++ b/lv_misc/lv_fonts/dejavu_40.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_40.h b/lv_misc/lv_fonts/dejavu_40.h index 9d6c2375b..f76a93d6b 100644 --- a/lv_misc/lv_fonts/dejavu_40.h +++ b/lv_misc/lv_fonts/dejavu_40.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40 != 0 diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.c b/lv_misc/lv_fonts/dejavu_40_cyrillic.c index 5e143e3f3..a82b77b73 100644 --- a/lv_misc/lv_fonts/dejavu_40_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.h b/lv_misc/lv_fonts/dejavu_40_cyrillic.h index 5d4a57851..aa61aac66 100644 --- a/lv_misc/lv_fonts/dejavu_40_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0 diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c index 21cad0b71..3b528e6ab 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h index ea4d81174..e8f42b5b7 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0 diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c index a3734f6d9..43f5da94f 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h index 758cfb55f..c436781dd 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_40_sup.c b/lv_misc/lv_fonts/dejavu_40_sup.c index 0e59b297a..43539ee02 100644 --- a/lv_misc/lv_fonts/dejavu_40_sup.c +++ b/lv_misc/lv_fonts/dejavu_40_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_40_sup.h b/lv_misc/lv_fonts/dejavu_40_sup.h index f2d676402..bddadad51 100644 --- a/lv_misc/lv_fonts/dejavu_40_sup.h +++ b/lv_misc/lv_fonts/dejavu_40_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_40_SUP != 0 diff --git a/lv_misc/lv_fonts/dejavu_60.c b/lv_misc/lv_fonts/dejavu_60.c index 1ee45d8df..360e30ac5 100644 --- a/lv_misc/lv_fonts/dejavu_60.c +++ b/lv_misc/lv_fonts/dejavu_60.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_60.h b/lv_misc/lv_fonts/dejavu_60.h index 3e28fadcb..8b986634e 100644 --- a/lv_misc/lv_fonts/dejavu_60.h +++ b/lv_misc/lv_fonts/dejavu_60.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60 != 0 diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.c b/lv_misc/lv_fonts/dejavu_60_cyrillic.c index 8b7ca1f52..d4fa6f074 100644 --- a/lv_misc/lv_fonts/dejavu_60_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.h b/lv_misc/lv_fonts/dejavu_60_cyrillic.h index 16318aa5a..abea65155 100644 --- a/lv_misc/lv_fonts/dejavu_60_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_CYRILLIC != 0 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 395771793..336714f1f 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0 #include #include "../lv_font.h" 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 0408908d7..29ebca7bd 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0 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 f4379c27f..eb8379e4f 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0 #include #include "../lv_font.h" 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 dea1b62ce..08acbad90 100644 --- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_60_sup.c b/lv_misc/lv_fonts/dejavu_60_sup.c index 13026ccf2..d5dd35b56 100644 --- a/lv_misc/lv_fonts/dejavu_60_sup.c +++ b/lv_misc/lv_fonts/dejavu_60_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_60_sup.h b/lv_misc/lv_fonts/dejavu_60_sup.h index 12927eec3..d631a7ed7 100644 --- a/lv_misc/lv_fonts/dejavu_60_sup.h +++ b/lv_misc/lv_fonts/dejavu_60_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_60_SUP != 0 diff --git a/lv_misc/lv_fonts/dejavu_80.c b/lv_misc/lv_fonts/dejavu_80.c index f04add16f..a73ad0323 100644 --- a/lv_misc/lv_fonts/dejavu_80.c +++ b/lv_misc/lv_fonts/dejavu_80.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80 != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_80.h b/lv_misc/lv_fonts/dejavu_80.h index 8bf97df2b..e8d805ef2 100644 --- a/lv_misc/lv_fonts/dejavu_80.h +++ b/lv_misc/lv_fonts/dejavu_80.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80 != 0 diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.c b/lv_misc/lv_fonts/dejavu_80_cyrillic.c index 434b552c1..9b7e6e97d 100644 --- a/lv_misc/lv_fonts/dejavu_80_cyrillic.c +++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_CYRILLIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.h b/lv_misc/lv_fonts/dejavu_80_cyrillic.h index c6c78373d..ddd7d8512 100644 --- a/lv_misc/lv_fonts/dejavu_80_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_CYRILLIC != 0 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 1f763f498..2c49aa162 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0 #include #include "../lv_font.h" 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 c17d55e05..889cb90b6 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0 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 9d65347ca..1f4eec2ed 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0 #include #include "../lv_font.h" 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 e0f78342e..6dd3bf998 100644 --- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0 diff --git a/lv_misc/lv_fonts/dejavu_80_sup.c b/lv_misc/lv_fonts/dejavu_80_sup.c index a09a933cf..30b1e3485 100644 --- a/lv_misc/lv_fonts/dejavu_80_sup.c +++ b/lv_misc/lv_fonts/dejavu_80_sup.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_SUP != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/dejavu_80_sup.h b/lv_misc/lv_fonts/dejavu_80_sup.h index 607cfb0e5..d440d204e 100644 --- a/lv_misc/lv_fonts/dejavu_80_sup.h +++ b/lv_misc/lv_fonts/dejavu_80_sup.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_DEJAVU_80_SUP != 0 diff --git a/lv_misc/lv_fonts/symbol_10_basic.c b/lv_misc/lv_fonts/symbol_10_basic.c index 808f8c68c..9b4029881 100644 --- a/lv_misc/lv_fonts/symbol_10_basic.c +++ b/lv_misc/lv_fonts/symbol_10_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_BASIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_10_basic.h b/lv_misc/lv_fonts/symbol_10_basic.h index 2cf22703f..96356c8c4 100644 --- a/lv_misc/lv_fonts/symbol_10_basic.h +++ b/lv_misc/lv_fonts/symbol_10_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_10_feedback.c b/lv_misc/lv_fonts/symbol_10_feedback.c index 07a24cca6..231274d22 100644 --- a/lv_misc/lv_fonts/symbol_10_feedback.c +++ b/lv_misc/lv_fonts/symbol_10_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_10_feedback.h b/lv_misc/lv_fonts/symbol_10_feedback.h index 7dee09c2a..6154f70f6 100644 --- a/lv_misc/lv_fonts/symbol_10_feedback.h +++ b/lv_misc/lv_fonts/symbol_10_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_10_file.c b/lv_misc/lv_fonts/symbol_10_file.c index 73bca34fd..9bed79d47 100644 --- a/lv_misc/lv_fonts/symbol_10_file.c +++ b/lv_misc/lv_fonts/symbol_10_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_10_file.h b/lv_misc/lv_fonts/symbol_10_file.h index aa695551e..42237ef83 100644 --- a/lv_misc/lv_fonts/symbol_10_file.h +++ b/lv_misc/lv_fonts/symbol_10_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_10_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_20_basic.c b/lv_misc/lv_fonts/symbol_20_basic.c index dd5c1c38f..27b371d37 100644 --- a/lv_misc/lv_fonts/symbol_20_basic.c +++ b/lv_misc/lv_fonts/symbol_20_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_BASIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_20_basic.h b/lv_misc/lv_fonts/symbol_20_basic.h index 66ff0d1d0..b97eb3ab5 100644 --- a/lv_misc/lv_fonts/symbol_20_basic.h +++ b/lv_misc/lv_fonts/symbol_20_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_20_feedback.c b/lv_misc/lv_fonts/symbol_20_feedback.c index fbebc0ebc..3f46e4d5e 100644 --- a/lv_misc/lv_fonts/symbol_20_feedback.c +++ b/lv_misc/lv_fonts/symbol_20_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_20_feedback.h b/lv_misc/lv_fonts/symbol_20_feedback.h index 7ce726921..5475dab60 100644 --- a/lv_misc/lv_fonts/symbol_20_feedback.h +++ b/lv_misc/lv_fonts/symbol_20_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_20_file.c b/lv_misc/lv_fonts/symbol_20_file.c index f97fa55d3..d01a65403 100644 --- a/lv_misc/lv_fonts/symbol_20_file.c +++ b/lv_misc/lv_fonts/symbol_20_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_20_file.h b/lv_misc/lv_fonts/symbol_20_file.h index 5ab4ff1ca..190ceb45c 100644 --- a/lv_misc/lv_fonts/symbol_20_file.h +++ b/lv_misc/lv_fonts/symbol_20_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_20_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_30_basic.c b/lv_misc/lv_fonts/symbol_30_basic.c index f77dd8629..d97a47deb 100644 --- a/lv_misc/lv_fonts/symbol_30_basic.c +++ b/lv_misc/lv_fonts/symbol_30_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_BASIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_30_basic.h b/lv_misc/lv_fonts/symbol_30_basic.h index d66927b90..38d4af320 100644 --- a/lv_misc/lv_fonts/symbol_30_basic.h +++ b/lv_misc/lv_fonts/symbol_30_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_30_feedback.c b/lv_misc/lv_fonts/symbol_30_feedback.c index 0efa7169c..b0aa040b9 100644 --- a/lv_misc/lv_fonts/symbol_30_feedback.c +++ b/lv_misc/lv_fonts/symbol_30_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_30_feedback.h b/lv_misc/lv_fonts/symbol_30_feedback.h index d5374962b..8ad3999a9 100644 --- a/lv_misc/lv_fonts/symbol_30_feedback.h +++ b/lv_misc/lv_fonts/symbol_30_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_30_file.c b/lv_misc/lv_fonts/symbol_30_file.c index c4d7d331b..5569958fb 100644 --- a/lv_misc/lv_fonts/symbol_30_file.c +++ b/lv_misc/lv_fonts/symbol_30_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_30_file.h b/lv_misc/lv_fonts/symbol_30_file.h index de1c0a92f..42755817c 100644 --- a/lv_misc/lv_fonts/symbol_30_file.h +++ b/lv_misc/lv_fonts/symbol_30_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_30_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_40_basic.c b/lv_misc/lv_fonts/symbol_40_basic.c index 61bf5cec3..6355e9127 100644 --- a/lv_misc/lv_fonts/symbol_40_basic.c +++ b/lv_misc/lv_fonts/symbol_40_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_BASIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_40_basic.h b/lv_misc/lv_fonts/symbol_40_basic.h index 4a9f2fb2f..733a1fc93 100644 --- a/lv_misc/lv_fonts/symbol_40_basic.h +++ b/lv_misc/lv_fonts/symbol_40_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_40_feedback.c b/lv_misc/lv_fonts/symbol_40_feedback.c index d615a1888..ce546f8e0 100644 --- a/lv_misc/lv_fonts/symbol_40_feedback.c +++ b/lv_misc/lv_fonts/symbol_40_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_40_feedback.h b/lv_misc/lv_fonts/symbol_40_feedback.h index a41684267..40d887bda 100644 --- a/lv_misc/lv_fonts/symbol_40_feedback.h +++ b/lv_misc/lv_fonts/symbol_40_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_40_file.c b/lv_misc/lv_fonts/symbol_40_file.c index 23acefd7a..d80aaca0a 100644 --- a/lv_misc/lv_fonts/symbol_40_file.c +++ b/lv_misc/lv_fonts/symbol_40_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_40_file.h b/lv_misc/lv_fonts/symbol_40_file.h index 36f6d130c..438365725 100644 --- a/lv_misc/lv_fonts/symbol_40_file.h +++ b/lv_misc/lv_fonts/symbol_40_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_40_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_60_basic.c b/lv_misc/lv_fonts/symbol_60_basic.c index 98bdbba2d..93d38544e 100644 --- a/lv_misc/lv_fonts/symbol_60_basic.c +++ b/lv_misc/lv_fonts/symbol_60_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_BASIC != 0 #include diff --git a/lv_misc/lv_fonts/symbol_60_basic.h b/lv_misc/lv_fonts/symbol_60_basic.h index 0cd155742..3354c560e 100644 --- a/lv_misc/lv_fonts/symbol_60_basic.h +++ b/lv_misc/lv_fonts/symbol_60_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_60_feedback.c b/lv_misc/lv_fonts/symbol_60_feedback.c index b40261c32..698417056 100644 --- a/lv_misc/lv_fonts/symbol_60_feedback.c +++ b/lv_misc/lv_fonts/symbol_60_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_60_feedback.h b/lv_misc/lv_fonts/symbol_60_feedback.h index 3c8c8ea0f..351238fc9 100644 --- a/lv_misc/lv_fonts/symbol_60_feedback.h +++ b/lv_misc/lv_fonts/symbol_60_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_60_file.c b/lv_misc/lv_fonts/symbol_60_file.c index 5083bfbe1..144b13b16 100644 --- a/lv_misc/lv_fonts/symbol_60_file.c +++ b/lv_misc/lv_fonts/symbol_60_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_60_file.h b/lv_misc/lv_fonts/symbol_60_file.h index b20609d6b..cbf5ed236 100644 --- a/lv_misc/lv_fonts/symbol_60_file.h +++ b/lv_misc/lv_fonts/symbol_60_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_60_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_80_basic.c b/lv_misc/lv_fonts/symbol_80_basic.c index f84c9dfc0..6da363e94 100644 --- a/lv_misc/lv_fonts/symbol_80_basic.c +++ b/lv_misc/lv_fonts/symbol_80_basic.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_BASIC != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_80_basic.h b/lv_misc/lv_fonts/symbol_80_basic.h index cdb10f605..b34076ac0 100644 --- a/lv_misc/lv_fonts/symbol_80_basic.h +++ b/lv_misc/lv_fonts/symbol_80_basic.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_BASIC != 0 diff --git a/lv_misc/lv_fonts/symbol_80_feedback.c b/lv_misc/lv_fonts/symbol_80_feedback.c index 7cf07391e..2ad69fc90 100644 --- a/lv_misc/lv_fonts/symbol_80_feedback.c +++ b/lv_misc/lv_fonts/symbol_80_feedback.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FEEDBACK != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_80_feedback.h b/lv_misc/lv_fonts/symbol_80_feedback.h index a4fee17df..6ae91fda3 100644 --- a/lv_misc/lv_fonts/symbol_80_feedback.h +++ b/lv_misc/lv_fonts/symbol_80_feedback.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FEEDBACK != 0 diff --git a/lv_misc/lv_fonts/symbol_80_file.c b/lv_misc/lv_fonts/symbol_80_file.c index ee3b1a793..88619c0dd 100644 --- a/lv_misc/lv_fonts/symbol_80_file.c +++ b/lv_misc/lv_fonts/symbol_80_file.c @@ -1,4 +1,4 @@ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FILE != 0 #include #include "../lv_font.h" diff --git a/lv_misc/lv_fonts/symbol_80_file.h b/lv_misc/lv_fonts/symbol_80_file.h index 82f31e2e9..63f8df8c8 100644 --- a/lv_misc/lv_fonts/symbol_80_file.h +++ b/lv_misc/lv_fonts/symbol_80_file.h @@ -3,7 +3,7 @@ /*Use UTF-8 encoding in the IDE*/ -#include "lv_conf.h" +#include "../../../lv_conf.h" #if USE_LV_FONT_SYMBOL_80_FILE != 0 diff --git a/lv_misc/lv_fonts/symbol_def.h b/lv_misc/lv_fonts/symbol_def.h index 0e00f0218..9f98ff152 100644 --- a/lv_misc/lv_fonts/symbol_def.h +++ b/lv_misc/lv_fonts/symbol_def.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include "lv_conf.h" +#include "../../../lv_conf.h" /* * With no UTF-8 support (192-255) diff --git a/lv_misc/lv_mem.c b/lv_misc/lv_mem.c index 161290fee..9c7dedc22 100644 --- a/lv_misc/lv_mem.c +++ b/lv_misc/lv_mem.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include "lv_mem.h" #include "lv_math.h" #include diff --git a/lv_misc/lv_mem.h b/lv_misc/lv_mem.h index 6c16e8d6a..333a43813 100644 --- a/lv_misc/lv_mem.h +++ b/lv_misc/lv_mem.h @@ -102,8 +102,6 @@ static inline void lv_mem_assert(void *p) * MACROS **********************/ - - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h index 4f5a259d7..a231d9e98 100644 --- a/lv_misc/lv_task.h +++ b/lv_misc/lv_task.h @@ -131,5 +131,4 @@ void lv_task_enable(bool en); } /* extern "C" */ #endif - #endif diff --git a/lv_misc/lv_txt.c b/lv_misc/lv_txt.c index 1e6ac44bf..7b65e9fb1 100644 --- a/lv_misc/lv_txt.c +++ b/lv_misc/lv_txt.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_txt.h" -#include "lv_conf.h" +#include "../../lv_conf.h" #include "lv_math.h" /********************* @@ -338,7 +338,8 @@ uint32_t txt_unicode_to_utf8(uint32_t letter_uni) bytes[3] = ((letter_uni>>0) & 0x3F) | 0x80; } - return *((uint32_t *) bytes); + uint32_t *res_p = (uint32_t *)bytes; + return *res_p; } /** @@ -380,7 +381,7 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i) else { /*2 bytes UTF-8 code*/ if((txt[*i] & 0b11100000) == 0b11000000) { - result = (txt[*i] & 0b00011111) << 6; + result = (uint32_t)(txt[*i] & 0b00011111) << 6; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ result += (txt[*i] & 0b00111111); @@ -388,11 +389,11 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i) } /*3 bytes UTF-8 code*/ else if((txt[*i] & 0b11110000) == 0b11100000) { - result = (txt[*i] & 0b00001111) << 12; + result = (uint32_t)(txt[*i] & 0b00001111) << 12; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ - result += (txt[*i] & 0b00111111) << 6; + result += (uint32_t)(txt[*i] & 0b00111111) << 6; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ @@ -401,19 +402,19 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i) } /*3 bytes UTF-8 code*/ else if((txt[*i] & 0b11111000) == 0b11110000) { - result = (txt[*i] & 0b00001111) << 18; + result = (uint32_t)(txt[*i] & 0b00001111) << 18; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ - result += (txt[*i] & 0b00111111) << 12; + result += (uint32_t)(txt[*i] & 0b00111111) << 12; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ - result += (txt[*i] & 0b00111111) << 6; + result += (uint32_t)(txt[*i] & 0b00111111) << 6; (*i)++; if((txt[*i] & 0b11000000) != 0b10000000) return 0; /*Invalid UTF-8 code*/ - result += (txt[*i] & 0b00111111) << 6; + result += (uint32_t)(txt[*i] & 0b00111111) << 6; (*i)++; } else { (*i)++; /*Not UTF-8 char. Go the next.*/ diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h index e38ebcd63..6f1e2a16b 100644 --- a/lv_misc/lv_txt.h +++ b/lv_misc/lv_txt.h @@ -171,8 +171,8 @@ uint32_t lv_txt_get_length(const char * txt); * MACROS **********************/ -#endif /*USE_TEXT*/ - #ifdef __cplusplus } /* extern "C" */ #endif + +#endif /*USE_TXT*/ diff --git a/lv_misc/lv_ufs.c b/lv_misc/lv_ufs.c index b4bd28cc6..9759508b9 100644 --- a/lv_misc/lv_ufs.c +++ b/lv_misc/lv_ufs.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include "lv_ufs.h" #include "lv_ll.h" #include diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h index d5167cea8..eec2f4f7e 100644 --- a/lv_misc/lv_ufs.h +++ b/lv_misc/lv_ufs.h @@ -201,5 +201,4 @@ lv_fs_res_t lv_ufs_free (uint32_t * total_p, uint32_t * free_p); } /* extern "C" */ #endif - #endif diff --git a/lv_obj/lv_group.h b/lv_obj/lv_group.h index adc777d11..146738db0 100644 --- a/lv_obj/lv_group.h +++ b/lv_obj/lv_group.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include "lv_obj.h" /********************* diff --git a/lv_obj/lv_indev.c b/lv_obj/lv_indev.c index 73938a313..a251f5858 100644 --- a/lv_obj/lv_indev.c +++ b/lv_obj/lv_indev.c @@ -6,8 +6,8 @@ /********************* * INCLUDES ********************/ -#include -#include "lv_conf.h" +#include "lv_indev.h" +#include "../../lv_conf.h" #include "../lv_hal/lv_hal_tick.h" #include "../lv_obj/lv_group.h" diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c index 6a980c85c..2094e5d0f 100644 --- a/lv_obj/lv_obj.c +++ b/lv_obj/lv_obj.c @@ -6,8 +6,6 @@ /********************* * INCLUDES *********************/ - -#include "lv_conf.h" #include "lv_obj.h" #include "lv_indev.h" #include "lv_refr.h" diff --git a/lv_obj/lv_obj.h b/lv_obj/lv_obj.h index 700bddf95..b58f28dc3 100644 --- a/lv_obj/lv_obj.h +++ b/lv_obj/lv_obj.h @@ -13,14 +13,14 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include +#include "lv_style.h" #include "../lv_misc/lv_area.h" #include "../lv_misc/lv_mem.h" #include "../lv_misc/lv_ll.h" #include "../lv_misc/lv_color.h" -#include "lv_style.h" /********************* * DEFINES diff --git a/lv_obj/lv_refr.c b/lv_obj/lv_refr.c index 0d58a9b54..582e685bd 100644 --- a/lv_obj/lv_refr.c +++ b/lv_obj/lv_refr.c @@ -6,11 +6,11 @@ /********************* * INCLUDES *********************/ -#include -#include "lv_conf.h" +#include "../../lv_conf.h" #include #include "lv_refr.h" #include "lv_vdb.h" +#include "../lv_hal/lv_hal_tick.h" #include "../lv_misc/lv_task.h" #include "../lv_misc/lv_mem.h" diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c index 6a2cf0244..0e67e902b 100644 --- a/lv_obj/lv_style.c +++ b/lv_obj/lv_style.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #include "lv_style.h" #include "lv_obj.h" #include "../lv_misc/lv_mem.h" diff --git a/lv_obj/lv_vdb.c b/lv_obj/lv_vdb.c index 71e55ad36..ae03b9a4d 100644 --- a/lv_obj/lv_vdb.c +++ b/lv_obj/lv_vdb.c @@ -2,7 +2,7 @@ * @file lv_vdb.c * */ -#include "lv_conf.h" +#include "../../lv_conf.h" #if LV_VDB_SIZE != 0 #include "../lv_hal/lv_hal_disp.h" diff --git a/lv_obj/lv_vdb.h b/lv_obj/lv_vdb.h index 9f7461e1d..ac90fa43e 100644 --- a/lv_obj/lv_vdb.h +++ b/lv_obj/lv_vdb.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if LV_VDB_SIZE != 0 diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c index bf102df37..50b94c192 100644 --- a/lv_objx/lv_bar.c +++ b/lv_objx/lv_bar.c @@ -8,7 +8,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BAR != 0 #include "lv_bar.h" diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h index 641f2c70c..3ed6b41e9 100644 --- a/lv_objx/lv_bar.h +++ b/lv_objx/lv_bar.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BAR != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c index 0f74b88bc..0b8473a87 100644 --- a/lv_objx/lv_btn.c +++ b/lv_objx/lv_btn.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BTN != 0 #include diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h index 24493b71d..0560546ab 100644 --- a/lv_objx/lv_btn.h +++ b/lv_objx/lv_btn.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BTN != 0 /*Testing of dependencies*/ @@ -220,4 +220,4 @@ lv_style_t * lv_btn_get_style(lv_obj_t * btn, lv_btn_style_t type); } /* extern "C" */ #endif -#endif /*lv_btn_H*/ +#endif /*LV_BTN_H*/ diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c index 2af03d55b..e6f6dc0ac 100644 --- a/lv_objx/lv_btnm.c +++ b/lv_objx/lv_btnm.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BTNM != 0 #include "lv_btnm.h" @@ -14,7 +14,7 @@ #include "../lv_draw/lv_draw.h" #include "../lv_obj/lv_refr.h" #include "../lv_themes/lv_theme.h" -#include +#include "../lv_misc/lv_txt.h" /********************* * DEFINES diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h index f975a9e68..b13ccb27e 100644 --- a/lv_objx/lv_btnm.h +++ b/lv_objx/lv_btnm.h @@ -14,7 +14,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_BTNM != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c index ef6483541..6ac9bd855 100644 --- a/lv_objx/lv_cb.c +++ b/lv_objx/lv_cb.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CB != 0 #include "lv_cb.h" diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h index 11f3ef0c5..1036875ae 100644 --- a/lv_objx/lv_cb.h +++ b/lv_objx/lv_cb.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CB != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c index 67b3d8cd6..0f3a7f563 100644 --- a/lv_objx/lv_chart.c +++ b/lv_objx/lv_chart.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CHART != 0 #include "lv_chart.h" diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h index e9792da29..d97cac5f7 100644 --- a/lv_objx/lv_chart.h +++ b/lv_objx/lv_chart.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CHART != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c index 267cb2c03..45d9946bb 100644 --- a/lv_objx/lv_cont.c +++ b/lv_objx/lv_cont.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CONT != 0 diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h index 66ca503be..1171f3381 100644 --- a/lv_objx/lv_cont.h +++ b/lv_objx/lv_cont.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_CONT != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index 63a07f4cc..93545aff3 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_DDLIST != 0 #include "lv_ddlist.h" diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h index cdc0ace3b..22781d6ac 100644 --- a/lv_objx/lv_ddlist.h +++ b/lv_objx/lv_ddlist.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_DDLIST != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c index ed0659e1a..b69d5a0bb 100644 --- a/lv_objx/lv_gauge.c +++ b/lv_objx/lv_gauge.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_GAUGE != 0 #include "lv_gauge.h" diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h index ae845697a..895e22392 100644 --- a/lv_objx/lv_gauge.h +++ b/lv_objx/lv_gauge.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_GAUGE != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index 7e8c141cf..4f73c19ff 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_IMG != 0 #include "lv_img.h" diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h index a265749d8..b3191be06 100644 --- a/lv_objx/lv_img.h +++ b/lv_objx/lv_img.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_IMG != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_kb.c b/lv_objx/lv_kb.c index 2eeb49a60..bd3d19ab2 100644 --- a/lv_objx/lv_kb.c +++ b/lv_objx/lv_kb.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_KB != 0 #include "lv_kb.h" diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h index 202df500f..a159e3b96 100644 --- a/lv_objx/lv_kb.h +++ b/lv_objx/lv_kb.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_KB != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c index 1c2e218bb..262b6deaf 100644 --- a/lv_objx/lv_label.c +++ b/lv_objx/lv_label.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LABEL != 0 #include "lv_label.h" @@ -14,10 +14,7 @@ #include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" #include "../lv_misc/lv_color.h" -#include #include "../lv_misc/lv_math.h" -#include -#include "../lv_misc/lv_anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h index 5c43d9d4e..8e59479c2 100644 --- a/lv_objx/lv_label.h +++ b/lv_objx/lv_label.h @@ -13,12 +13,12 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LABEL != 0 #include "../lv_obj/lv_obj.h" #include "../lv_misc/lv_font.h" -#include +#include "../lv_misc/lv_txt.h" #include "../lv_misc/lv_fonts/symbol_def.h" /********************* diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c index 15e90509c..6d94a54dc 100644 --- a/lv_objx/lv_led.c +++ b/lv_objx/lv_led.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LED != 0 #include "lv_led.h" diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h index 4a8eb5cda..7fd6e6482 100644 --- a/lv_objx/lv_led.h +++ b/lv_objx/lv_led.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LED != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c index 5988b0d43..00178fddb 100644 --- a/lv_objx/lv_line.c +++ b/lv_objx/lv_line.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LINE != 0 #include "lv_line.h" diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h index c797633f6..bc6f9c66c 100644 --- a/lv_objx/lv_line.h +++ b/lv_objx/lv_line.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LINE != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index f7a0ced0d..ea6d404e8 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LIST != 0 #include "lv_list.h" @@ -162,7 +162,7 @@ lv_obj_t * lv_list_add(lv_obj_t * list, const char * img_fn, const char * txt, l w -= pad_hor_tot * 2; lv_obj_set_width(liste, w); -#if USE_LV_IMG != 0 && USE_FSINT != 0 +#if USE_LV_IMG != 0 if(img_fn != NULL && img_fn[0] != '\0') { lv_obj_t * img = lv_img_create(liste, NULL); lv_img_set_file(img, img_fn); @@ -297,7 +297,7 @@ lv_obj_t * lv_list_get_btn_label(lv_obj_t * btn) */ lv_obj_t * lv_list_get_btn_img(lv_obj_t * btn) { -#if USE_LV_IMG != 0 && USE_FSINT != 0 +#if USE_LV_IMG != 0 lv_obj_t * img = lv_obj_get_child(btn, NULL); if(img == NULL) return NULL; diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h index 93f2e8125..7725c5508 100644 --- a/lv_objx/lv_list.h +++ b/lv_objx/lv_list.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LIST != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c index 819c37e49..352fbb948 100644 --- a/lv_objx/lv_lmeter.c +++ b/lv_objx/lv_lmeter.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LMETER != 0 #include "lv_lmeter.h" diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h index 52daad143..fb09f940e 100644 --- a/lv_objx/lv_lmeter.h +++ b/lv_objx/lv_lmeter.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_LMETER != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index bd30cf5b1..8080c75db 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_MBOX != 0 #include "lv_mbox.h" diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h index 71b8b311b..37e869357 100644 --- a/lv_objx/lv_mbox.h +++ b/lv_objx/lv_mbox.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_MBOX != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_objx_templ.c b/lv_objx/lv_objx_templ.c index 2c7f8ad67..25e316aac 100644 --- a/lv_objx/lv_objx_templ.c +++ b/lv_objx/lv_objx_templ.c @@ -13,7 +13,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TEMPL != 0 #include "lv_templ.h" diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h index 174dc4fcb..3f02ed767 100644 --- a/lv_objx/lv_objx_templ.h +++ b/lv_objx/lv_objx_templ.h @@ -21,7 +21,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TEMPL != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 3a84f17d0..419b7b95e 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_PAGE != 0 #include "../lv_obj/lv_group.h" diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h index bd453ab1b..e105043ff 100644 --- a/lv_objx/lv_page.h +++ b/lv_objx/lv_page.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_PAGE != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c index 5b5311f6b..68e70bf67 100644 --- a/lv_objx/lv_roller.c +++ b/lv_objx/lv_roller.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_ROLLER != 0 #include "lv_roller.h" diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h index 1c7e41a1c..9a17fe583 100644 --- a/lv_objx/lv_roller.h +++ b/lv_objx/lv_roller.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_ROLLER != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c index 9764537d9..1e1122176 100644 --- a/lv_objx/lv_slider.c +++ b/lv_objx/lv_slider.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_SLIDER != 0 #include "lv_slider.h" diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h index a879d9ed3..7990b6c8d 100644 --- a/lv_objx/lv_slider.h +++ b/lv_objx/lv_slider.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_SLIDER != 0 #include "../lv_obj/lv_obj.h" diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c index e7ac05f55..a67987f6f 100644 --- a/lv_objx/lv_sw.c +++ b/lv_objx/lv_sw.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_SW != 0 #include "lv_sw.h" diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h index 1a16fb20b..b7a4a53c2 100644 --- a/lv_objx/lv_sw.h +++ b/lv_objx/lv_sw.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_SW != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index 057ecf894..31e78442e 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -7,7 +7,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TA != 0 #include "lv_ta.h" @@ -15,7 +15,7 @@ #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" #include "../lv_misc/lv_anim.h" -#include +#include "../lv_misc/lv_txt.h" #include "../lv_misc/lv_math.h" /********************* diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h index 144563d0f..d8d217f75 100644 --- a/lv_objx/lv_ta.h +++ b/lv_objx/lv_ta.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TA != 0 /*Testing of dependencies*/ diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c index dffd2db1c..70b110d88 100644 --- a/lv_objx/lv_tabview.c +++ b/lv_objx/lv_tabview.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TABVIEW != 0 #include "lv_tabview.h" diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h index 4c78f54c8..d6e1729f9 100644 --- a/lv_objx/lv_tabview.h +++ b/lv_objx/lv_tabview.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_TABVIEW != 0 @@ -203,4 +203,4 @@ lv_style_t * lv_tabview_get_style(lv_obj_t *tabview, lv_tabview_style_t type); } /* extern "C" */ #endif -#endif /*LV_TAB_H*/ +#endif /*LV_TABVIEW_H*/ diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c index f12e8362a..d751a44bb 100644 --- a/lv_objx/lv_win.c +++ b/lv_objx/lv_win.c @@ -6,7 +6,7 @@ /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_WIN != 0 #include "lv_win.h" diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h index 5cfa36342..e81ce1638 100644 --- a/lv_objx/lv_win.h +++ b/lv_objx/lv_win.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_WIN != 0 /*Testing of dependencies*/ diff --git a/lv_themes/lv_theme.c b/lv_themes/lv_theme.c index 5089ef632..b624d7844 100644 --- a/lv_themes/lv_theme.c +++ b/lv_themes/lv_theme.c @@ -6,7 +6,6 @@ /********************* * INCLUDES *********************/ -#include "lvgl/lvgl.h" #include "lv_theme.h" /********************* diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h index 7f1863047..2f995dd2d 100644 --- a/lv_themes/lv_theme.h +++ b/lv_themes/lv_theme.h @@ -13,8 +13,8 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" -#include "lvgl/lv_obj/lv_style.h" +#include "../../lv_conf.h" +#include "../lv_obj/lv_style.h" /********************* * DEFINES diff --git a/lv_themes/lv_theme_alien.c b/lv_themes/lv_theme_alien.c index 301e18440..b1a7327dc 100644 --- a/lv_themes/lv_theme_alien.c +++ b/lv_themes/lv_theme_alien.c @@ -6,11 +6,8 @@ /********************* * INCLUDES *********************/ -#include "lvgl/lvgl.h" #include "lv_theme.h" -#include "lv_conf.h" - #if USE_LV_THEME_ALIEN /********************* diff --git a/lv_themes/lv_theme_alien.h b/lv_themes/lv_theme_alien.h index e974982ca..a9506e369 100644 --- a/lv_themes/lv_theme_alien.h +++ b/lv_themes/lv_theme_alien.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_THEME_ALIEN diff --git a/lv_themes/lv_theme_default.c b/lv_themes/lv_theme_default.c index 863cfdefd..2c90838f0 100644 --- a/lv_themes/lv_theme_default.c +++ b/lv_themes/lv_theme_default.c @@ -6,11 +6,8 @@ /********************* * INCLUDES *********************/ -#include "lvgl/lvgl.h" #include "lv_theme.h" -#include "lv_conf.h" - #if USE_LV_THEME_DEFAULT /********************* diff --git a/lv_themes/lv_theme_default.h b/lv_themes/lv_theme_default.h index ec72f71ef..e807ac7bd 100644 --- a/lv_themes/lv_theme_default.h +++ b/lv_themes/lv_theme_default.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_THEME_DEFAULT diff --git a/lv_themes/lv_theme_night.c b/lv_themes/lv_theme_night.c index 393a69aae..c9aa1d467 100644 --- a/lv_themes/lv_theme_night.c +++ b/lv_themes/lv_theme_night.c @@ -6,11 +6,8 @@ /********************* * INCLUDES *********************/ -#include "lvgl/lvgl.h" #include "lv_theme.h" -#include "lv_conf.h" - #if USE_LV_THEME_NIGHT /********************* diff --git a/lv_themes/lv_theme_night.h b/lv_themes/lv_theme_night.h index a9f534f91..5780b3462 100644 --- a/lv_themes/lv_theme_night.h +++ b/lv_themes/lv_theme_night.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_THEME_NIGHT diff --git a/lv_themes/lv_theme_templ.c b/lv_themes/lv_theme_templ.c index 4a76c655b..ba75f6bde 100644 --- a/lv_themes/lv_theme_templ.c +++ b/lv_themes/lv_theme_templ.c @@ -6,10 +6,8 @@ /********************* * INCLUDES *********************/ -#include "lvgl/lvgl.h" #include "lv_theme.h" -#include "lv_conf.h" #if USE_LV_THEME_TEMPL diff --git a/lv_themes/lv_theme_templ.h b/lv_themes/lv_theme_templ.h index 6cf54d8d9..28ab0d280 100644 --- a/lv_themes/lv_theme_templ.h +++ b/lv_themes/lv_theme_templ.h @@ -13,7 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lv_conf.h" +#include "../../lv_conf.h" #if USE_LV_THEME_TEMPL diff --git a/lvgl.h b/lvgl.h index 20e50bdd5..3d6d525f3 100644 --- a/lvgl.h +++ b/lvgl.h @@ -58,14 +58,6 @@ extern "C" { #define LVGL_VERSION_PATH 0 #define LVGL_VERSION_INFO "beta" -#if MISC_VERSION_MINOR < LV_MISC_REQ_MINOR /*The version minor has to be the same or greater*/ -#error "LV: incompatible misc. module version! See lvgl.h" -#endif - -#if MISC_VERSION_PATCH < LV_MISC_REQ_PATCH /*The version patch has to be the same or greater*/ -#error "LV: incompatible misc. module version! See lvgl.h" -#endif - /********************** * TYPEDEFS **********************/