jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to lvgl 6.1.2

Browse Source
This commit is contained in:
fvanroie 2020-03-10 01:14:12 +01:00
parent 111e99cf13
commit b87e2a334b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/lv_conf.h
View File

@ -139,7 +139,7 @@ typedef int16_t lv_coord_t;
*==================*/ *==================*/
/*1: Enable the Animations */ /*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 #if LV_USE_ANIMATION
/*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/ /*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 #endif
/*Preload (dependencies: lv_arc, lv_anim)*/ /*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 #if LV_USE_PRELOAD != 0
# define LV_PRELOAD_DEF_ARC_LENGTH 60 /*[deg]*/ # define LV_PRELOAD_DEF_ARC_LENGTH 60 /*[deg]*/
# define LV_PRELOAD_DEF_SPIN_TIME 1000 /*[ms]*/ # 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--*/ /*--END OF LV_CONF_H--*/
/*Be sure every define has a default value*/ /*Be sure every define has a default value*/
//#include "src/lv_conf_checker.h" #include "lv_conf_checker.h"
#endif /*LV_CONF_H*/ #endif /*LV_CONF_H*/

2
lib/lv_lib_qrcode/lv_qrcode.c
View File

@ -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; lv_color_t c;
c.full = 1; c.full = 1;
lv_canvas_fill_bg(qrcode, c, 0); lv_canvas_fill_bg(qrcode, c);
// lv_canvas_zoom(); // lv_canvas_zoom();
if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV; if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV;

6
platformio.ini
View File

@ -63,9 +63,9 @@ framework = arduino
upload_speed = 921600 upload_speed = 921600
; -- Shared library dependencies in all environments ; -- Shared library dependencies in all environments
lib_deps = lib_deps =
;lvgl@^7.0.0 ; Not in library yet https://github.com/littlevgl/lvgl.git ;lvgl@6.1.2 - Not in library yet
TFT_eSPI@^2.1.3 ; Tft SPI drivers TFT_eSPI@^2.1.6 ; Tft SPI drivers
;TFT_eSPI@^1.4.20 ; Tft SPI drivers ;TFT_eSPI@^1.4.20 ; Tft SPI drivers
PubSubClient@^2.7.0 ; MQTT client PubSubClient@^2.7.0 ; MQTT client
ArduinoJson@^6.14.1,>6.14.0 ; needs at least 6.14.1 ArduinoJson@^6.14.1,>6.14.0 ; needs at least 6.14.1
Syslog@^2.0.0 Syslog@^2.0.0

2
src/lv_theme_hasp.c
View File

@ -6,7 +6,7 @@
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#include "../lib/lvgl/src/lv_themes/lv_theme.h" #include "lv_themes/lv_theme.h"
#if LV_USE_THEME_HASP #if LV_USE_THEME_HASP

2
src/lv_theme_hasp.h
View File

@ -14,7 +14,7 @@ extern "C" {
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lvgl.h" #include "lvgl.h"
#include "../lib/lvgl/src/lv_conf_internal.h" //#include "../lib/lvgl/src/lv_conf_internal.h"
#if LV_USE_THEME_HASP #if LV_USE_THEME_HASP