diff --git a/lib/lv_fs_if/lv_fs_spiffs.cpp b/lib/lv_fs_if/lv_fs_spiffs.cpp index aa9ffd91..f0bbf7d9 100644 --- a/lib/lv_fs_if/lv_fs_spiffs.cpp +++ b/lib/lv_fs_if/lv_fs_spiffs.cpp @@ -21,10 +21,20 @@ #include "SPIFFS.h" #define LV_FS_SPIFFS SPIFFS #elif HASP_USE_LITTLEFS > 0 -#include "LITTLEFS.h" +#ifndef ESP_ARDUINO_VERSION_VAL +#define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) +#endif + +#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) +#include +#define LV_FS_SPIFFS LittleFS +#else +#include "LITTLEFS.h" #include "esp_littlefs.h" #define LV_FS_SPIFFS LITTLEFS +#endif // ESP_ARDUINO_VERSION + #endif #elif defined(ARDUINO_ARCH_ESP8266) #include "LittleFS.h" diff --git a/lib/lv_lib_zifont/lv_zifont.cpp b/lib/lv_lib_zifont/lv_zifont.cpp index 3d6f594d..95c68955 100644 --- a/lib/lv_lib_zifont/lv_zifont.cpp +++ b/lib/lv_lib_zifont/lv_zifont.cpp @@ -15,8 +15,20 @@ #include "SPIFFS.h" #define FS SPIFFS #elif HASP_USE_LITTLEFS > 0 + +#ifndef ESP_ARDUINO_VERSION_VAL +#define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) +#endif + +#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) +#include +#define FS LittleFS +#else #include "LITTLEFS.h" +#include "esp_littlefs.h" #define FS LITTLEFS +#endif // ESP_ARDUINO_VERSION + #endif #elif defined(ARDUINO_ARCH_ESP8266) #include "LittleFS.h" diff --git a/src/hasp_filesystem.h b/src/hasp_filesystem.h index ce7f8a7f..a11b6349 100644 --- a/src/hasp_filesystem.h +++ b/src/hasp_filesystem.h @@ -39,8 +39,20 @@ typedef struct #include "SPIFFS.h" #define HASP_FS SPIFFS #elif HASP_USE_LITTLEFS > 0 + +#ifndef ESP_ARDUINO_VERSION_VAL +#define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) +#endif + +#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) +#include +#define HASP_FS LittleFS +#else #include "LITTLEFS.h" +#include "esp_littlefs.h" #define HASP_FS LITTLEFS +#endif // ESP_ARDUINO_VERSION + #endif #elif defined(ARDUINO_ARCH_ESP8266) // included by default