move lvgl files to src folder

lv_core/lv_core.mk

@@ -1,11 +0,0 @@
-CSRCS += lv_group.c
-CSRCS += lv_indev.c
-CSRCS += lv_disp.c
-CSRCS += lv_obj.c
-CSRCS += lv_refr.c
-CSRCS += lv_style.c
-
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_core
-VPATH += :$(LVGL_DIR)/lvgl/lv_core
-
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_core"

lv_hal/lv_hal.mk

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

lvgl.h

@@ -14,53 +14,54 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "lv_version.h"
+#include "src/lv_version.h"
 
-#include "lv_misc/lv_log.h"
+#include "src/lv_misc/lv_log.h"
-#include "lv_misc/lv_task.h"
+#include "src/lv_misc/lv_task.h"
+#include "src/lv_misc/lv_math.h"
 
-#include "lv_hal/lv_hal.h"
+#include "src/lv_hal/lv_hal.h"
 
-#include "lv_core/lv_obj.h"
+#include "src/lv_core/lv_obj.h"
-#include "lv_core/lv_group.h"
+#include "src/lv_core/lv_group.h"
 
-#include "lv_core/lv_refr.h"
+#include "src/lv_core/lv_refr.h"
-#include "lv_core/lv_disp.h"
+#include "src/lv_core/lv_disp.h"
 
-#include "lv_themes/lv_theme.h"
+#include "src/lv_themes/lv_theme.h"
 
-#include "lv_objx/lv_btn.h"
+#include "src/lv_objx/lv_btn.h"
-#include "lv_objx/lv_imgbtn.h"
+#include "src/lv_objx/lv_imgbtn.h"
-#include "lv_objx/lv_img.h"
+#include "src/lv_objx/lv_img.h"
-#include "lv_objx/lv_label.h"
+#include "src/lv_objx/lv_label.h"
-#include "lv_objx/lv_line.h"
+#include "src/lv_objx/lv_line.h"
-#include "lv_objx/lv_page.h"
+#include "src/lv_objx/lv_page.h"
-#include "lv_objx/lv_cont.h"
+#include "src/lv_objx/lv_cont.h"
-#include "lv_objx/lv_list.h"
+#include "src/lv_objx/lv_list.h"
-#include "lv_objx/lv_chart.h"
+#include "src/lv_objx/lv_chart.h"
-#include "lv_objx/lv_table.h"
+#include "src/lv_objx/lv_table.h"
-#include "lv_objx/lv_cb.h"
+#include "src/lv_objx/lv_cb.h"
-#include "lv_objx/lv_bar.h"
+#include "src/lv_objx/lv_bar.h"
-#include "lv_objx/lv_slider.h"
+#include "src/lv_objx/lv_slider.h"
-#include "lv_objx/lv_led.h"
+#include "src/lv_objx/lv_led.h"
-#include "lv_objx/lv_btnm.h"
+#include "src/lv_objx/lv_btnm.h"
-#include "lv_objx/lv_kb.h"
+#include "src/lv_objx/lv_kb.h"
-#include "lv_objx/lv_ddlist.h"
+#include "src/lv_objx/lv_ddlist.h"
-#include "lv_objx/lv_roller.h"
+#include "src/lv_objx/lv_roller.h"
-#include "lv_objx/lv_ta.h"
+#include "src/lv_objx/lv_ta.h"
-#include "lv_objx/lv_canvas.h"
+#include "src/lv_objx/lv_canvas.h"
-#include "lv_objx/lv_win.h"
+#include "src/lv_objx/lv_win.h"
-#include "lv_objx/lv_tabview.h"
+#include "src/lv_objx/lv_tabview.h"
-#include "lv_objx/lv_tileview.h"
+#include "src/lv_objx/lv_tileview.h"
-#include "lv_objx/lv_mbox.h"
+#include "src/lv_objx/lv_mbox.h"
-#include "lv_objx/lv_gauge.h"
+#include "src/lv_objx/lv_gauge.h"
-#include "lv_objx/lv_lmeter.h"
+#include "src/lv_objx/lv_lmeter.h"
-#include "lv_objx/lv_sw.h"
+#include "src/lv_objx/lv_sw.h"
-#include "lv_objx/lv_kb.h"
+#include "src/lv_objx/lv_kb.h"
-#include "lv_objx/lv_arc.h"
+#include "src/lv_objx/lv_arc.h"
-#include "lv_objx/lv_preload.h"
+#include "src/lv_objx/lv_preload.h"
-#include "lv_objx/lv_calendar.h"
+#include "src/lv_objx/lv_calendar.h"
-#include "lv_objx/lv_spinbox.h"
+#include "src/lv_objx/lv_spinbox.h"
 
 /*********************
  *      DEFINES

lvgl.mk

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

scrips/lv_conf_checker.py

@@ -5,8 +5,8 @@ Generates a chechker file for lv_conf.h from lv_conf_templ.h define all the not
 
 import re
 
-fin = open("lv_conf_templ.h", "r");
+fin = open("../src/lv_conf_templ.h", "r");
-fout = open("lv_conf_checker.h", "w");
+fout = open("../src/lv_conf_checker.h", "w");
 
 
 fout.write(

src/lv_conf_templ.h

@@ -353,7 +353,7 @@ typedef void * lv_obj_user_data_t;          /*Declare the type of the user data
 /*--END OF LV_CONF_H--*/
 
 /*Be sure every define has a default value*/
