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

lv_conf_templ.h

@@ -86,6 +86,16 @@
 #define LV_ATTRIBUTE_TASK_HANDLER             /* Define a custom attribute to `lv_task_handler` function */
 #define LV_COMPILER_VLA_SUPPORTED    1        /* 1: Variable length array is supported*/
 
+/*Log settings*/
+#define USE_LV_LOG		1	/*Enable/disable the log module*/
+#if USE_LV_LOG
+#define LV_LOG_INFO		0	/*1: Log a lot of runtime information*/
+#define LV_LOG_WARN		0	/*1: Log is something unexpected happens but succesfully handled*/
+#define LV_LOG_ERROR	1	/*1: Log critical error*/
+#define LV_LOG_USER		1	/*1: Log user defined/user level things */
+#define LV_LOG_PRINTF	0	/*1: Print the log with 'printf'; 0: user need to register a callback*/
+#endif  /*USE_LV_LOG*/
+
 /*================
  *  THEME USAGE
  *================*/

lv_core/lv_group.h

@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include "lv_obj.h"
 
 /*********************

lv_core/lv_indev.c

@@ -7,7 +7,6 @@
  *      INCLUDES
  ********************/
 #include "lv_indev.h"
-#include "../../lv_conf.h"
 
 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_core/lv_group.h"

lv_core/lv_obj.c

@@ -62,6 +62,10 @@ static lv_ll_t scr_ll;                 /*Linked list of screens*/
  */
 void lv_init(void)
 {
+#if USE_LV_LOG
+	lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "lv_init called");
+#endif
+
     /*Initialize the lv_misc modules*/
     lv_mem_init();
     lv_task_init();
@@ -101,6 +105,10 @@ void lv_init(void)
     /*Init the input device handling*/
     lv_indev_init();
 #endif
+
+#if USE_LV_LOG
+    lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, "lv_init finished");
+#endif
 }
 
 /*--------------------

lv_core/lv_obj.h

@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
 #include "lv_style.h"
@@ -21,6 +26,7 @@ extern "C" {
 #include "../lv_misc/lv_mem.h"
 #include "../lv_misc/lv_ll.h"
 #include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_log.h"
 
 /*********************
  *      DEFINES

lv_core/lv_refr.c

@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_vdb.h"

lv_core/lv_refr.h

@@ -16,7 +16,6 @@ extern "C" {
 #include "lv_obj.h"
 #include <stdbool.h>
 
-
 /*********************
  *      DEFINES
  *********************/

lv_core/lv_style.c

@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
-#include "lv_style.h"
 #include "lv_obj.h"
 #include "../lv_misc/lv_mem.h"
 

lv_core/lv_vdb.c

@@ -2,12 +2,12 @@
  * @file lv_vdb.c
  *
  */
-#include "../../lv_conf.h"
+
+#include "lv_vdb.h"
 #if LV_VDB_SIZE != 0
 
 #include "../lv_hal/lv_hal_disp.h"
 #include <stddef.h>
-#include "lv_vdb.h"
 
 /*********************
  *      INCLUDES

lv_core/lv_vdb.h

@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if LV_VDB_SIZE != 0
 

lv_draw/lv_draw.c

@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 
 #include <stdio.h>
 #include <stdbool.h>

lv_draw/lv_draw.h

@@ -13,6 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"
 

lv_draw/lv_draw_arc.c

@@ -70,15 +70,11 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
     if(start_angle <= end_angle) deg_test = deg_test_norm;
     else deg_test = deg_test_inv;
 
-    // Good, may not be the fastest
-    // Does not draw overlapping pixels
     if(deg_test(270, start_angle, end_angle))  hor_line(center_x - r_out + 1, center_y, mask, thickness - 1, color, opa);   // Left Middle
     if(deg_test(90, start_angle, end_angle))   hor_line(center_x + r_in, center_y,  mask, thickness - 1, color, opa);       // Right Middle
     if(deg_test(180, start_angle, end_angle))  ver_line(center_x, center_y - r_out + 1,  mask, thickness - 1, color, opa);  // Top Middle
     if(deg_test(0, start_angle, end_angle))    ver_line(center_x, center_y + r_in,  mask, thickness - 1, color, opa);       // Bottom middle
 
-
-    lv_point_t last_corner_out = { -r_out, -r_out};
     uint32_t r_out_sqr = r_out * r_out;
     uint32_t r_in_sqr = r_in * r_in;
     int16_t xi;
@@ -153,7 +149,7 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
 
 
 #if LV_ANTIALIAS
-
+        /*TODO*/
 
 #endif
 

