move misc back to root folder

.gitmodules

+[submodule "misc"]
+	path = misc
+	url = https://github.com/littlevgl/misc

hal @ 597fd86a

+Subproject commit 597fd86a782942df3ff7486da8a23831fe73681f

lv_appx/lv_app_sysmon.c

@@ -14,7 +14,7 @@
 #include "misc/os/idle.h"
 #include "lvgl/lv_objx/lv_chart.h"
 #include "lvgl/lv_app/lv_app_util/lv_app_notice.h"
-#include "hal/systick/systick.h"
+#include "../hal/systick/systick.h"
 
 /*********************
  *      DEFINES

lv_draw/lv_draw.c

@@ -6,17 +6,17 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <misc/gfx/circ.h>
 #include "lv_conf.h"
 
 #include <stdio.h>
 #include <stdbool.h>
-#include "misc/gfx/text.h"
 #include "lv_draw.h"
-#include "misc/fs/fsint.h"
-#include "misc/math/math_base.h"
 #include "lv_draw_rbasic.h"
 #include "lv_draw_vbasic.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_rbasic.c

@@ -8,7 +8,7 @@
  *********************/
 #include "lv_draw_rbasic.h"
 #include "lv_conf.h"
-#include "hal/disp/disp.h"
+#include "../hal/disp/hal_disp.h"
 #include "misc/gfx/font.h"
 
 /*********************
@@ -77,7 +77,7 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
         
     
     if(union_ok != false){
-    	disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
+    	//TODO disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
     }
 }
 
@@ -192,7 +192,7 @@ void lv_rmap(const area_t * cords_p, const area_t * mask_p,
         cord_t row;
         cord_t mask_w = area_get_width(&masked_a) - 1;
         for(row = 0; row < area_get_height(&masked_a); row++) {
-            disp_map(masked_a.x1, masked_a.y1 + row, masked_a.x1 + mask_w, masked_a.y1 + row, map_p);
+            //TODO disp_map(masked_a.x1, masked_a.y1 + row, masked_a.x1 + mask_w, masked_a.y1 + row, map_p);
 
             map_p += map_width;
         }

lv_draw/lv_draw_vbasic.c

@@ -10,7 +10,7 @@
 #include "misc/gfx/area.h"
 #include "misc/gfx/font.h"
 #include "misc/gfx/color.h"
-#include "hal/disp/disp.h"
+#include "../hal/disp/hal_disp.h"
 
 #if LV_VDB_SIZE != 0
 

lv_obj/lv_dispi.c

@@ -12,8 +12,8 @@
 #include "misc/math/math_base.h"
 #include "lv_dispi.h"
 #include "../lv_draw/lv_draw_rbasic.h"
-#include "hal/indev/indev.h"
-#include "hal/systick/systick.h"
+#include "../hal/indev/hal_indev.h"
+#include "../hal/systick/systick.h"
 #include "lv_obj.h"
 
 /*********************
@@ -41,7 +41,7 @@ static void dispi_drag_throw(lv_dispi_t * dispi_p);
 static ptask_t* dispi_task_p;
 static bool lv_dispi_reset_qry;
 static bool lv_dispi_reset_now;
-static lv_dispi_t dispi_array[INDEV_NUM];
+static lv_dispi_t dispi_array[2];
 
 /**********************
  *      MACROS
@@ -145,12 +145,14 @@ void lv_dispi_wait_release(lv_dispi_t * dispi)
  */
 static void dispi_task(void * param)
 {
+
+    return; //TODO
 	cord_t x;
 	cord_t y;
 	uint8_t i;
 
-	for (i = 0; i < INDEV_NUM; i++) {
-		dispi_array[i].pressed = indev_get(i, &x, &y);
+	for (i = 0; i < 1; i++) {
+	    //TODO dispi_array[i].pressed = indev_get(i, &x, &y);
 		dispi_proc_point(&dispi_array[i], x, y);
 	}
 

lv_obj/lv_obj.c

@@ -16,7 +16,7 @@
 #include "lv_group.h"
 #include "../lv_app/lv_app.h"
 #include "misc/gfx/anim.h"
-#include "hal/indev/indev.h"
+#include "../hal/indev/hal_indev.h"
 #include <stdint.h>
 #include <string.h>
 
@@ -293,24 +293,25 @@ void lv_obj_del(lv_obj_t * obj)
     /*Delete the base objects*/
     if(obj->ext != NULL)  dm_free(obj->ext);
     dm_free(obj); /*Free the object itself*/
-    
-    /* Reset all display input (dispi) if
-     * the currently pressed object is deleted too*/
-    lv_dispi_t * dispi_array = lv_dispi_get_array();
-    lv_obj_t * dpar;
-    uint8_t d;
-    for(d = 0; d < INDEV_NUM; d++) {
-        dpar = obj;
-        while(dpar != NULL) {
-            if(dispi_array[d].act_obj == dpar ||
-               dispi_array[d].last_obj == dpar) {
-                lv_dispi_reset();
-                break;
-            } else {
-                dpar = lv_obj_get_parent(dpar);
-            }
-        }
-    }
+
+//     TODO Update with the new HAL
+//    /* Reset all display input (dispi) if
+//     * the currently pressed object is deleted too*/
+//    lv_dispi_t * dispi_array = lv_dispi_get_array();
+//    lv_obj_t * dpar;
+//    uint8_t d;
+//    for(d = 0; d < INDEV_NUM; d++) {
+//        dpar = obj;
+//        while(dpar != NULL) {
+//            if(dispi_array[d].act_obj == dpar ||
+//               dispi_array[d].last_obj == dpar) {
+//                lv_dispi_reset();
+//                break;
+//            } else {
+//                dpar = lv_obj_get_parent(dpar);
+//            }
+//        }
+//    }
 
     /*Send a signal to the parent to notify it about the child delete*/
     if(par != NULL) {

lv_obj/lv_obj.h

@@ -14,9 +14,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include <misc/gfx/area.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include "misc/gfx/area.h"
 #include "misc/mem/dyn_mem.h"
 #include "misc/mem/linked_list.h"
 #include "misc/gfx/color.h"

lv_obj/lv_refr.c

@@ -12,7 +12,7 @@
 #include "misc/mem/fifo.h"
 #include "lv_refr.h"
 #include "lv_vdb.h"
-#include "hal/systick/systick.h"
+#include "../hal/systick/systick.h"
 
 /*********************
  *      DEFINES

lv_obj/lv_vdb.c

@@ -5,7 +5,7 @@
 #include "lv_conf.h"
 #if LV_VDB_SIZE != 0
 
-#include "hal/disp/disp.h"
+#include "../hal/disp/hal_disp.h"
 #include <stddef.h>
 #include "lv_vdb.h"
 
@@ -146,7 +146,7 @@ void lv_vdb_flush(void)
 
 	/* Now the full the VDB is filtered and the result is stored in the first quarter of it
 	 * Write out the filtered map to the display*/
-    disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf);
+	//TODO disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf);
 #endif
 }
 

lv_objx/lv_roller.c

@@ -224,8 +224,6 @@ bool roller_scrl_signal(lv_obj_t * roller_scrl, lv_signal_t sign, void * param)
             cord_t mid = (roller->cords.y2 - roller->cords.y1) / 2;
 
             int32_t id = (mid - label_y1) / label_unit;
-
-            printf("roller diff: %d , unit: %d, id: %d\n", mid-label_y1, label_unit, id);
         }
     }
 

lv_objx/lv_ta.c

@@ -14,11 +14,8 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "misc/gfx/anim.h"
-<<<<<<< ebfe8fbfd4d93bd0e09a8b16e96e623c5c6be0f2
 #include "misc/gfx/text.h"
-=======
 #include "misc/math/math_base.h"
->>>>>>> lv_ta: cursor style bugfix on '\n'
 
 /*********************
  *      DEFINES
@@ -874,8 +871,6 @@ static bool lv_ta_scrling_design(lv_obj_t * scrl, const area_t * mask, lv_design
 #endif
 
 		uint32_t letter = txt_utf8_next(&txt[byte_pos], NULL);
-		printf("letter %d\n", letter);
-		cord_t letter_w = font_get_width(label_style->font, letter != '\0' ? letter : ' ');
 		cord_t letter_h = font_get_height(label_style->font) >> FONT_ANTIALIAS;
 
         /*Set letter_w (set not 0 on non printable but valid chars)*/