revert include paths

lv_draw/lv_draw.c

@@ -13,11 +13,11 @@
 #include "lv_draw.h"
 #include "lv_draw_rbasic.h"
 #include "lv_draw_vbasic.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/gfx/circ.h"
-#include "lvgl/misc/fs/fsint.h"
-#include "lvgl/misc/math/math_base.h"
-#include "lvgl/misc/fs/ufs/ufs.h"
+#include "misc/gfx/text.h"
+#include "misc/gfx/circ.h"
+#include "misc/fs/fsint.h"
+#include "misc/math/math_base.h"
+#include "misc/fs/ufs/ufs.h"
 #include "../lv_objx/lv_img.h"
 
 /*********************

lv_draw/lv_draw.h

@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "misc_conf.h"
-#include "lvgl/misc/gfx/text.h"
+#include "misc/gfx/text.h"
 #include "../lv_obj/lv_style.h"
 
 /*********************

lv_draw/lv_draw_rbasic.c

@@ -9,7 +9,7 @@
 #include "../lv_hal/lv_hal_disp.h"
 #include "lv_draw_rbasic.h"
 #include "lv_conf.h"
-#include "lvgl/misc/gfx/font.h"
+#include "misc/gfx/font.h"
 
 /*********************
  *      DEFINES

lv_draw/lv_draw_rbasic.h

@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/gfx/font.h"
+#include "misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/gfx/font.h"
 
 /*********************
  *      DEFINES

lv_draw/lv_draw_vbasic.c

@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include "../lv_hal/lv_hal_disp.h"
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/gfx/font.h"
-#include "lvgl/misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/gfx/font.h"
+#include "misc/gfx/color.h"
 
 #if LV_VDB_SIZE != 0
 

lv_draw/lv_draw_vbasic.h

@@ -17,9 +17,9 @@ extern "C" {
 
 #if LV_VDB_SIZE != 0
 
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/gfx/font.h"
+#include "misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/gfx/font.h"
 
 /*********************
  *      DEFINES

lv_hal/lv_hal_disp.c

@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "../lv_hal/lv_hal_disp.h"
-#include "lvgl/misc/mem/dyn_mem.h"
+#include "misc/mem/dyn_mem.h"
 
 /*********************
  *      DEFINES

lv_hal/lv_hal_disp.h

@@ -18,7 +18,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_hal.h"
-#include "lvgl/misc/gfx/color.h"
+#include "misc/gfx/color.h"
 
 /*********************
  *      DEFINES

lv_hal/lv_hal_indev.c

@@ -9,7 +9,7 @@
  *      INCLUDES
  *********************/
 #include "../lv_hal/lv_hal_indev.h"
