Fix "lv_timer.h" includes in dev (#1943)

* Fix "lv_timer.h" includes

* Kick CI

* Merge incoming changes

* refactor(scroll): lv_obj_scroll_to_obj -> lv_obj_scroll_to_child

* kick CI

Co-authored-by: fvanroie <cpt_jack@msn.com>
Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com>
Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>

library.json

@@ -1,10 +1,6 @@
 {
 	"name": "lvgl",
-<<<<<<< HEAD
     "version": "8.0.0",
-=======
-    "version": "7.8.1",
->>>>>>> master
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {

library.properties

@@ -1,9 +1,5 @@
 name=lvgl
-<<<<<<< HEAD
 version=8.0.0
-=======
-version=7.8.1
->>>>>>> master
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems

lvgl.h

@@ -24,7 +24,7 @@ extern "C" {
  *********************/
 
 #include "src/lv_misc/lv_log.h"
-#include <lvgl/src/lv_misc/lv_timer.h>
+#include "src/lv_misc/lv_timer.h"
 #include "src/lv_misc/lv_math.h"
 #include "src/lv_misc/lv_async.h"
 

src/lv_api_map.h

@@ -27,6 +27,7 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
+
 static inline LV_ATTRIBUTE_TIMER_HANDLER uint32_t lv_task_handler(void)
 {
     return lv_timer_handler();

src/lv_misc/lv_anim.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include "../lv_misc/lv_debug.h"
 #include "../lv_hal/lv_hal_tick.h"
-#include <lvgl/src/lv_misc/lv_timer.h>
+#include "lv_timer.h"
 #include "lv_math.h"
 #include "lv_gc.h"
 

src/lv_misc/lv_async.h

@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include <lvgl/src/lv_misc/lv_timer.h>
+#include "lv_timer.h"
 #include "lv_types.h"
 
 /*********************

src/lv_misc/lv_gc.h

@@ -17,7 +17,7 @@ extern "C" {
 #include <stdbool.h>
 #include "lv_mem.h"
 #include "lv_ll.h"
-#include <lvgl/src/lv_misc/lv_timer.h>
+#include "lv_timer.h"
 #include "../lv_draw/lv_img_cache.h"
 #include "../lv_draw/lv_draw_mask.h"
 

src/lv_misc/lv_timer.c

@@ -5,7 +5,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <lvgl/src/lv_misc/lv_timer.h>
+#include "lv_timer.h"
 #include <stddef.h>
 #include "../lv_misc/lv_debug.h"
 #include "../lv_hal/lv_hal_tick.h"