From 23448f3c86bb3ceec770c23be8c35ec3e24a9112 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Wed, 25 Nov 2020 13:40:34 +0100 Subject: [PATCH] Add support for LittleFS --- lib/lv_lib_zifont/lv_zifont.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/lv_lib_zifont/lv_zifont.cpp b/lib/lv_lib_zifont/lv_zifont.cpp index 385eaf63..3c072c35 100644 --- a/lib/lv_lib_zifont/lv_zifont.cpp +++ b/lib/lv_lib_zifont/lv_zifont.cpp @@ -1,12 +1,30 @@ /********************* * INCLUDES *********************/ +#include #include -#ifdef ESP32 + +#if defined(ARDUINO_ARCH_ESP32) +#if HASP_USE_SPIFFS > 0 #include "SPIFFS.h" +#elif HASP_USE_LITTLEFS > 0 +#include "LITTLEFS.h" #endif +#elif defined(ARDUINO_ARCH_ESP8266) +// included by default +#endif // ARDUINO_ARCH + +#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) #include +#include + +#if HASP_USE_SPIFFS > 0 +#define FS SPIFFS +#elif HASP_USE_LITTLEFS > 0 +#define FS LITTLEFS +#endif // HASP_USE +#endif // ARDUINO_ARCH #include "lvgl.h" #include "lv_misc/lv_debug.h" @@ -79,7 +97,7 @@ static inline bool openFont(File & file, const char * filename) { if(*filename != '/') return false; - file = SPIFFS.open(filename, "r"); + file = FS.open(filename, "r"); if(!file) { Log.error(TAG_FONT, F("Opening font: %s"), filename); return false;