-#include "lvgl/lv_conf_checker.h"
+#include "lvgl/src/lv_conf_checker.h"
 
 #endif /*LV_CONF_H*/
 

src/lv_core/lv_core.mk

@@ -0,0 +1,11 @@
+CSRCS += lv_group.c
+CSRCS += lv_indev.c
+CSRCS += lv_disp.c
+CSRCS += lv_obj.c
+CSRCS += lv_refr.c
+CSRCS += lv_style.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"

src/lv_core/lv_group.h

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

src/lv_core/lv_obj.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stddef.h>

src/lv_draw/lv_draw.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_core/lv_style.h"

src/lv_draw/lv_draw.mk

@@ -7,7 +7,7 @@ CSRCS += lv_draw_img.c
 CSRCS += lv_draw_arc.c
 CSRCS += lv_draw_triangle.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_draw
-VPATH += :$(LVGL_DIR)/lvgl/lv_draw
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)lvgl/src/lv_draw"

src/lv_draw/lv_draw_basic.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_misc/lv_color.h"

src/lv_fonts/lv_font_builtin.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_misc/lv_font.h"

src/lv_fonts/lv_fonts.mk

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

src/lv_hal/lv_hal.mk

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

src/lv_hal/lv_hal_indev.h

@@ -18,7 +18,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdbool.h>

src/lv_hal/lv_hal_tick.c

@@ -9,7 +9,7 @@
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "lv_hal_tick.h"

src/lv_hal/lv_hal_tick.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 #include <stdint.h>
 #include <stdbool.h>

src/lv_misc/lv_anim.h

@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_ANIMATION

src/lv_misc/lv_color.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 /*Error checking*/

src/lv_misc/lv_font.h

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

src/lv_misc/lv_fs.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_FILESYSTEM

src/lv_misc/lv_gc.h

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

src/lv_misc/lv_log.h

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

src/lv_misc/lv_mem.h

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

src/lv_misc/lv_misc.mk

@@ -12,7 +12,7 @@ CSRCS += lv_math.c
 CSRCS += lv_log.c
 CSRCS += lv_gc.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
-VPATH += :$(LVGL_DIR)/lvgl/lv_misc
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"

src/lv_misc/lv_symbol_def.h

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

src/lv_misc/lv_task.h

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

src/lv_misc/lv_txt.h

@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdbool.h>

src/lv_objx/lv_arc.h

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

src/lv_objx/lv_bar.h

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