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

Update spiffs fs driver

Browse Source
This commit is contained in:
fvanroie 2020-04-20 17:53:34 +02:00
parent 2c06912ac3
commit 7b8710ff35
4 changed files with 113 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/lv_conf.h
View File

@ -178,11 +178,11 @@ typedef void* lv_group_user_data_t;
typedef void* lv_fs_drv_user_data_t; typedef void* lv_fs_drv_user_data_t;
/*File system interface*/ /*File system interface*/
#define LV_USE_FS_IF 0 #define LV_USE_FS_IF (LV_HIGH_RESOURCE_MCU)
#if LV_USE_FS_IF #if LV_USE_FS_IF
# define LV_FS_IF_FATFS '\0' # define LV_FS_IF_FATFS '\0'
# define LV_FS_IF_PC '\0' # define LV_FS_IF_PC '\0'
# define LV_FS_IF_SPIFFS '\0' # define LV_FS_IF_SPIFFS 'F' // internal Flash
#endif /*LV_USE_FS_IF*/ #endif /*LV_USE_FS_IF*/
#endif #endif

2
lib/lv_fs_if/README.md
View File

@ -3,6 +3,7 @@
LittlevGL has a [File system](https://docs.littlevgl.com/en/html/overview/file-system.html) module to attach memories which can manipulate with files. Here you can find interfaces to LittlevGL has a [File system](https://docs.littlevgl.com/en/html/overview/file-system.html) module to attach memories which can manipulate with files. Here you can find interfaces to
- FATFS - FATFS
- PC (Linux and Windows) - PC (Linux and Windows)
- SPIFFS (ESP32 and ESP8266)
file systems. file systems.
You still need to provide the drivers and libraries, this repo gives "only" the bridge between FATFS/PC/etc and LittlevGL. You still need to provide the drivers and libraries, this repo gives "only" the bridge between FATFS/PC/etc and LittlevGL.
@ -15,6 +16,7 @@ You still need to provide the drivers and libraries, this repo gives "only" the
#if LV_USE_FS_IF #if LV_USE_FS_IF
# define LV_FS_IF_FATFS '\0' # define LV_FS_IF_FATFS '\0'
# define LV_FS_IF_PC '\0' # define LV_FS_IF_PC '\0'
# define LV_FS_IF_SPIFFS 'F'
#endif /*LV_USE_FS_IF*/ #endif /*LV_USE_FS_IF*/
``` ```

156
lib/lv_fs_if/lv_fs_spiffs.cpp
View File

@ -6,7 +6,7 @@
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
//#include <Arduino.h> #include <Arduino.h>
#include "lv_fs_if.h" #include "lv_fs_if.h"
#include "lv_fs_spiffs.h" #include "lv_fs_spiffs.h"
#include "ArduinoLog.h" #include "ArduinoLog.h"
@ -31,7 +31,13 @@
typedef File lv_spiffs_file_t; typedef File lv_spiffs_file_t;
/*Similarly to `file_t` create a type for directory reading too */ /*Similarly to `file_t` create a type for directory reading too */
typedef File * lv_spiffs_dir_t; #if defined(ARDUINO_ARCH_ESP32)
typedef File lv_spiffs_dir_t;
#elif defined(ARDUINO_ARCH_ESP8266)
typedef Dir lv_spiffs_dir_t;
#define FILE_READ "r"
#define FILE_WRITE "r+"
#endif
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
@ -129,20 +135,25 @@ static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path,
snprintf_P(filename, sizeof(filename), PSTR("/%s"), path); snprintf_P(filename, sizeof(filename), PSTR("/%s"), path);
Log.verbose(F("LVFS: Opening %s"), filename); Log.verbose(F("LVFS: Opening %s"), filename);
File f = SPIFFS.open(filename, mode == LV_FS_MODE_WR ? FILE_WRITE : FILE_READ); File file = SPIFFS.open(filename, mode == LV_FS_MODE_WR ? FILE_WRITE : FILE_READ);
if(!f) return LV_FS_RES_NOT_EX;
Log.verbose(F("LVFS: Opened %s"), filename); Log.verbose(F("LVFS: %d"), __LINE__);
if(!file) {
return LV_FS_RES_NOT_EX;
if(!f || f.isDirectory()) { } else if(file.isDirectory()) {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} else { } else {
f.seek(0, SeekSet); // f.seek(0, SeekSet);
Log.verbose(F("LVFS: Assigning %s"), f.name()); // Log.verbose(F("LVFS: Assigning %s"), f.name());
Log.verbose(F("LVFS: %d"), __LINE__);
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; /*Just avoid the confusing casings*/ lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; /*Just avoid the confusing casings*/
Log.verbose(F("LVFS: Copying %s"), f.name()); // Log.verbose(F("LVFS: Copying %s"), f.name());
*fp = f; Log.verbose(F("LVFS: %d"), __LINE__);
// memcpy(*file_p,&f,sizeof(lv_spiffs_file_t)); *fp = file;
// memcpy(fp,&file,sizeof(lv_spiffs_file_t));
Log.verbose(F("LVFS: %d"), __LINE__);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
} }
@ -157,16 +168,17 @@ static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path,
static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p) static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t file = *(lv_spiffs_file_t *)file_p;
File file = *fp; // File file = fp;
//file = SPIFFS.open("/background.bin");
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
if(!file || file.isDirectory()) { } else if(file.isDirectory()) {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} else { } else {
file.close(); file.close();
return LV_FS_RES_OK; return LV_FS_RES_OK;
@ -186,21 +198,19 @@ static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br) static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t *fp = (lv_spiffs_file_t *)file_p;
File file = *fp; lv_spiffs_file_t file = *fp;
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
} else {
// Log.verbose(F("LVFS: Reading %u bytes from %s at position %u"), btr, file.name(), file.position()); // Log.verbose(F("LVFS: Reading %u bytes from %s at position %u"), btr, file.name(), file.position());
*br = (uint32_t)file.readBytes((char *)buf, btr);
int len = file.readBytes((char *)buf, btr); Serial.print("!");
// Log.verbose(F("LVFS: Read %u bytes from %s at position %u"), len, file.name(), file.position());
*br = (uint32_t)len;
return LV_FS_RES_OK; return LV_FS_RES_OK;
}
} }
/** /**
@ -215,16 +225,17 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw) static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t file = *(lv_spiffs_file_t *)file_p;
File file = *fp; // File file = fp;
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
*bw = file.write((byte *)buf, btw); } else {
*bw = (uint32_t)file.write((byte *)buf, btw);
return LV_FS_RES_OK; return LV_FS_RES_OK;
}
} }
/** /**
@ -238,16 +249,17 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos) static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t file = *(lv_spiffs_file_t *)file_p;
File file = *fp; // File file = fp;
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
} else {
file.seek(pos, SeekSet); file.seek(pos, SeekSet);
return LV_FS_RES_OK; return LV_FS_RES_OK;
}
} }
/** /**
@ -260,17 +272,17 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos)
static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p) static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t file = *(lv_spiffs_file_t *)file_p;
File file = *fp; // File file = fp;
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
} else {
*size_p = (uint32_t)file.size(); *size_p = (uint32_t)file.size();
return LV_FS_RES_OK; return LV_FS_RES_OK;
}
} }
/** /**
@ -284,17 +296,17 @@ static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t file = *(lv_spiffs_file_t *)file_p;
File file = *fp; // File file = fp;
if(!file) { if(!file) {
Log.verbose(F("LVFS: Invalid file")); // Log.verbose(F("LVFS: Invalid file"));
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
}
} else {
*pos_p = (uint32_t)file.position(); *pos_p = (uint32_t)file.position();
return LV_FS_RES_OK; return LV_FS_RES_OK;
}
} }
/** /**
@ -307,8 +319,15 @@ static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
if(SPIFFS.remove(path)) { char filename[32];
snprintf_P(filename, sizeof(filename), PSTR("/%s"), path);
if(!SPIFFS.exists(filename)) {
return LV_FS_RES_NOT_EX;
} else if(SPIFFS.remove(filename)) {
return LV_FS_RES_OK; return LV_FS_RES_OK;
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
@ -336,8 +355,13 @@ static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p)
static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname) static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
char fromname[32];
char toname[32];
if(SPIFFS.rename(oldname, newname)) { snprintf_P(fromname, sizeof(fromname), PSTR("/%s"), oldname);
snprintf_P(toname, sizeof(toname), PSTR("/%s"), newname);
if(SPIFFS.rename(fromname, toname)) {
return LV_FS_RES_OK; return LV_FS_RES_OK;
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
@ -382,19 +406,22 @@ static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * fre
*/ */
static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path) static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path)
{ {
lv_spiffs_dir_t dir = (lv_spiffs_dir_t)dir_p; /*Convert type*/ lv_spiffs_dir_t dir;
Serial.print("Open directory: "); #if defined(ARDUINO_ARCH_ESP32)
Serial.println(path); dir = SPIFFS.open(path);
Serial.flush(); if(!dir) {
*dir = SPIFFS.open(path, "r");
if(*dir) {
dir_p = &dir;
return LV_FS_RES_OK;
} else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
#endif
#if defined(ARDUINO_ARCH_ESP8266)
dir = SPIFFS.openDir(path);
#endif
lv_spiffs_dir_t * dp = (lv_spiffs_dir_t *)dir_p; /*Just avoid the confusing casings*/
*dp = dir;
return LV_FS_RES_OK;
} }
/** /**
@ -407,15 +434,28 @@ static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * pat
*/ */
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn) static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
{ {
lv_spiffs_dir_t dir = (lv_spiffs_dir_t)dir_p; /*Convert type*/ lv_spiffs_dir_t dir = *(lv_spiffs_dir_t *)dir_p; /*Convert type*/
File file = dir->openNextFile();
#if defined(ARDUINO_ARCH_ESP32)
File file = dir.openNextFile();
if(file) { if(file) {
strcpy(fn, file.name()); strcpy(fn, file.name());
return LV_FS_RES_OK; return LV_FS_RES_OK;
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
#endif
#if defined(ARDUINO_ARCH_ESP8266)
if(dir.next()) {
strcpy(fn, dir.fileName().c_str());
return LV_FS_RES_OK;
} else {
return LV_FS_RES_UNKNOWN;
}
#endif
return LV_FS_RES_NOT_IMP;
} }
/** /**

3
src/hasp_gui.cpp
View File

@ -638,7 +638,8 @@ void guiSetup()
/* Initialize Filesystems */ /* Initialize Filesystems */
#if LV_USE_FS_IF != 0 #if LV_USE_FS_IF != 0
lv_fs_if_init(); lv_fs_init(); // lvgl File System
lv_fs_if_init(); // auxilary file system drivers
#endif #endif
/* Dump TFT Cofiguration */ /* Dump TFT Cofiguration */