jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make driver pointers static for v8

Browse Source
This commit is contained in:
fvanroie 2021-03-16 17:37:37 +01:00
parent 66efad3aa8
commit 793682161c
4 changed files with 171 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
lib/lv_fs_if/lv_fs_fatfs.c
View File

@ -21,30 +21,30 @@
**********************/ **********************/
/* Create a type to store the required data about your file.*/ /* Create a type to store the required data about your file.*/
typedef FIL file_t; typedef FIL 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 DIR dir_t; typedef DIR dir_t;
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static void fs_init(void); static void fs_init(void);
static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode); static lv_fs_res_t fs_open(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode);
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);
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);
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);
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);
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);
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);
static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path); static lv_fs_res_t fs_remove(lv_fs_drv_t* drv, const char* path);
static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p); 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);
static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p); static lv_fs_res_t fs_free(lv_fs_drv_t* drv, uint32_t* total_p, uint32_t* free_p);
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);
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);
static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p); static lv_fs_res_t fs_dir_close(lv_fs_drv_t* drv, void* dir_p);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@ -70,28 +70,28 @@ void lv_fs_if_fatfs_init(void)
*--------------------------------------------------*/ *--------------------------------------------------*/
/* Add a simple drive to open images */ /* Add a simple drive to open images */
lv_fs_drv_t fs_drv; /*A driver descriptor*/ static lv_fs_drv_t fs_drv; /*A driver descriptor*/
lv_fs_drv_init(&fs_drv); lv_fs_drv_init(&fs_drv);
/*Set up fields...*/ /*Set up fields...*/
fs_drv.file_size = sizeof(file_t); fs_drv.file_size = sizeof(file_t);
fs_drv.letter = LV_FS_IF_FATFS; fs_drv.letter = LV_FS_IF_FATFS;
fs_drv.open_cb = fs_open; fs_drv.open_cb = fs_open;
fs_drv.close_cb = fs_close; fs_drv.close_cb = fs_close;
fs_drv.read_cb = fs_read; fs_drv.read_cb = fs_read;
fs_drv.write_cb = fs_write; fs_drv.write_cb = fs_write;
fs_drv.seek_cb = fs_seek; fs_drv.seek_cb = fs_seek;
fs_drv.tell_cb = fs_tell; fs_drv.tell_cb = fs_tell;
fs_drv.free_space_cb = fs_free; fs_drv.free_space_cb = fs_free;
fs_drv.size_cb = fs_size; fs_drv.size_cb = fs_size;
fs_drv.remove_cb = fs_remove; fs_drv.remove_cb = fs_remove;
fs_drv.rename_cb = fs_rename; fs_drv.rename_cb = fs_rename;
fs_drv.trunc_cb = fs_trunc; fs_drv.trunc_cb = fs_trunc;
fs_drv.rddir_size = sizeof(dir_t); fs_drv.rddir_size = sizeof(dir_t);
fs_drv.dir_close_cb = fs_dir_close; fs_drv.dir_close_cb = fs_dir_close;
fs_drv.dir_open_cb = fs_dir_open; fs_drv.dir_open_cb = fs_dir_open;
fs_drv.dir_read_cb = fs_dir_read; fs_drv.dir_read_cb = fs_dir_read;
lv_fs_drv_register(&fs_drv); lv_fs_drv_register(&fs_drv);
} }
@ -115,25 +115,27 @@ static void fs_init(void)
* @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR * @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) static lv_fs_res_t fs_open(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode)
{ {
uint8_t flags = 0; uint8_t flags = 0;
if(mode == LV_FS_MODE_WR) flags = FA_WRITE | FA_OPEN_ALWAYS; if(mode == LV_FS_MODE_WR)
else if(mode == LV_FS_MODE_RD) flags = FA_READ; flags = FA_WRITE | FA_OPEN_ALWAYS;
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) flags = FA_READ | FA_WRITE | FA_OPEN_ALWAYS; else if(mode == LV_FS_MODE_RD)
flags = FA_READ;
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD))
flags = FA_READ | FA_WRITE | FA_OPEN_ALWAYS;
FRESULT res = f_open(file_p, path, flags); FRESULT res = f_open(file_p, path, flags);
if(res == FR_OK) { if(res == FR_OK) {
f_lseek(file_p, 0); f_lseek(file_p, 0);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
} }
/** /**
* Close an opened file * Close an opened file
* @param drv pointer to a driver where this function belongs * @param drv pointer to a driver where this function belongs
@ -141,7 +143,7 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path,
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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)
{ {
f_close(file_p); f_close(file_p);
return LV_FS_RES_OK; return LV_FS_RES_OK;
@ -157,11 +159,13 @@ static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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)
{ {
FRESULT res = f_read(file_p, buf, btr, (UINT*)br); FRESULT res = f_read(file_p, buf, btr, (UINT*)br);
if(res == FR_OK) return LV_FS_RES_OK; if(res == FR_OK)
else return LV_FS_RES_UNKNOWN; return LV_FS_RES_OK;
else
return LV_FS_RES_UNKNOWN;
} }
/** /**
@ -173,11 +177,13 @@ static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32
* @param br the number of real written bytes (Bytes Written). NULL if unused. * @param br the number of real written bytes (Bytes Written). NULL if unused.
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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)
{ {
FRESULT res = f_write(file_p, buf, btw, (UINT*)bw); FRESULT res = f_write(file_p, buf, btw, (UINT*)bw);
if(res == FR_OK) return LV_FS_RES_OK; if(res == FR_OK)
else return LV_FS_RES_UNKNOWN; return LV_FS_RES_OK;
else
return LV_FS_RES_UNKNOWN;
} }
/** /**
@ -188,7 +194,7 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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)
{ {
f_lseek(file_p, pos); f_lseek(file_p, pos);
return LV_FS_RES_OK; return LV_FS_RES_OK;
@ -201,9 +207,9 @@ static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos)
* @param size pointer to a variable to store the size * @param size pointer to a variable to store the size
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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)
{ {
(*size_p) = f_size(((file_t *)file_p)); (*size_p) = f_size(((file_t*)file_p));
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@ -215,9 +221,9 @@ static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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)
{ {
*pos_p = f_tell(((file_t *)file_p)); *pos_p = f_tell(((file_t*)file_p));
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@ -227,7 +233,7 @@ static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
* @param path path of the file to delete * @param path path of the file to delete
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path) static lv_fs_res_t fs_remove(lv_fs_drv_t* drv, const char* path)
{ {
lv_fs_res_t res = LV_FS_RES_NOT_IMP; lv_fs_res_t res = LV_FS_RES_NOT_IMP;
@ -243,9 +249,9 @@ static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p) static lv_fs_res_t fs_trunc(lv_fs_drv_t* drv, void* file_p)
{ {
f_sync(file_p); /*If not syncronized fclose can write the truncated part*/ f_sync(file_p); /*If not syncronized fclose can write the truncated part*/
f_truncate(file_p); f_truncate(file_p);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@ -257,13 +263,15 @@ static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p)
* @param newname path with the new name * @param newname path with the new name
* @return LV_FS_RES_OK or any error from 'fs_res_t' * @return LV_FS_RES_OK or any error from 'fs_res_t'
*/ */
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)
{ {
FRESULT res = f_rename(oldname, newname); FRESULT res = f_rename(oldname, newname);
if(res == FR_OK) return LV_FS_RES_OK; if(res == FR_OK)
else return LV_FS_RES_UNKNOWN; return LV_FS_RES_OK;
else
return LV_FS_RES_UNKNOWN;
} }
/** /**
@ -274,7 +282,7 @@ static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const cha
* @param free_p pointer to store the free size [kB] * @param free_p pointer to store the free size [kB]
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p) static lv_fs_res_t fs_free(lv_fs_drv_t* drv, uint32_t* total_p, uint32_t* free_p)
{ {
lv_fs_res_t res = LV_FS_RES_NOT_IMP; lv_fs_res_t res = LV_FS_RES_NOT_IMP;
@ -290,11 +298,13 @@ static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * fr
* @param path path to a directory * @param path path to a directory
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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)
{ {
FRESULT res = f_opendir(dir_p, path); FRESULT res = f_opendir(dir_p, path);
if(res == FR_OK) return LV_FS_RES_OK; if(res == FR_OK)
else return LV_FS_RES_UNKNOWN; return LV_FS_RES_OK;
else
return LV_FS_RES_UNKNOWN;
} }
/** /**
@ -305,21 +315,21 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat
* @param fn pointer to a buffer to store the filename * @param fn pointer to a buffer to store the filename
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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)
{ {
FRESULT res; FRESULT res;
FILINFO fno; FILINFO fno;
fn[0] = '\0'; fn[0] = '\0';
do { do {
res = f_readdir(dir_p, &fno); res = f_readdir(dir_p, &fno);
if(res != FR_OK) return LV_FS_RES_UNKNOWN; if(res != FR_OK) return LV_FS_RES_UNKNOWN;
if(fno.fattrib & AM_DIR) { if(fno.fattrib & AM_DIR) {
fn[0] = '/'; fn[0] = '/';
strcpy(&fn[1], fno.fname); strcpy(&fn[1], fno.fname);
} } else
else strcpy(fn, fno.fname); strcpy(fn, fno.fname);
} while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0); } while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0);
@ -332,11 +342,11 @@ static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn)
* @param dir_p pointer to an initialized 'fs_read_dir_t' variable * @param dir_p pointer to an initialized 'fs_read_dir_t' variable
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p) static lv_fs_res_t fs_dir_close(lv_fs_drv_t* drv, void* dir_p)
{ {
f_closedir(dir_p); f_closedir(dir_p);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
#endif /*LV_USE_FS_IF*/ #endif /*LV_USE_FS_IF*/
#endif /*LV_FS_IF_FATFS*/ #endif /*LV_FS_IF_FATFS*/

