From 4d469c8f8674eb2317019fb739804e5f5800a9c9 Mon Sep 17 00:00:00 2001 From: lbernstone Date: Thu, 28 Dec 2023 02:46:09 -1000 Subject: [PATCH 1/2] Added missing identifiers in esp_vfs_littlefs_conf_t (#9046) --- libraries/LittleFS/src/LittleFS.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/LittleFS/src/LittleFS.cpp b/libraries/LittleFS/src/LittleFS.cpp index f23a3cfe611..f20b4f16b4c 100644 --- a/libraries/LittleFS/src/LittleFS.cpp +++ b/libraries/LittleFS/src/LittleFS.cpp @@ -81,7 +81,9 @@ bool LittleFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpen esp_vfs_littlefs_conf_t conf = { .base_path = basePath, .partition_label = partitionLabel_, + .partition = NULL, .format_if_mount_failed = false, + .read_only = false, .dont_mount = false, .grow_on_mount = true }; From b2e7338a5e8529b5ede0a8fc7d95703074be093c Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 28 Dec 2023 23:46:47 +1100 Subject: [PATCH 2/2] SD library: Fix format (#9034) Pass correct work buffer size to f_mkfs --- libraries/SD/src/sd_diskio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/SD/src/sd_diskio.cpp b/libraries/SD/src/sd_diskio.cpp index f6a8df5e42b..1de4dd70078 100644 --- a/libraries/SD/src/sd_diskio.cpp +++ b/libraries/SD/src/sd_diskio.cpp @@ -818,7 +818,7 @@ bool sdcard_mount(uint8_t pdrv, const char* path, uint8_t max_files, bool format } //FRESULT f_mkfs (const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len); const MKFS_PARM opt = {(BYTE)FM_ANY, 0, 0, 0, 0}; - res = f_mkfs(drv, &opt, work, sizeof(work)); + res = f_mkfs(drv, &opt, work, sizeof(BYTE) * FF_MAX_SS); free(work); if (res != FR_OK) { log_e("f_mkfs failed: %s", fferr2str[res]);