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

2018-07-08 01:02:46 +02:00
parent a23a6f7c90 dbc7957a50
commit 87de768af4
108 changed files with 755 additions and 288 deletions
--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@@ -8,10 +8,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_bar.h"
 #if USE_LV_BAR != 0

-#include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BAR != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -7,11 +7,10 @@
 *      INCLUDES
 *********************/

-#include "../../lv_conf.h"
+#include "lv_btn.h"
 #if USE_LV_BTN != 0

 #include <string.h>
-#include "lv_btn.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTN != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_btnm.h"
 #if USE_LV_BTNM != 0

-#include "lv_btnm.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_refr.h"
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -14,7 +14,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTNM != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_cb.h"
 #if USE_LV_CB != 0

-#include "lv_cb.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CB != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_chart.c
+++ b/lv_objx/lv_chart.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_chart.h"
 #if USE_LV_CHART != 0

-#include "lv_chart.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CHART != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@@ -6,15 +6,14 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"

+#include "lv_cont.h"
 #if USE_LV_CONT != 0

 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

-#include "lv_cont.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_vbasic.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CONT != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -7,15 +7,14 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_ddlist.h"
 #if USE_LV_DDLIST != 0

-#include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "../lv_misc/lv_anim.h"

 /*********************
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_DDLIST != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_gauge.h"
 #if USE_LV_GAUGE != 0

-#include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_txt.h"
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_GAUGE != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@@ -6,7 +6,7 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_img.h"
 #if USE_LV_IMG != 0

 /*Testing of dependencies*/
@@ -14,7 +14,6 @@
 #error "lv_img: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif

-#include "lv_img.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_ufs.h"
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -13,12 +13,17 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_IMG != 0

 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "lv_label.h"
 #include "../lv_draw/lv_draw.h"

--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_kb.h"
 #if USE_LV_KB != 0

-#include "lv_kb.h"
 #include "lv_ta.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_KB != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_label.h"
 #if USE_LV_LABEL != 0

-#include "lv_label.h"
 #include "../lv_core/lv_obj.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -13,13 +13,18 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LABEL != 0

 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_led.c
+++ b/lv_objx/lv_led.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_led.h"
 #if USE_LV_LED != 0

-#include "lv_led.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_draw/lv_draw.h"

--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LED != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_line.h"

 #if USE_LV_LINE != 0
-#include "lv_line.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_misc/lv_math.h"
 #include <stdbool.h>
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LINE != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_list.h"
 #if USE_LV_LIST != 0

-#include "lv_list.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LIST != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_lmeter.h"
 #if USE_LV_LMETER != 0

-#include "lv_lmeter.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_group.h"
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LMETER != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_mbox.h"
 #if USE_LV_MBOX != 0

-#include "lv_mbox.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_MBOX != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_objx.mk
+++ b/lv_objx/lv_objx.mk
@@ -5,7 +5,7 @@ CSRCS += lv_ddlist.c
 CSRCS += lv_kb.c
 CSRCS += lv_line.c
 CSRCS += lv_mbox.c
-CSRCS += lv_preloader.c
+CSRCS += lv_preload.c
 CSRCS += lv_roller.c
 CSRCS += lv_tabview.c
 CSRCS += lv_btn.c
--- a/lv_objx/lv_objx_templ.c
+++ b/lv_objx/lv_objx_templ.c
@@ -13,10 +13,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+//#include "lv_templ.h"	/*TODO uncomment this*/
 #if USE_LV_TEMPL != 0

-#include "lv_templ.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -21,7 +21,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TEMPL != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -6,11 +6,10 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "../lv_objx/lv_page.h"
 #if USE_LV_PAGE != 0

 #include "../lv_core/lv_group.h"
-#include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_refr.h"
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_PAGE != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_roller.h"
 #if USE_LV_ROLLER != 0

-#include "lv_roller.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_ROLLER != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_slider.h"
 #if USE_LV_SLIDER != 0

-#include "lv_slider.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SLIDER != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@@ -6,7 +6,7 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_sw.h"
 #if USE_LV_SW != 0

 /*Testing of dependencies*/
@@ -14,7 +14,6 @@
 #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER  1) "
 #endif

-#include "lv_sw.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SW != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_ta.h"
 #if USE_LV_TA != 0

-#include "lv_ta.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TA != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_tabview.h"
 #if USE_LV_TABVIEW != 0

-#include "lv_tabview.h"
 #include "lv_btnm.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -13,9 +13,13 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
-#if USE_LV_TABVIEW != 0
+#endif

+#if USE_LV_TABVIEW != 0

 /*Testing of dependencies*/
 #if USE_LV_BTNM == 0
--- a/lv_objx/lv_win.c
+++ b/lv_objx/lv_win.c
@@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_win.h"
 #if USE_LV_WIN != 0

-#include "lv_win.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_WIN != 0

 /*Testing of dependencies*/