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

Fix stm32 build issue

Browse Source
This commit is contained in:
fvanroie 2020-04-28 16:15:50 +02:00
parent 01a668dab9
commit 9ccd328608
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/hasp_conf.h
View File

@ -49,7 +49,7 @@
#include "hasp_spiffs.h"
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
#include "lv_zifont.h"
//#include "lv_zifont.h"
#endif
#endif

21
src/hasp.cpp
View File

@ -8,22 +8,10 @@
#include "lvgl.h"
#include "lv_conf.h"
#include "hasp_conf.h"
//#include "../lib/lvgl/src/lv_widgets/lv_roller.h"
#if HASP_USE_SPIFFS > 0
#if defined(ARDUINO_ARCH_ESP32)
#include "SPIFFS.h"
#endif
#include <FS.h> // Include the SPIFFS library
#endif
#if HASP_USE_SPIFFS > 0
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
#include "lv_zifont.h"
#endif
#endif
#include "lv_fs_if.h"
#include "hasp_debug.h"
#include "hasp_config.h"
@ -36,11 +24,6 @@
#include "hasp_attribute.h"
#include "hasp.h"
#include "hasp_conf.h"
#if HASP_USE_MQTT
#include "hasp_mqtt.h"
#endif
//#if LV_USE_HASP
/*********************
@ -377,6 +360,7 @@ void haspSetup()
/* ********** Font Initializations ********** */
defaultFont = LV_FONT_DEFAULT; // Use default font
#if HASP_USE_SPIFFS > 0
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
lv_zifont_init();
if(lv_zifont_font_init(&haspFonts[0], haspZiFontPath, 24) != 0) {
@ -384,6 +368,7 @@ void haspSetup()
} else {
defaultFont = haspFonts[0];
}
#endif
#endif
/* ********** Font Initializations ********** */