move lv_fonts from lv_misc next to lv_misc

lv_core/lv_group.h

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

lv_core/lv_obj.h

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

lv_core/lv_vdb.h

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

lv_draw/lv_draw.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.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,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"

lv_draw/lv_draw_vbasic.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.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
+DEPPATH += --dep-path lvgl/lv_fonts
-VPATH += :lvgl/lv_misc/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,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"

lv_misc/lv_anim.h

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

lv_misc/lv_color.h

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

lv_misc/lv_font.h

@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -24,7 +24,7 @@ extern "C" {
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 
 /*********************
  *      DEFINES
@@ -102,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

lv_misc/lv_log.c

@@ -10,7 +10,7 @@
 #if USE_LV_LOG
 
 #if LV_LOG_PRINTF
-#include <string.h>
+#include <stdio.h>
 #endif
 /*********************
  *      DEFINES

lv_misc/lv_mem.h

@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.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
-
+#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "../../../lv_conf.h"
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
 
 /*
  * With no UTF-8 support (192-255)

lv_misc/lv_task.h

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

lv_misc/lv_txt.h

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

lv_misc/lv_ufs.h

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

lv_objx/lv_bar.h

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

lv_objx/lv_btn.h

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

lv_objx/lv_btnm.h

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

lv_objx/lv_cb.h

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

lv_objx/lv_chart.h

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

lv_objx/lv_cont.h

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

lv_objx/lv_ddlist.c

@@ -14,7 +14,7 @@
 #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,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"

lv_objx/lv_gauge.h

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

lv_objx/lv_img.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -23,7 +23,7 @@ extern "C" {
 
 #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.h

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

lv_objx/lv_label.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -24,7 +24,7 @@ extern "C" {
 #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.h

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

lv_objx/lv_line.h

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

lv_objx/lv_list.h

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

lv_objx/lv_lmeter.h

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

lv_objx/lv_mbox.h

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

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.h

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

lv_objx/lv_page.h

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

lv_objx/lv_roller.h

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

lv_objx/lv_slider.h

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

lv_objx/lv_sw.h

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

lv_objx/lv_ta.h

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

lv_objx/lv_tabview.h

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

lv_objx/lv_win.h

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

lv_themes/lv_theme.h

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

lv_themes/lv_theme_alien.h

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

lv_themes/lv_theme_default.h

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

lv_themes/lv_theme_material.h

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

lv_themes/lv_theme_mono.h

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

lv_themes/lv_theme_night.h

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

lv_themes/lv_theme_templ.h

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

lv_themes/lv_theme_zen.h

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