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

Add ESP_ARDUINO_VERSION_VAL

Browse Source
This commit is contained in:
fvanroie 2021-11-05 20:02:00 +01:00
parent 471b3b56ae
commit 28bf5b55e5
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/lv_fs_if/lv_fs_spiffs.cpp
View File

@ -21,10 +21,20 @@
#include "SPIFFS.h" #include "SPIFFS.h"
#define LV_FS_SPIFFS SPIFFS #define LV_FS_SPIFFS SPIFFS
#elif HASP_USE_LITTLEFS > 0 #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 <LittleFS.h>
#define LV_FS_SPIFFS LittleFS
#else
#include "LITTLEFS.h"
#include "esp_littlefs.h" #include "esp_littlefs.h"
#define LV_FS_SPIFFS LITTLEFS #define LV_FS_SPIFFS LITTLEFS
#endif // ESP_ARDUINO_VERSION
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include "LittleFS.h" #include "LittleFS.h"

12
lib/lv_lib_zifont/lv_zifont.cpp
View File

@ -15,8 +15,20 @@
#include "SPIFFS.h" #include "SPIFFS.h"
#define FS SPIFFS #define FS SPIFFS
#elif HASP_USE_LITTLEFS > 0 #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 <LittleFS.h>
#define FS LittleFS
#else
#include "LITTLEFS.h" #include "LITTLEFS.h"
#include "esp_littlefs.h"
#define FS LITTLEFS #define FS LITTLEFS
#endif // ESP_ARDUINO_VERSION
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include "LittleFS.h" #include "LittleFS.h"

12
src/hasp_filesystem.h
View File

@ -39,8 +39,20 @@ typedef struct
#include "SPIFFS.h" #include "SPIFFS.h"
#define HASP_FS SPIFFS #define HASP_FS SPIFFS
#elif HASP_USE_LITTLEFS > 0 #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 <LittleFS.h>
#define HASP_FS LittleFS
#else
#include "LITTLEFS.h" #include "LITTLEFS.h"
#include "esp_littlefs.h"
#define HASP_FS LITTLEFS #define HASP_FS LITTLEFS
#endif // ESP_ARDUINO_VERSION
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
// included by default // included by default