2
lib/lv_fs_if/lv_fs_pc.c
View File

@ -87,7 +87,7 @@ void lv_fs_if_pc_init(void)
*--------------------------------------------------*/ *--------------------------------------------------*/
/* Add a simple drive to open images */ /* Add a simple drive to open images */
lv_fs_drv_t fs_drv; /*A driver descriptor*/ static lv_fs_drv_t fs_drv; /*A driver descriptor*/
lv_fs_drv_init(&fs_drv); lv_fs_drv_init(&fs_drv);
/*Set up fields...*/ /*Set up fields...*/

156
lib/lv_fs_if/lv_fs_spiffs.cpp
View File

@ -14,27 +14,27 @@
#include "ArduinoLog.h" #include "ArduinoLog.h"
#if LV_USE_FS_IF #if LV_USE_FS_IF
#if LV_FS_IF_SPIFFS != '\0' #if LV_FS_IF_SPIFFS != '\0'
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#if HASP_USE_SPIFFS > 0 #if HASP_USE_SPIFFS > 0
#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" #include "LITTLEFS.h"
#define LV_FS_SPIFFS LITTLEFS #define LV_FS_SPIFFS LITTLEFS
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include "LittleFS.h" #include "LittleFS.h"
#define LV_FS_SPIFFS LittleFS #define LV_FS_SPIFFS LittleFS
#endif // ARDUINO_ARCH #endif // ARDUINO_ARCH
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
#include <FS.h> #include <FS.h>
#include <Esp.h> #include <Esp.h>
#endif // ARDUINO_ARCH #endif // ARDUINO_ARCH
#define TAG_LVFS 91 #define TAG_LVFS 91
/********************* /*********************
* DEFINES * DEFINES
@ -47,34 +47,34 @@
/* Create a type to store the required data about your file.*/ /* Create a type to store the required data about your file.*/
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 */
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
typedef File lv_spiffs_dir_t; typedef File lv_spiffs_dir_t;
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
typedef Dir lv_spiffs_dir_t; typedef Dir lv_spiffs_dir_t;
#define FILE_READ "r" #define FILE_READ "r"
#define FILE_WRITE "r+" #define FILE_WRITE "r+"
#endif #endif
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static void fs_init(void); static void fs_init(void);
static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode); static lv_fs_res_t fs_open(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode);
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);
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);
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);
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);
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);
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);
static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path); static lv_fs_res_t fs_remove(lv_fs_drv_t* drv, const char* path);
static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p); 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);
static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p); static lv_fs_res_t fs_free(lv_fs_drv_t* drv, uint32_t* total_p, uint32_t* free_p);
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);
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);
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p); static lv_fs_res_t fs_dir_close(lv_fs_drv_t* drv, void* dir_p);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@ -100,7 +100,7 @@ void lv_fs_if_spiffs_init(void)
*--------------------------------------------------*/ *--------------------------------------------------*/
/* Add a simple drive to open images */ /* Add a simple drive to open images */
lv_fs_drv_t fs_drv; /*A driver descriptor*/ static lv_fs_drv_t fs_drv; /*A driver descriptor*/
lv_fs_drv_init(&fs_drv); lv_fs_drv_init(&fs_drv);
/*Set up fields...*/ /*Set up fields...*/
@ -144,14 +144,14 @@ static void fs_init(void)
* @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR * @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) static lv_fs_res_t fs_open(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
char filename[32]; char filename[32];
snprintf_P(filename, sizeof(filename), PSTR("/%s"), path); snprintf_P(filename, sizeof(filename), PSTR("/%s"), path);
lv_spiffs_file_t * fp = (lv_spiffs_file_t *)file_p; lv_spiffs_file_t* fp = (lv_spiffs_file_t*)file_p;
if(fp == NULL) return LV_FS_RES_INV_PARAM; if(fp == NULL) return LV_FS_RES_INV_PARAM;
LOG_VERBOSE(TAG_LVFS, F("Opening %s"), filename); LOG_VERBOSE(TAG_LVFS, F("Opening %s"), filename);
@ -186,10 +186,10 @@ static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path,
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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* fp = (lv_spiffs_file_t*)file_p;
if(fp == NULL) return LV_FS_RES_INV_PARAM; if(fp == NULL) return LV_FS_RES_INV_PARAM;
lv_spiffs_file_t file = *fp; lv_spiffs_file_t file = *fp;
@ -217,10 +217,10 @@ static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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;
if(fp == NULL) return LV_FS_RES_INV_PARAM; if(fp == NULL) return LV_FS_RES_INV_PARAM;
lv_spiffs_file_t file = *fp; lv_spiffs_file_t file = *fp;
@ -232,7 +232,7 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
} else { } else {
// LOG_VERBOSE(TAG_LVFS, F("Reading %u bytes from %s at position %u"), btr, file.name(), file.position()); // LOG_VERBOSE(TAG_LVFS, F("Reading %u bytes from %s at position %u"), btr, file.name(), file.position());
uint32_t len = 0; uint32_t len = 0;
char * chp = (char *)buf; char* chp = (char*)buf;
if(chp != NULL && btr > 0) if(chp != NULL && btr > 0)
len = file.readBytes(chp, btr); len = file.readBytes(chp, btr);
else else
@ -257,10 +257,10 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
* @param br the number of real written bytes (Bytes Written). NULL if unused. * @param br the number of real written bytes (Bytes Written). NULL if unused.
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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 file = *(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) {
@ -268,7 +268,7 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
return LV_FS_RES_NOT_EX; return LV_FS_RES_NOT_EX;
} else { } else {
*bw = (uint32_t)file.write((byte *)buf, btw); *bw = (uint32_t)file.write((byte*)buf, btw);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
} }
@ -281,10 +281,10 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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 file = *(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) {
@ -304,10 +304,10 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos)
* @param size pointer to a variable to store the size * @param size pointer to a variable to store the size
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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 file = *(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) {
@ -328,10 +328,10 @@ static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
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 file = *(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) {
@ -350,7 +350,7 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
* @param path path of the file to delete * @param path path of the file to delete
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path) static lv_fs_res_t fs_remove(lv_fs_drv_t* drv, const char* path)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
@ -375,7 +375,7 @@ static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path)
* @return LV_FS_RES_OK: no error, the file is read * @return LV_FS_RES_OK: no error, the file is read
* any error from lv_fs_res_t enum * any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p) static lv_fs_res_t fs_trunc(lv_fs_drv_t* drv, void* file_p)
{ {
return LV_FS_RES_NOT_IMP; return LV_FS_RES_NOT_IMP;
} }
@ -387,7 +387,7 @@ static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p)
* @param newname path with the new name * @param newname path with the new name
* @return LV_FS_RES_OK or any error from 'fs_res_t' * @return LV_FS_RES_OK or any error from 'fs_res_t'
*/ */
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 fromname[32];
@ -411,23 +411,23 @@ static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char
* @param free_p pointer to store the free size [kB] * @param free_p pointer to store the free size [kB]
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p) static lv_fs_res_t fs_free(lv_fs_drv_t* drv, uint32_t* total_p, uint32_t* free_p)
{ {
(void)drv; /*Unused*/ (void)drv; /*Unused*/
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
FSInfo fs_info; FSInfo fs_info;
LV_FS_SPIFFS.info(fs_info); LV_FS_SPIFFS.info(fs_info);
*total_p = (uint32_t)fs_info.totalBytes; *total_p = (uint32_t)fs_info.totalBytes;
*free_p = (uint32_t)fs_info.totalBytes - fs_info.usedBytes; *free_p = (uint32_t)fs_info.totalBytes - fs_info.usedBytes;
return LV_FS_RES_OK; return LV_FS_RES_OK;
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
*total_p = (uint32_t)LV_FS_SPIFFS.totalBytes(); *total_p = (uint32_t)LV_FS_SPIFFS.totalBytes();
*free_p = (uint32_t)LV_FS_SPIFFS.totalBytes() - LV_FS_SPIFFS.usedBytes(); *free_p = (uint32_t)LV_FS_SPIFFS.totalBytes() - LV_FS_SPIFFS.usedBytes();
return LV_FS_RES_OK; return LV_FS_RES_OK;
#endif #endif
return LV_FS_RES_NOT_IMP; return LV_FS_RES_NOT_IMP;
} }
@ -439,23 +439,23 @@ static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * fre
* @param path path to a directory * @param path path to a directory
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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;
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
dir = LV_FS_SPIFFS.open(path); dir = LV_FS_SPIFFS.open(path);
if(!dir) { if(!dir) {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
#endif #endif
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
dir = LV_FS_SPIFFS.openDir(path); dir = LV_FS_SPIFFS.openDir(path);
#endif #endif
lv_spiffs_dir_t * dp = (lv_spiffs_dir_t *)dir_p; /*Just avoid the confusing casings*/ lv_spiffs_dir_t* dp = (lv_spiffs_dir_t*)dir_p; /*Just avoid the confusing casings*/
*dp = dir; *dp = dir;
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@ -467,11 +467,11 @@ static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * pat
* @param fn pointer to a buffer to store the filename * @param fn pointer to a buffer to store the filename
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
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*/
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
File file = dir.openNextFile(); File file = dir.openNextFile();
if(file) { if(file) {
strcpy(fn, file.name()); strcpy(fn, file.name());
@ -479,16 +479,16 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
#endif #endif
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
if(dir.next()) { if(dir.next()) {
strcpy(fn, dir.fileName().c_str()); strcpy(fn, dir.fileName().c_str());
return LV_FS_RES_OK; return LV_FS_RES_OK;
} else { } else {
return LV_FS_RES_UNKNOWN; return LV_FS_RES_UNKNOWN;
} }
#endif #endif
return LV_FS_RES_NOT_IMP; return LV_FS_RES_NOT_IMP;
} }
@ -499,12 +499,12 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
* @param dir_p pointer to an initialized 'fs_read_dir_t' variable * @param dir_p pointer to an initialized 'fs_read_dir_t' variable
* @return LV_FS_RES_OK or any error from lv_fs_res_t enum * @return LV_FS_RES_OK or any error from lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p) static lv_fs_res_t fs_dir_close(lv_fs_drv_t* drv, void* dir_p)
{ {
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
#endif /*LV_USE_FS_IF*/ #endif /*LV_USE_FS_IF*/
#endif /*LV_FS_IF_SPIFFS*/ #endif /*LV_FS_IF_SPIFFS*/
#endif /*ARDUINO*/ #endif /*ARDUINO*/

4
src/hasp_gui.cpp
View File

@ -168,7 +168,7 @@ void guiSetup(void)
} }
/* Initialize the display driver */ /* Initialize the display driver */
lv_disp_drv_t disp_drv; static lv_disp_drv_t disp_drv;
lv_disp_drv_init(&disp_drv); lv_disp_drv_init(&disp_drv);
disp_drv.buffer = &disp_buf; disp_drv.buffer = &disp_buf;
disp_drv.flush_cb = gui_flush_cb; disp_drv.flush_cb = gui_flush_cb;
@ -220,7 +220,7 @@ void guiSetup(void)
LOG_VERBOSE(TAG_LVGL, F("VFB size : %d"), (size_t)sizeof(lv_color_t) * guiVDBsize); LOG_VERBOSE(TAG_LVGL, F("VFB size : %d"), (size_t)sizeof(lv_color_t) * guiVDBsize);
/* Initialize the touch pad */ /* Initialize the touch pad */
lv_indev_drv_t indev_drv; static lv_indev_drv_t indev_drv;
lv_indev_drv_init(&indev_drv); lv_indev_drv_init(&indev_drv);
indev_drv.type = LV_INDEV_TYPE_POINTER; indev_drv.type = LV_INDEV_TYPE_POINTER;
#if defined(WINDOWS) || defined(POSIX) #if defined(WINDOWS) || defined(POSIX)