Skip to content
Permalink
Browse files

Fixed FFat::end. Fixes #3244 (#3245)

* Fixed FFat::end. Fixes #3244

* Missed the handle check in format
  • Loading branch information...
lbernstone authored and me-no-dev committed Sep 24, 2019
1 parent f32083a commit ca88fdc27316f20369f72b464f4d94ce65b83f60
Showing with 13 additions and 8 deletions.
  1. +12 −7 libraries/FFat/src/FFat.cpp
  2. +1 −1 libraries/FFat/src/FFat.h
@@ -40,16 +40,20 @@ const esp_partition_t *check_ffat_partition(const char* label)

bool F_Fat::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles, const char * partitionLabel)
{
if(_wl_handle){
if(_wl_handle != WL_INVALID_HANDLE){
log_w("Already Mounted!");
return true;
}

if (!check_ffat_partition(partitionLabel)) return false;
if (!check_ffat_partition(partitionLabel)){
log_e("No fat partition found on flash");
return false;
}

esp_vfs_fat_mount_config_t conf = {
.format_if_mount_failed = formatOnFail,
.max_files = maxOpenFiles
.max_files = maxOpenFiles,
.allocation_unit_size = CONFIG_WL_SECTOR_SIZE
};
esp_err_t err = esp_vfs_fat_spiflash_mount(basePath, partitionLabel, &conf, &_wl_handle);
if(err){
@@ -62,13 +66,13 @@ bool F_Fat::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles

void F_Fat::end()
{
if(_wl_handle){
if(_wl_handle != WL_INVALID_HANDLE){
esp_err_t err = esp_vfs_fat_spiflash_unmount(_impl->mountpoint(), _wl_handle);
if(err){
log_e("Unmounting FFat partition failed! Error: %d", err);
return;
}
_wl_handle = 0;
_wl_handle = WL_INVALID_HANDLE;
_impl->mountpoint(NULL);
}
}
@@ -77,7 +81,7 @@ bool F_Fat::format(bool full_wipe, char* partitionLabel)
{
esp_err_t result;
bool res = true;
if(_wl_handle){
if(_wl_handle != WL_INVALID_HANDLE){
log_w("Already Mounted!");
return false;
}
@@ -102,7 +106,8 @@ bool F_Fat::format(bool full_wipe, char* partitionLabel)
// Now do a mount with format_if_fail (which it will)
esp_vfs_fat_mount_config_t conf = {
.format_if_mount_failed = true,
.max_files = 1
.max_files = 1,
.allocation_unit_size = CONFIG_WL_SECTOR_SIZE
};
result = esp_vfs_fat_spiflash_mount("/format_ffat", partitionLabel, &conf, &temp_handle);
esp_vfs_fat_spiflash_unmount("/format_ffat", temp_handle);
@@ -37,7 +37,7 @@ class F_Fat : public FS
bool exists(const String& path);

private:
wl_handle_t _wl_handle;
wl_handle_t _wl_handle = WL_INVALID_HANDLE;
};

}

0 comments on commit ca88fdc

Please sign in to comment.
You can’t perform that action at this time.