From 37dcfab21ddd9ff9252c8bfee11e07e14038e514 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:59:49 +0100
Subject: [PATCH] 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           | 4 ----
 library.properties     | 4 ----
 lvgl.h                 | 2 +-
 src/lv_api_map.h       | 1 +
 src/lv_misc/lv_anim.c  | 2 +-
 src/lv_misc/lv_async.h | 2 +-
 src/lv_misc/lv_gc.h    | 2 +-
 src/lv_misc/lv_timer.c | 2 +-
 8 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/library.json b/library.json
index cadc395d8..3aec465fc 100644
--- a/library.json
+++ b/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": {
diff --git a/library.properties b/library.properties
index ffb786645..25144d43b 100644
--- a/library.properties
+++ b/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
diff --git a/lvgl.h b/lvgl.h
index 649e0002f..fa007e42b 100644
--- a/lvgl.h
+++ b/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"
 
diff --git a/src/lv_api_map.h b/src/lv_api_map.h
index c3d8f5062..2cce6f37a 100644
--- a/src/lv_api_map.h
+++ b/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();
diff --git a/src/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c
index 183c125d3..d36d7008e 100644
--- a/src/lv_misc/lv_anim.c
+++ b/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"
 
diff --git a/src/lv_misc/lv_async.h b/src/lv_misc/lv_async.h
index 8e462c2ab..bca58ec97 100644
--- a/src/lv_misc/lv_async.h
+++ b/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"
 
 /*********************
diff --git a/src/lv_misc/lv_gc.h b/src/lv_misc/lv_gc.h
index 029477bf7..73861e37c 100644
--- a/src/lv_misc/lv_gc.h
+++ b/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"
 
diff --git a/src/lv_misc/lv_timer.c b/src/lv_misc/lv_timer.c
index 115ee7480..8eca3be99 100644
--- a/src/lv_misc/lv_timer.c
+++ b/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"