-#include "lvgl/misc/mem/linked_list.h"
+#include "misc/mem/linked_list.h"
 
 /*********************
  *      DEFINES

lv_hal/lv_hal_indev.h

@@ -18,7 +18,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 #include "lv_hal.h"
-#include "lvgl/misc/gfx/area.h"
+#include "misc/gfx/area.h"
 
 /*********************
  *      DEFINES

lv_obj/lv_indev.c

@@ -11,8 +11,8 @@
 
 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_obj/lv_group.h"
-#include "lvgl/misc/os/ptask.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/os/ptask.h"
+#include "misc/math/math_base.h"
 #include "../lv_draw/lv_draw_rbasic.h"
 #include "lv_obj.h"
 

lv_obj/lv_obj.c

@@ -14,7 +14,7 @@
 #include "../lv_draw/lv_draw_rbasic.h"
 #include "lv_refr.h"
 #include "lv_group.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/anim.h"
 #include <stdint.h>
 #include <string.h>
 

lv_obj/lv_obj.h

@@ -16,10 +16,10 @@ extern "C" {
 #include "lv_conf.h"
 #include <stddef.h>
 #include <stdbool.h>
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/mem/dyn_mem.h"
-#include "lvgl/misc/mem/linked_list.h"
-#include "lvgl/misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/mem/dyn_mem.h"
+#include "misc/mem/linked_list.h"
+#include "misc/gfx/color.h"
 #include "lv_style.h"
 
 /*********************

lv_obj/lv_refr.c

@@ -11,8 +11,8 @@
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_vdb.h"
-#include "lvgl/misc/os/ptask.h"
-#include "lvgl/misc/mem/fifo.h"
+#include "misc/os/ptask.h"
+#include "misc/mem/fifo.h"
 
 /*********************
  *      DEFINES

lv_obj/lv_style.c

@@ -9,7 +9,7 @@
 #include "lv_conf.h"
 #include "lv_style.h"
 #include "lv_obj.h"
-#include "lvgl/misc/mem/dyn_mem.h"
+#include "misc/mem/dyn_mem.h"
 
 /*********************
  *      DEFINES

lv_obj/lv_style.h

@@ -14,10 +14,10 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/gfx/font.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/gfx/font.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_obj/lv_vdb.h

@@ -17,8 +17,8 @@ extern "C" {
 
 #if LV_VDB_SIZE != 0
 
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/gfx/area.h"
+#include "misc/gfx/color.h"
+#include "misc/gfx/area.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_bar.c

@@ -14,7 +14,7 @@
 #include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/anim.h"
 #include <stdio.h>
 
 /*********************

lv_objx/lv_btn.c

@@ -15,8 +15,8 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/area.h"
-#include "lvgl/misc/gfx/color.h"
+#include "misc/gfx/area.h"
+#include "misc/gfx/color.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_btnm.c

@@ -14,7 +14,7 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_obj/lv_refr.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/text.h"
+#include "misc/gfx/text.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_cont.c

@@ -18,10 +18,10 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_vbasic.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/area.h"
+#include "misc/gfx/area.h"
 
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/gfx/color.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_ddlist.c

@@ -15,8 +15,8 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_obj/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/fonts/symbol_def.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/fonts/symbol_def.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_gauge.c

@@ -13,9 +13,9 @@
 #include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/math/trigo.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/gfx/text.h"
+#include "misc/math/trigo.h"
+#include "misc/math/math_base.h"
 #include <stdio.h>
 #include <string.h>
 

lv_objx/lv_img.c

@@ -13,9 +13,9 @@
 #include "lv_img.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/fs/fsint.h"
-#include "lvgl/misc/fs/ufs/ufs.h"
-#include "lvgl/misc/gfx/text.h"
+#include "misc/fs/fsint.h"
+#include "misc/fs/ufs/ufs.h"
+#include "misc/gfx/text.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_img.h

@@ -18,7 +18,7 @@ extern "C" {
 #if USE_LV_IMG != 0 && USE_FSINT != 0
 
 #include "../lv_obj/lv_obj.h"
-#include "lvgl/misc/fs/fsint.h"
+#include "misc/fs/fsint.h"
 
 #ifndef LV_IMG_ENABLE_SYMBOLS
 #define LV_IMG_ENABLE_SYMBOLS 0
@@ -26,7 +26,7 @@ extern "C" {
 
 #if LV_IMG_ENABLE_SYMBOLS != 0
 #include "lv_label.h"
-#include "lvgl/misc/gfx/fonts/symbol_def.h"
+#include "misc/gfx/fonts/symbol_def.h"
 #endif
 
 /*********************

lv_objx/lv_label.c

@@ -13,11 +13,11 @@
 #include "../lv_obj/lv_obj.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "lvgl/misc/gfx/color.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/math/math_base.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/color.h"
+#include "misc/gfx/text.h"
+#include "misc/math/math_base.h"
+#include "misc/gfx/text.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_label.h

@@ -17,9 +17,9 @@ extern "C" {
 #if USE_LV_LABEL != 0
 
 #include "../lv_obj/lv_obj.h"
-#include "lvgl/misc/gfx/font.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/gfx/fonts/symbol_def.h"
+#include "misc/gfx/font.h"
+#include "misc/gfx/text.h"
+#include "misc/gfx/fonts/symbol_def.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_line.c

@@ -11,7 +11,7 @@
 #if USE_LV_LINE != 0
 #include "lv_line.h"
 #include "../lv_draw/lv_draw.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/math/math_base.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

lv_objx/lv_list.c

@@ -12,8 +12,8 @@
 #include "lv_list.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/anim.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/gfx/anim.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_lmeter.c

@@ -13,7 +13,7 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_obj/lv_group.h"
-#include "lvgl/misc/math/trigo.h"
+#include "misc/math/trigo.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_mbox.c

@@ -13,8 +13,8 @@
 #include "lv_mbox.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/anim.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/gfx/anim.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_page.c

@@ -9,13 +9,13 @@
 #include "lv_conf.h"
 #if USE_LV_PAGE != 0
 
-#include "lvgl/misc/math/math_base.h"
+#include "misc/math/math_base.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_obj/lv_refr.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_slider.c

@@ -13,7 +13,7 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_ta.c

@@ -14,9 +14,9 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/anim.h"
-#include "lvgl/misc/gfx/text.h"
-#include "lvgl/misc/math/math_base.h"
+#include "misc/gfx/anim.h"
+#include "misc/gfx/text.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_tabview.c

@@ -12,7 +12,7 @@
 #include "lv_tabview.h"
 #include "lv_btnm.h"
 #include "../lv_themes/lv_theme.h"
-#include "lvgl/misc/gfx/anim.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lvgl.h

@@ -15,8 +15,8 @@ extern "C" {
  *********************/
 
 /*Test misc. module version*/
-#include "lvgl/misc/misc.h"
-#include "lvgl/misc/os/ptask.h"
+#include "misc/misc.h"
+#include "misc/os/ptask.h"
 
 #include "lv_hal/lv_hal.h"