From b87e2a334b18f89082cb8777c959ddde0ec0193e Mon Sep 17 00:00:00 2001
From: fvanroie <fvanroie@users.noreply.github.com>
Date: Tue, 10 Mar 2020 01:14:12 +0100
Subject: [PATCH] Update to lvgl 6.1.2

---
 include/lv_conf.h             | 6 +++---
 lib/lv_lib_qrcode/lv_qrcode.c | 2 +-
 platformio.ini                | 6 +++---
 src/lv_theme_hasp.c           | 2 +-
 src/lv_theme_hasp.h           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/lv_conf.h b/include/lv_conf.h
index 2e486ccf..ae46b1fb 100644
--- a/include/lv_conf.h
+++ b/include/lv_conf.h
@@ -139,7 +139,7 @@ typedef int16_t lv_coord_t;
  *==================*/
 
 /*1: Enable the Animations */
-#define LV_USE_ANIMATION        (LV_HIGH_RESOURCE_MCU)
+#define LV_USE_ANIMATION        1 // (LV_HIGH_RESOURCE_MCU)
 #if LV_USE_ANIMATION
 
 /*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/
@@ -494,7 +494,7 @@ typedef uint8_t  lv_obj_user_data_t;
 #endif
 
 /*Preload (dependencies: lv_arc, lv_anim)*/
-#define LV_USE_PRELOAD      (LV_HIGH_RESOURCE_MCU)
+#define LV_USE_PRELOAD      1 // (LV_HIGH_RESOURCE_MCU)
 #if LV_USE_PRELOAD != 0
 #  define LV_PRELOAD_DEF_ARC_LENGTH   60      /*[deg]*/
 #  define LV_PRELOAD_DEF_SPIN_TIME    1000    /*[ms]*/
@@ -561,7 +561,7 @@ typedef uint8_t  lv_obj_user_data_t;
 /*--END OF LV_CONF_H--*/
 
 /*Be sure every define has a default value*/
-//#include "src/lv_conf_checker.h"
+#include "lv_conf_checker.h"
 
 #endif /*LV_CONF_H*/
 
diff --git a/lib/lv_lib_qrcode/lv_qrcode.c b/lib/lv_lib_qrcode/lv_qrcode.c
index 638e488f..eb6eaee2 100644
--- a/lib/lv_lib_qrcode/lv_qrcode.c
+++ b/lib/lv_lib_qrcode/lv_qrcode.c
@@ -71,7 +71,7 @@ lv_res_t lv_qrcode_update(lv_obj_t * qrcode, const void * data, uint32_t data_le
 {
     lv_color_t c;
     c.full = 1;
-    lv_canvas_fill_bg(qrcode, c, 0);
+    lv_canvas_fill_bg(qrcode, c);
     // lv_canvas_zoom();
 
     if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV;
diff --git a/platformio.ini b/platformio.ini
index e837a11a..bfcae12f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -63,9 +63,9 @@ framework = arduino
 upload_speed = 921600
 ; -- Shared library dependencies in all environments
 lib_deps =
-    ;lvgl@^7.0.0         ; Not in library yet 
-    TFT_eSPI@^2.1.3      ; Tft SPI drivers
-    ;TFT_eSPI@^1.4.20     ; Tft SPI drivers
+    https://github.com/littlevgl/lvgl.git ;lvgl@6.1.2 - Not in library yet 
+    TFT_eSPI@^2.1.6      ; Tft SPI drivers
+    ;TFT_eSPI@^1.4.20    ; Tft SPI drivers
     PubSubClient@^2.7.0  ; MQTT client
     ArduinoJson@^6.14.1,>6.14.0  ; needs at least 6.14.1
     Syslog@^2.0.0
diff --git a/src/lv_theme_hasp.c b/src/lv_theme_hasp.c
index b5386d97..5fa2b79b 100644
--- a/src/lv_theme_hasp.c
+++ b/src/lv_theme_hasp.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lib/lvgl/src/lv_themes/lv_theme.h"
+#include "lv_themes/lv_theme.h"
 
 #if LV_USE_THEME_HASP
 
diff --git a/src/lv_theme_hasp.h b/src/lv_theme_hasp.h
index 4b27cebc..8788304c 100644
--- a/src/lv_theme_hasp.h
+++ b/src/lv_theme_hasp.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lvgl.h"
-#include "../lib/lvgl/src/lv_conf_internal.h"
+//#include "../lib/lvgl/src/lv_conf_internal.h"
 
 #if LV_USE_THEME_HASP