lv文件系统依然有问题 貌似是seek问题
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
#include "lv_port_fs.h"
|
||||
#include "lvgl.h"
|
||||
|
||||
|
||||
static const char *TAG = "LVGL_FS";
|
||||
/*********************
|
||||
* DEFINES
|
||||
@@ -27,17 +26,17 @@ static const char *TAG = "LVGL_FS";
|
||||
**********************/
|
||||
static void fs_init(void);
|
||||
|
||||
static void * fs_open(lv_fs_drv_t * drv, 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_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_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t whence);
|
||||
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 void *fs_open(lv_fs_drv_t *drv, 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_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_seek(lv_fs_drv_t *drv, void *file_p, uint32_t pos, lv_fs_whence_t whence);
|
||||
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 void * fs_dir_open(lv_fs_drv_t * drv, const char * path);
|
||||
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn, uint32_t fn_len);
|
||||
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * rddir_p);
|
||||
static void *fs_dir_open(lv_fs_drv_t *drv, const char *path);
|
||||
static lv_fs_res_t fs_dir_read(lv_fs_drv_t *drv, void *rddir_p, char *fn, uint32_t fn_len);
|
||||
static lv_fs_res_t fs_dir_close(lv_fs_drv_t *drv, void *rddir_p);
|
||||
|
||||
/**********************
|
||||
* STATIC VARIABLES
|
||||
@@ -70,7 +69,7 @@ void lv_port_fs_init(void)
|
||||
lv_fs_drv_init(&fs_drv);
|
||||
|
||||
/*Set up fields...*/
|
||||
fs_drv.letter = 'P';
|
||||
fs_drv.letter = 'S';
|
||||
fs_drv.open_cb = fs_open;
|
||||
fs_drv.close_cb = fs_close;
|
||||
fs_drv.read_cb = fs_read;
|
||||
@@ -95,7 +94,7 @@ static void fs_init(void)
|
||||
/*E.g. for FatFS initialize the SD card and FatFS itself*/
|
||||
|
||||
/*You code here*/
|
||||
ESP_LOGE(TAG, "fs_init");
|
||||
ESP_LOGI(TAG, "fs_init");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -105,26 +104,42 @@ static void fs_init(void)
|
||||
* @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR
|
||||
* @return a file descriptor or NULL on error
|
||||
*/
|
||||
static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
|
||||
static void *fs_open(lv_fs_drv_t *drv, const char *path, lv_fs_mode_t mode)
|
||||
{
|
||||
|
||||
ESP_LOGE(TAG, "fs_open:%s", path);
|
||||
ESP_LOGI(TAG, "fs_open:%s", path);
|
||||
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
void * f = NULL;
|
||||
void *f = NULL;
|
||||
|
||||
if(mode == LV_FS_MODE_WR) {
|
||||
if (mode == LV_FS_MODE_WR)
|
||||
{
|
||||
/*Open a file for write*/
|
||||
//f = ... /*Add your code here*/
|
||||
// f = ... /*Add your code here*/
|
||||
f = fopen(path, "wb");
|
||||
}
|
||||
else if(mode == LV_FS_MODE_RD) {
|
||||
else if (mode == LV_FS_MODE_RD)
|
||||
{
|
||||
/*Open a file for read*/
|
||||
//f = ... /*Add your code here*/
|
||||
// f = ... /*Add your code here*/
|
||||
f = fopen(path, "rb");
|
||||
}
|
||||
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) {
|
||||
else if (mode == (LV_FS_MODE_WR | LV_FS_MODE_RD))
|
||||
{
|
||||
/*Open a file for read and write*/
|
||||
//f = ... /*Add your code here*/
|
||||
// f = ... /*Add your code here*/
|
||||
f = fopen(path, "wb+");
|
||||
}
|
||||
|
||||
if (f == NULL)
|
||||
{
|
||||
res = LV_FS_RES_NOT_EX;
|
||||
ESP_LOGW(TAG, "找不到文件:%s", path);
|
||||
}
|
||||
else
|
||||
{
|
||||
res = LV_FS_RES_OK;
|
||||
}
|
||||
|
||||
return f;
|
||||
@@ -136,12 +151,24 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
|
||||
* @param file_p pointer to a file_t variable. (opened with fs_open)
|
||||
* @return LV_FS_RES_OK: no error or 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)
|
||||
{
|
||||
ESP_LOGE(TAG, "fs_close");
|
||||
ESP_LOGI(TAG, "fs_close");
|
||||
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
int r = fclose(file_p);
|
||||
|
||||
if (r != 0)
|
||||
{
|
||||
res = LV_FS_RES_UNKNOWN;
|
||||
ESP_LOGE(TAG, "文件关闭失败");
|
||||
}
|
||||
else
|
||||
{
|
||||
res = LV_FS_RES_OK;
|
||||
}
|
||||
|
||||
/*Add your code here*/
|
||||
|
||||
return res;
|
||||
@@ -156,11 +183,29 @@ static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
|
||||
* @param br the real number of read bytes (Byte Read)
|
||||
* @return LV_FS_RES_OK: no error or 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)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
/*Add your code here*/
|
||||
ESP_LOGI(TAG, "fs_read");
|
||||
|
||||
FILE *f = (FILE *)file_p;
|
||||
size_t bytes_read = fread(buf, 1, btr, f);
|
||||
*br = (uint32_t)bytes_read;
|
||||
|
||||
if (*br == btr)
|
||||
{
|
||||
res = LV_FS_RES_OK;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
ESP_LOGE(TAG, "文件读取字节数量错误需要读取%lu 已读取%lu", btr, *br);
|
||||
res = LV_FS_RES_UNKNOWN;
|
||||
}
|
||||
|
||||
ESP_LOGI(TAG, "文件读取字节数量:读取%lu 已读取%lu", btr, *br);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -174,11 +219,27 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
|
||||
* @param bw the number of real written bytes (Bytes Written). NULL if unused.
|
||||
* @return LV_FS_RES_OK: no error 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)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
/*Add your code here*/
|
||||
ESP_LOGI(TAG, "fs_write");
|
||||
|
||||
FILE *f = (FILE *)file_p;
|
||||
size_t bytes_written = fwrite(buf, 1, btw, f);
|
||||
*bw = (uint32_t)bytes_written;
|
||||
|
||||
if (*bw == btw)
|
||||
{
|
||||
res = LV_FS_RES_OK;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
ESP_LOGE(TAG, "文件写入字节数量错误需要写入%lu 已写入%lu", btw, *bw);
|
||||
res = LV_FS_RES_UNKNOWN;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -191,11 +252,40 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
|
||||
* @param whence tells from where to interpret the `pos`. See @lv_fs_whence_t
|
||||
* @return LV_FS_RES_OK: no error or 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, lv_fs_whence_t whence)
|
||||
static lv_fs_res_t fs_seek(lv_fs_drv_t *drv, void *file_p, uint32_t pos, lv_fs_whence_t whence)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
/*Add your code here*/
|
||||
ESP_LOGI(TAG, "fs_seek:pop%lu whence%d",pos,whence);
|
||||
|
||||
FILE *f = (FILE *)file_p;
|
||||
int std_whence;
|
||||
switch (whence)
|
||||
{
|
||||
case LV_FS_SEEK_SET:
|
||||
std_whence = SEEK_SET;
|
||||
break;
|
||||
case LV_FS_SEEK_CUR:
|
||||
std_whence = SEEK_CUR;
|
||||
break;
|
||||
case LV_FS_SEEK_END:
|
||||
std_whence = SEEK_END;
|
||||
break;
|
||||
default:
|
||||
// 如果传入的 whence 值不合法
|
||||
ESP_LOGE(TAG, "whence 参数错误");
|
||||
return LV_FS_RES_INV_PARAM;
|
||||
}
|
||||
|
||||
if (fseek(f, (long)pos, std_whence) != 0)
|
||||
{
|
||||
// 定位失败,返回错误
|
||||
res = LV_FS_RES_UNKNOWN; // 或更具体的错误码
|
||||
ESP_LOGE(TAG, "seek定位失败");
|
||||
}
|
||||
|
||||
res = LV_FS_RES_OK;
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -206,11 +296,23 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs
|
||||
* @param pos_p pointer to store the result
|
||||
* @return LV_FS_RES_OK: no error or 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)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
/*Add your code here*/
|
||||
ESP_LOGI(TAG, "fs_tell");
|
||||
|
||||
FILE *f = (FILE *)file_p;
|
||||
long pos = ftell(f);
|
||||
if (pos < 0)
|
||||
{
|
||||
ESP_LOGE(TAG, "tell定位失败");
|
||||
return LV_FS_RES_UNKNOWN;
|
||||
}
|
||||
*pos_p = (uint32_t)pos;
|
||||
|
||||
return LV_FS_RES_OK;
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -221,13 +323,14 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
|
||||
* @param path path to a directory
|
||||
* @return pointer to the directory read descriptor or NULL on error
|
||||
*/
|
||||
static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
|
||||
static void *fs_dir_open(lv_fs_drv_t *drv, const char *path)
|
||||
{
|
||||
ESP_LOGE(TAG, "fs_dir_open:%s", path);
|
||||
void * dir = NULL;
|
||||
void *dir = NULL;
|
||||
/*Add your code here*/
|
||||
//dir = ... /*Add your code here*/
|
||||
return dir;
|
||||
// dir = ... /*Add your code here*/
|
||||
|
||||
return dir;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -239,10 +342,12 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
|
||||
* @param fn_len length of the buffer to store the filename
|
||||
* @return LV_FS_RES_OK: no error or any error from @lv_fs_res_t enum
|
||||
*/
|
||||
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn, uint32_t fn_len)
|
||||
static lv_fs_res_t fs_dir_read(lv_fs_drv_t *drv, void *rddir_p, char *fn, uint32_t fn_len)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
ESP_LOGI(TAG, "fs_dir_read");
|
||||
|
||||
/*Add your code here*/
|
||||
|
||||
return res;
|
||||
@@ -254,11 +359,12 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn, uin
|
||||
* @param rddir_p pointer to an initialized 'lv_fs_dir_t' variable
|
||||
* @return LV_FS_RES_OK: no error or any error from @lv_fs_res_t enum
|
||||
*/
|
||||
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * rddir_p)
|
||||
static lv_fs_res_t fs_dir_close(lv_fs_drv_t *drv, void *rddir_p)
|
||||
{
|
||||
lv_fs_res_t res = LV_FS_RES_NOT_IMP;
|
||||
|
||||
/*Add your code here*/
|
||||
ESP_LOGI(TAG, "fs_dir_close");
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user