Skip to content

Commit fd7fca5

Browse files
authored
Merge branch 'master' into feature/ledc-channel-selection
2 parents f57137d + b2e7338 commit fd7fca5

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Diff for: libraries/LittleFS/src/LittleFS.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ bool LittleFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpen
8181
esp_vfs_littlefs_conf_t conf = {
8282
.base_path = basePath,
8383
.partition_label = partitionLabel_,
84+
.partition = NULL,
8485
.format_if_mount_failed = false,
86+
.read_only = false,
8587
.dont_mount = false,
8688
.grow_on_mount = true
8789
};

Diff for: libraries/SD/src/sd_diskio.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ bool sdcard_mount(uint8_t pdrv, const char* path, uint8_t max_files, bool format
818818
}
819819
//FRESULT f_mkfs (const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len);
820820
const MKFS_PARM opt = {(BYTE)FM_ANY, 0, 0, 0, 0};
821-
res = f_mkfs(drv, &opt, work, sizeof(work));
821+
res = f_mkfs(drv, &opt, work, sizeof(BYTE) * FF_MAX_SS);
822822
free(work);
823823
if (res != FR_OK) {
824824
log_e("f_mkfs failed: %s", fferr2str[res]);

0 commit comments

Comments
 (0)