add tests and lv_conf_internal.h to use LV_CONF_PATH

lvgl.mk

@@ -1,8 +1,8 @@
-include $(LVGL_DIR)/lvgl/src/lv_core/lv_core.mk
+include $(LVGL_DIR)/src/lv_core/lv_core.mk
-include $(LVGL_DIR)/lvgl/src/lv_hal/lv_hal.mk
+include $(LVGL_DIR)/src/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/lvgl/src/lv_objx/lv_objx.mk
+include $(LVGL_DIR)/src/lv_objx/lv_objx.mk
-include $(LVGL_DIR)/lvgl/src/lv_font/lv_font.mk
+include $(LVGL_DIR)/src/lv_font/lv_font.mk
-include $(LVGL_DIR)/lvgl/src/lv_misc/lv_misc.mk
+include $(LVGL_DIR)/src/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/lvgl/src/lv_themes/lv_themes.mk
+include $(LVGL_DIR)/src/lv_themes/lv_themes.mk
-include $(LVGL_DIR)/lvgl/src/lv_draw/lv_draw.mk
+include $(LVGL_DIR)/src/lv_draw/lv_draw.mk
 

src/lv_conf_internal.h

@@ -1,15 +1,25 @@
 /**
  * GENERATED FILE, DO NOT EDIT IT!
- * @file lv_conf_checker.h
+ * @file lv_conf_internal.h
  * Make sure all the defines of lv_conf.h have a default value
 **/
 
-#ifndef LV_CONF_CHECKER_H
+#ifndef LV_CONF_INTERNAL_H
-#define LV_CONF_CHECKER_H
+#define LV_CONF_INTERNAL_H
 /* clang-format off */
 
 #include <stdint.h>
 
+#ifdef LV_CONF_PATH
+#define __LV_TO_STR_AUX(x) #x
+#define __LV_TO_STR(x) __LV_TO_STR_AUX(x)
+#include __LV_TO_STR(LV_CONF_PATH)
+#undef __LV_TO_STR_AUX
+#undef __LV_TO_STR
+#else
+#include "../../lv_conf.h"
+#endif
+
 /*====================
    Graphical settings
  *====================*/
@@ -218,16 +228,6 @@
  * Image decoder and cache
  *========================*/
 
-/* 1: Enable indexed (palette) images */
-#ifndef LV_IMG_CF_INDEXED
-#define LV_IMG_CF_INDEXED       1
-#endif
-
-/* 1: Enable alpha indexed images */
-#ifndef LV_IMG_CF_ALPHA
-#define LV_IMG_CF_ALPHA         1
-#endif
-
 /* Default image cache size. Image caching keeps the images opened.
  * If only the built-in image formats are used there is no real advantage of caching.
  * (I.e. no new image decoder is added)

src/lv_core/lv_core.mk

@@ -6,7 +6,7 @@ CSRCS += lv_refr.c
 CSRCS += lv_style.c
 CSRCS += lv_debug.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_core
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
+VPATH += :$(LVGL_DIR)/src/lv_core
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_core"

src/lv_core/lv_group.h

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

src/lv_core/lv_obj.h

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

src/lv_draw/lv_draw.h

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

src/lv_draw/lv_draw.mk

@@ -10,7 +10,7 @@ CSRCS += lv_img_decoder.c
 CSRCS += lv_img_cache.c
 CSRCS += lv_img_buf.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_draw
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
+VPATH += :$(LVGL_DIR)/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)lvgl/src/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_draw"

src/lv_draw/lv_img_decoder.h

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

src/lv_font/lv_font.h

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

src/lv_font/lv_font.mk

@@ -6,7 +6,7 @@ CSRCS += lv_font_roboto_22.c
 CSRCS += lv_font_roboto_28.c
 CSRCS += lv_font_unscii_8.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_font
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_font
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_font
+VPATH += :$(LVGL_DIR)/src/lv_font
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_font"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_font"

src/lv_font/lv_font_fmt_txt.h

@@ -13,12 +13,6 @@ 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>

src/lv_font/lv_symbol_def.h

@@ -5,11 +5,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef LV_CONF_INCLUDE_SIMPLE
+
-#include "lv_conf.h"
+#include "../lv_conf_internal.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 /* In the font converter use this list as range:
       61441, 61448, 61451, 61452, 61452, 61453, 61457, 61459, 61461, 61465,

src/lv_hal/lv_hal.mk

@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
 CSRCS += lv_hal_indev.c
 CSRCS += lv_hal_tick.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_hal
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
+VPATH += :$(LVGL_DIR)/src/lv_hal
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_hal"

src/lv_hal/lv_hal_indev.h

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

src/lv_hal/lv_hal_tick.c

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

src/lv_hal/lv_hal_tick.h

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

src/lv_misc/lv_anim.h

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

src/lv_misc/lv_area.c

@@ -6,11 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "../lv_conf_internal.h"
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 #include "lv_area.h"
 #include "lv_math.h"

src/lv_misc/lv_area.h

@@ -13,14 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#include "../lv_conf_internal.h"
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 /*********************
  *      DEFINES

src/lv_misc/lv_bidi.h

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

src/lv_misc/lv_color.h

@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "../lv_conf_internal.h"
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 /*Error checking*/
 #if LV_COLOR_DEPTH == 24

src/lv_misc/lv_fs.h

@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "../lv_conf_internal.h"
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 #if LV_USE_FILESYSTEM
 
@@ -34,8 +30,9 @@ extern "C" {
 /**********************
  *      TYPEDEFS
  **********************/
+
 /**
- * Errors in the filesystem module.
+ * Errors in the file system module.
  */
 enum {
     LV_FS_RES_OK = 0,

src/lv_misc/lv_gc.h

@@ -13,13 +13,6 @@ 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"

src/lv_misc/lv_log.h

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

src/lv_misc/lv_mem.h

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

src/lv_misc/lv_misc.mk

@@ -15,7 +15,7 @@ CSRCS += lv_async.c
 CSRCS += lv_printf.c
 CSRCS += lv_bidi.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_misc
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
+VPATH += :$(LVGL_DIR)/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_misc"

src/lv_misc/lv_printf.h

@@ -37,12 +37,7 @@
 extern "C" {
 #endif
 
-
+#include "../lv_conf_internal.h"
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 #if LV_SPRINTF_CUSTOM == 0
 

src/lv_misc/lv_task.h

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

src/lv_misc/lv_txt.h

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

src/lv_objx/lv_arc.h

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

src/lv_objx/lv_bar.h

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

src/lv_objx/lv_btn.h

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

src/lv_objx/lv_btnm.h

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

src/lv_objx/lv_calendar.h

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

src/lv_objx/lv_canvas.h

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

src/lv_objx/lv_cb.h

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

src/lv_objx/lv_chart.h

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

src/lv_objx/lv_cont.h

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

src/lv_objx/lv_cpicker.h

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

src/lv_objx/lv_ddlist.h

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

src/lv_objx/lv_gauge.h

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

src/lv_objx/lv_img.h

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

src/lv_objx/lv_imgbtn.h

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

src/lv_objx/lv_kb.h

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

src/lv_objx/lv_label.h

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

src/lv_objx/lv_led.h

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

src/lv_objx/lv_line.h

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

src/lv_objx/lv_list.h

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

src/lv_objx/lv_lmeter.h

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

src/lv_objx/lv_mbox.h

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