lv_draw/lv_draw_rbasic.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_REAL_DRAW != 0
 
 #include "../lv_misc/lv_color.h"

lv_draw/lv_draw_vbasic.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "../../lv_conf.h"
+#include "lv_draw_vbasic.h"
 
 #include <stdbool.h>
 #include <stdint.h>

lv_draw/lv_draw_vbasic.h

@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if LV_VDB_SIZE != 0
 

lv_fonts/lv_font_builtin.c

@@ -0,0 +1,165 @@
+/**
+ * @file lv_font_built_in.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_font_builtin.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Initialize the built-in fonts
+ */
+void lv_font_builtin_init(void)
+{
+    /*DEJAVU 10*/
+#if USE_LV_FONT_DEJAVU_10 != 0
+    lv_font_add(&lv_font_dejavu_10, NULL);
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_LATIN_SUP != 0
+#if USE_LV_FONT_DEJAVU_10 != 0
+    lv_font_add(&lv_font_dejavu_10_latin_sup, &lv_font_dejavu_10);
+#else
+    lv_font_add(&lv_font_dejavu_10_latin_sup, NULL);
+#endif
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
+#if USE_LV_FONT_DEJAVU_10 != 0
+    lv_font_add(&lv_font_dejavu_10_cyrillic, &lv_font_dejavu_10);
+#else
+    lv_font_add(&lv_font_dejavu_10_cyrillic, NULL);
+#endif
+#endif
+
+    /*SYMBOL 10*/
+#if USE_LV_FONT_SYMBOL_10 != 0
+#if USE_LV_FONT_DEJAVU_10 != 0
+    lv_font_add(&lv_font_symbol_10, &lv_font_dejavu_10);
+#else
+    lv_font_add(&lv_font_symbol_10, NULL);
+#endif
+#endif
+
+
+    /*DEJAVU 20*/
+#if USE_LV_FONT_DEJAVU_20 != 0
+    lv_font_add(&lv_font_dejavu_20, NULL);
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_LATIN_SUP != 0
+#if USE_LV_FONT_DEJAVU_20 != 0
+    lv_font_add(&lv_font_dejavu_20_latin_sup, &lv_font_dejavu_20);
+#else
+    lv_font_add(&lv_font_symbol_20_latin_sup, NULL);
+#endif
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
+#if USE_LV_FONT_DEJAVU_20 != 0
+    lv_font_add(&lv_font_dejavu_20_cyrillic, &lv_font_dejavu_20);
+#else
+    lv_font_add(&lv_font_dejavu_20_cyrillic, NULL);
+#endif
+#endif
+
+    /*SYMBOL 20*/
+#if USE_LV_FONT_SYMBOL_20 != 0
+#if USE_LV_FONT_DEJAVU_20 != 0
+    lv_font_add(&lv_font_symbol_20, &lv_font_dejavu_20);
+#else
+    lv_font_add(&lv_font_symbol_20, NULL);
+#endif
+#endif
+
+
+    /*DEJAVU 30*/
+#if USE_LV_FONT_DEJAVU_30 != 0
+    lv_font_add(&lv_font_dejavu_30, NULL);
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_LATIN_SUP != 0
+#if USE_LV_FONT_DEJAVU_30 != 0
+    lv_font_add(&lv_font_dejavu_30_latin_sup, &lv_font_dejavu_30);
+#else
+    lv_font_add(&lv_font_dejavu_30_latin_sup, NULL);
+#endif
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
+#if USE_LV_FONT_DEJAVU_30 != 0
+    lv_font_add(&lv_font_dejavu_30_cyrillic, &lv_font_dejavu_30);
+#else
+    lv_font_add(&lv_font_dejavu_30_cyrillic, NULL);
+#endif
+#endif
+
+    /*SYMBOL 30*/
+#if USE_LV_FONT_SYMBOL_30 != 0
+#if USE_LV_FONT_DEJAVU_30 != 0
+    lv_font_add(&lv_font_symbol_30, &lv_font_dejavu_30);
+#else
+    lv_font_add(&lv_font_symbol_30_basic, NULL);
+#endif
+#endif
+
+    /*DEJAVU 40*/
+#if USE_LV_FONT_DEJAVU_40 != 0
+    lv_font_add(&lv_font_dejavu_40, NULL);
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_LATIN_SUP != 0
+#if USE_LV_FONT_DEJAVU_40 != 0
+    lv_font_add(&lv_font_dejavu_40_latin_sup, &lv_font_dejavu_40);
+#else
+    lv_font_add(&lv_font_dejavu_40_latin_sup, NULL);
+#endif
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
+#if USE_LV_FONT_DEJAVU_40 != 0
+    lv_font_add(&lv_font_dejavu_40_cyrillic, &lv_font_dejavu_40);
+#else
+    lv_font_add(&lv_font_dejavu_40_cyrillic, NULL);
+#endif
+#endif
+
+    /*SYMBOL 40*/
+#if USE_LV_FONT_SYMBOL_40 != 0
+#if USE_LV_FONT_DEJAVU_40 != 0
+    lv_font_add(&lv_font_symbol_40, &lv_font_dejavu_40);
+#else
+    lv_font_add(&lv_font_symbol_40, NULL);
+#endif
+#endif
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/

lv_fonts/lv_font_builtin.h

@@ -0,0 +1,121 @@
+/**
+ * @file lv_font_builtin.h
+ *
+ */
+
+#ifndef LV_FONT_BUILTIN_H
+#define LV_FONT_BUILTIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *     INCLUDES
+ *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
+#include "../lv_misc/lv_font.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Initialize the built-in fonts
+ */
+void lv_font_builtin_init(void);
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *  FONT DECLARATIONS
+ **********************/
+
+/*10 px */
+#if USE_LV_FONT_DEJAVU_10
+LV_FONT_DECLARE(lv_font_dejavu_10);
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_10_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_10_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_10
+LV_FONT_DECLARE(lv_font_symbol_10);
+#endif
+
+/*20 px */
+#if USE_LV_FONT_DEJAVU_20
+LV_FONT_DECLARE(lv_font_dejavu_20);
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_20_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_20_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_20
+LV_FONT_DECLARE(lv_font_symbol_20);
+#endif
+
+/*30 px */
+#if USE_LV_FONT_DEJAVU_30
+LV_FONT_DECLARE(lv_font_dejavu_30);
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_30_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_30_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_30
+LV_FONT_DECLARE(lv_font_symbol_30);
+#endif
+
+/*40 px */
+#if USE_LV_FONT_DEJAVU_40
+LV_FONT_DECLARE(lv_font_dejavu_40);
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_40_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_40_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_40
+LV_FONT_DECLARE(lv_font_symbol_40);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_FONT_BUILTIN_H*/

lv_fonts/lv_font_dejavu_10.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_10_cyrillic.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_10_latin_sup.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_20.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_20_cyrillic.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_20_latin_sup.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_30.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_30_cyrillic.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_30_latin_sup.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_40.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_40_cyrillic.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_dejavu_40_latin_sup.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_symbol_10.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_10 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_symbol_20.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_20 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_symbol_30.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_30 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_font_symbol_40.c

@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_40 != 0  /*Can be enabled in lv_conf.h*/
 

lv_fonts/lv_fonts.mk

@@ -15,7 +15,7 @@ CSRCS += lv_font_symbol_20.c
 CSRCS += lv_font_symbol_30.c
 CSRCS += lv_font_symbol_40.c
 
-DEPPATH += --dep-path lvgl/lv_misc/lv_fonts
-VPATH += :lvgl/lv_misc/lv_fonts
+DEPPATH += --dep-path lvgl/lv_fonts
+VPATH += :lvgl/lv_fonts
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_misc/lv_fonts"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_fonts"

lv_hal/lv_hal_tick.c

@@ -6,9 +6,14 @@
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "lv_hal_tick.h"
 #include <stddef.h>
-#include "../../lv_conf.h"
 
 /*********************
  *      DEFINES

lv_misc/lv_anim.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_ANIMATION
 
 #include <stdint.h>

lv_misc/lv_color.h

@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #include <stdint.h>
 

lv_misc/lv_font.c

@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
-
 #include <stddef.h>
 #include "lv_font.h"
 
@@ -40,132 +38,11 @@
  **********************/
 
 /**
- * Initialize the built-in fonts
+ * Initialize the fonts
  */
 void lv_font_init(void)
 {
-    /*DEJAVU 10*/
-#if USE_LV_FONT_DEJAVU_10 != 0
-    lv_font_add(&lv_font_dejavu_10, NULL);
-#endif
-
-#if USE_LV_FONT_DEJAVU_10_LATIN_SUP != 0
-#if USE_LV_FONT_DEJAVU_10 != 0
-    lv_font_add(&lv_font_dejavu_10_latin_sup, &lv_font_dejavu_10);
-#else
-    lv_font_add(&lv_font_dejavu_10_latin_sup, NULL);
-#endif
-#endif
-
-#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
-#if USE_LV_FONT_DEJAVU_10 != 0
-    lv_font_add(&lv_font_dejavu_10_cyrillic, &lv_font_dejavu_10);
-#else
-    lv_font_add(&lv_font_dejavu_10_cyrillic, NULL);
-#endif
-#endif
-
-    /*SYMBOL 10*/
-#if USE_LV_FONT_SYMBOL_10 != 0
-#if USE_LV_FONT_DEJAVU_10 != 0
-    lv_font_add(&lv_font_symbol_10, &lv_font_dejavu_10);
-#else
-    lv_font_add(&lv_font_symbol_10, NULL);
-#endif
-#endif
-
-
-    /*DEJAVU 20*/
-#if USE_LV_FONT_DEJAVU_20 != 0
-    lv_font_add(&lv_font_dejavu_20, NULL);
-#endif
-
-#if USE_LV_FONT_DEJAVU_20_LATIN_SUP != 0
-#if USE_LV_FONT_DEJAVU_20 != 0
-    lv_font_add(&lv_font_dejavu_20_latin_sup, &lv_font_dejavu_20);
-#else
-    lv_font_add(&lv_font_symbol_20_latin_sup, NULL);
-#endif
-#endif
-
-#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
-#if USE_LV_FONT_DEJAVU_20 != 0
-    lv_font_add(&lv_font_dejavu_20_cyrillic, &lv_font_dejavu_20);
-#else
-    lv_font_add(&lv_font_dejavu_20_cyrillic, NULL);
-#endif
-#endif
-
-    /*SYMBOL 20*/
-#if USE_LV_FONT_SYMBOL_20 != 0
-#if USE_LV_FONT_DEJAVU_20 != 0
-    lv_font_add(&lv_font_symbol_20, &lv_font_dejavu_20);
-#else
-    lv_font_add(&lv_font_symbol_20, NULL);
-#endif
-#endif
-
-
-    /*DEJAVU 30*/
-#if USE_LV_FONT_DEJAVU_30 != 0
-    lv_font_add(&lv_font_dejavu_30, NULL);
-#endif
-
-#if USE_LV_FONT_DEJAVU_30_LATIN_SUP != 0
-#if USE_LV_FONT_DEJAVU_30 != 0
-    lv_font_add(&lv_font_dejavu_30_latin_sup, &lv_font_dejavu_30);
-#else
-    lv_font_add(&lv_font_dejavu_30_latin_sup, NULL);
-#endif
-#endif
-
-#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
-#if USE_LV_FONT_DEJAVU_30 != 0
-    lv_font_add(&lv_font_dejavu_30_cyrillic, &lv_font_dejavu_30);
-#else
-    lv_font_add(&lv_font_dejavu_30_cyrillic, NULL);
-#endif
-#endif
-
-    /*SYMBOL 30*/
-#if USE_LV_FONT_SYMBOL_30 != 0
-#if USE_LV_FONT_DEJAVU_30 != 0
-    lv_font_add(&lv_font_symbol_30, &lv_font_dejavu_30);
-#else
-    lv_font_add(&lv_font_symbol_30_basic, NULL);
-#endif
-#endif
-
-    /*DEJAVU 40*/
-#if USE_LV_FONT_DEJAVU_40 != 0
-    lv_font_add(&lv_font_dejavu_40, NULL);
-#endif
-
-#if USE_LV_FONT_DEJAVU_40_LATIN_SUP != 0
-#if USE_LV_FONT_DEJAVU_40 != 0
-    lv_font_add(&lv_font_dejavu_40_latin_sup, &lv_font_dejavu_40);
-#else
-    lv_font_add(&lv_font_dejavu_40_latin_sup, NULL);
-#endif
-#endif
-
-#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
-#if USE_LV_FONT_DEJAVU_40 != 0
-    lv_font_add(&lv_font_dejavu_40_cyrillic, &lv_font_dejavu_40);
-#else
-    lv_font_add(&lv_font_dejavu_40_cyrillic, NULL);
-#endif
-#endif
-
-    /*SYMBOL 40*/
-#if USE_LV_FONT_SYMBOL_40 != 0
-#if USE_LV_FONT_DEJAVU_40 != 0
-    lv_font_add(&lv_font_symbol_40, &lv_font_dejavu_40);
-#else
-    lv_font_add(&lv_font_symbol_40, NULL);
-#endif
-#endif
-
+	lv_font_builtin_init();
 }
 
 /**

lv_misc/lv_font.h

@@ -14,13 +14,17 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "lv_fonts/lv_symbol_def.h"
+#include "lv_symbol_def.h"
 
 /*********************
  *      DEFINES
@@ -62,7 +66,7 @@ typedef struct _lv_font_struct
  **********************/
 
 /**
- * Initialize the built-in fonts
+ * Initialize the fonts
  */
 void lv_font_init(void);
 
@@ -98,6 +102,14 @@ const uint8_t * lv_font_get_bitmap(const lv_font_t * font_p, uint32_t letter);
 uint8_t lv_font_get_width(const lv_font_t * font_p, uint32_t letter);
 
 
+/**
+ * Get the width of the letter without overwriting it with the `monospace` attribute
+ * @param font_p pointer to a font
+ * @param letter an UNICODE character code
+ * @return the width of a letter
+ */
+uint8_t lv_font_get_real_width(const lv_font_t * font_p, uint32_t letter);
+
 /**
  * Get the height of a font
  * @param font_p pointer to a font
@@ -150,79 +162,14 @@ int16_t lv_font_get_width_sparse(const lv_font_t * font, uint32_t unicode_letter
 /**********************
  *      MACROS
  **********************/
+
 #define LV_FONT_DECLARE(font_name) extern lv_font_t font_name;
 
+
 /**********************
- *  FONT DECLARATION
+ * ADD BUILT IN FONTS
  **********************/
-
-/*10 px */
-#if USE_LV_FONT_DEJAVU_10
-LV_FONT_DECLARE(lv_font_dejavu_10);
-#endif
-
-#if USE_LV_FONT_DEJAVU_10_LATIN_SUP
-LV_FONT_DECLARE(lv_font_dejavu_10_latin_sup);
-#endif
-
-#if USE_LV_FONT_DEJAVU_10_CYRILLIC
-LV_FONT_DECLARE(lv_font_dejavu_10_cyrillic);
-#endif
-
-#if USE_LV_FONT_SYMBOL_10
-LV_FONT_DECLARE(lv_font_symbol_10);
-#endif
-
-/*20 px */
-#if USE_LV_FONT_DEJAVU_20
-LV_FONT_DECLARE(lv_font_dejavu_20);
-#endif
-
-#if USE_LV_FONT_DEJAVU_20_LATIN_SUP
-LV_FONT_DECLARE(lv_font_dejavu_20_latin_sup);
-#endif
-
-#if USE_LV_FONT_DEJAVU_20_CYRILLIC
-LV_FONT_DECLARE(lv_font_dejavu_20_cyrillic);
-#endif
-
-#if USE_LV_FONT_SYMBOL_20
-LV_FONT_DECLARE(lv_font_symbol_20);
-#endif
-
-/*30 px */
-#if USE_LV_FONT_DEJAVU_30
-LV_FONT_DECLARE(lv_font_dejavu_30);
-#endif
-
-#if USE_LV_FONT_DEJAVU_30_LATIN_SUP
-LV_FONT_DECLARE(lv_font_dejavu_30_latin_sup);
-#endif
-
-#if USE_LV_FONT_DEJAVU_30_CYRILLIC
-LV_FONT_DECLARE(lv_font_dejavu_30_cyrillic);
-#endif
-
-#if USE_LV_FONT_SYMBOL_30
-LV_FONT_DECLARE(lv_font_symbol_30);
-#endif
-
-/*40 px */
-#if USE_LV_FONT_DEJAVU_40
-LV_FONT_DECLARE(lv_font_dejavu_40);
-#endif
-
-#if USE_LV_FONT_DEJAVU_40_LATIN_SUP
-LV_FONT_DECLARE(lv_font_dejavu_40_latin_sup);
-#endif
-
-#if USE_LV_FONT_DEJAVU_40_CYRILLIC
-LV_FONT_DECLARE(lv_font_dejavu_40_cyrillic);
-#endif
-
-#if USE_LV_FONT_SYMBOL_40
-LV_FONT_DECLARE(lv_font_symbol_40);
-#endif
+#include "../lv_fonts/lv_font_builtin.h"
 
 /*Declare the custom (user defined) fonts*/
 LV_FONT_CUSTOM_DECLARE

lv_misc/lv_log.c

@@ -0,0 +1,80 @@
+/**
+ * @file lv_log.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_log.h"
+#if USE_LV_LOG
+
+#if LV_LOG_PRINTF
+#include <stdio.h>
+#endif
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+static void (*print_cb)(lv_log_level_t , const char *, uint32_t ,  const char *);
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Register custom print (or anything else) function to call when log is added
+ * @param f a function pointer:
+ *          `void my_print (lv_log_level_t level, const char * file, uint32_t line, const char * dsc)`
+ */
+void lv_log_register_print(void f(lv_log_level_t , const char *, uint32_t ,  const char *))
+{
+	print_cb = f;
+}
+
+/**
+ * Add a log
+ * @param level the level of log. (From `lv_log_level_t` enum)
+ * @param file name of the file when the log added
+ * @param line line number in the source code where the log added
+ * @param dsc description of the log
+ */
+void lv_log_add(lv_log_level_t level, const char * file, uint32_t line, const char * dsc)
+{
+	if(level >= _LV_LOG_LEVEL_NUM) return;		/*Invalid level*/
+
+	if((level == LV_LOG_LEVEL_INFO && LV_LOG_INFO)  ||
+	   (level == LV_LOG_LEVEL_WARN && LV_LOG_WARN)  ||
+	   (level == LV_LOG_LEVEL_ERROR && LV_LOG_ERROR) ||
+	   (level == LV_LOG_LEVEL_USER && LV_LOG_USER))
+	{
+
+#if LV_LOG_PRINTF
+		static const char * lvl_prefix[] = {"Info", "Warn", "Error", "User"};
+		printf("%s %s:%d:   %s\n", lvl_prefix[level], file, line, dsc);
+#else
+		if(print_cb) print_cb(level, file, line, dsc);
+#endif
+	}
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#endif /*USE_LV_LOG*/

lv_misc/lv_log.h

@@ -0,0 +1,74 @@
+/**
+ * @file lv_log.h
+ *
+ */
+
+#ifndef LV_LOG_H
+#define LV_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf.h"
+#include <stdint.h>
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/*Possible log level. For compatibility declare it independently from `USE_LV_LOG`*/
+typedef enum
+{
+	LV_LOG_LEVEL_INFO = 0,
+	LV_LOG_LEVEL_WARN,
+	LV_LOG_LEVEL_ERROR,
+	LV_LOG_LEVEL_USER,
+	_LV_LOG_LEVEL_NUM
+}lv_log_level_t;
+
+#if USE_LV_LOG
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Register custom print (or anything else) function to call when log is added
+ * @param f a function pointer:
+ *          `void my_print (lv_log_level_t level, const char * file, uint32_t line, const char * dsc)`
+ */
+void lv_log_register_print(void f(lv_log_level_t , const char *, uint32_t ,  const char *));
+
+/**
+ * Add a log
+ * @param level the level of log. (From `lv_log_level_t` enum)
+ * @param file name of the file when the log added
+ * @param line line number in the source code where the log added
+ * @param dsc description of the log
+ */
+void lv_log_add(lv_log_level_t level, const char * file, uint32_t line, const char * dsc);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#else /*USE_LV_LOG*/
+
+/*Do nothing if `USE_LV_LOG  0`*/
+#define lv_log_add(level, file, line, dsc) {;}
+
+#endif /*USE_LV_LOG*/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_LOG_H*/

lv_misc/lv_mem.c

@@ -7,7 +7,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 #include "lv_mem.h"
 #include "lv_math.h"
 #include <string.h>

lv_misc/lv_mem.h

@@ -14,6 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stddef.h>
 

lv_misc/lv_misc.mk

@@ -10,6 +10,7 @@ CSRCS += lv_color.c
 CSRCS += lv_txt.c
 CSRCS += lv_ufs.c
 CSRCS += lv_math.c
+CSRCS += lv_log.c
 
 DEPPATH += --dep-path lvgl/lv_misc
 VPATH += :lvgl/lv_misc

lv_misc/lv_symbol_def.h

@@ -4,8 +4,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#include "../../../lv_conf.h"
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
 
 /*
  * With no UTF-8 support (192-255)

lv_misc/lv_task.c

@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include "lv_task.h"
 #include "../lv_hal/lv_hal_tick.h"
-#include "../../lv_conf.h"
 
 /*********************
  *      DEFINES

lv_misc/lv_task.h

@@ -14,6 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_mem.h"

lv_misc/lv_txt.c

@@ -7,7 +7,6 @@
  *      INCLUDES
  *********************/
 #include "lv_txt.h"
-#include "../../lv_conf.h"
 #include "lv_math.h"
 
 /*********************

lv_misc/lv_txt.h

@@ -13,6 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdbool.h>
 #include "lv_area.h"
 #include "lv_font.h"

lv_misc/lv_ufs.h

@@ -15,7 +15,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_FILESYSTEM
 

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"

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"

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"

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*/

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"

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"

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"
 

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*/

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"
 

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"

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"

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"

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"
 
 /*********************

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*/

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"

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*/

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"

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"
 

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"
 

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*/

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"

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

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"
 

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"

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>

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"

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"

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*/

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"

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"

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"

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*/

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

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

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"

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"

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*/

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"

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*/

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"

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*/

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"
 
 /*********************

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*/

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"

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*/

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"

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

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"
 
 /*********************

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*/