jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix F_Fat::format return false when succeed (#3220)

Browse Source 
this is due to ussage of esp_err_t result; instead of boolean, ESP_OK =0 so it is false
This commit is contained in:
Luc 2019-09-21 07:34:25 +08:00 committed by Me No Dev
parent 06a399b84a
commit 56fe2dbaff
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/FFat/src/FFat.cpp
View File

@ -76,6 +76,7 @@ void F_Fat::end()
bool F_Fat::format(bool full_wipe, char* partitionLabel) bool F_Fat::format(bool full_wipe, char* partitionLabel)
{ {
esp_err_t result; esp_err_t result;
bool res = true;
if(_wl_handle){ if(_wl_handle){
log_w("Already Mounted!"); log_w("Already Mounted!");
return false; return false;
@ -83,7 +84,10 @@ bool F_Fat::format(bool full_wipe, char* partitionLabel)
wl_handle_t temp_handle; wl_handle_t temp_handle;
// Attempt to mount to see if there is already data // Attempt to mount to see if there is already data
const esp_partition_t *ffat_partition = check_ffat_partition(partitionLabel); const esp_partition_t *ffat_partition = check_ffat_partition(partitionLabel);
if (!ffat_partition) return false; if (!ffat_partition){
log_w("No partition!");
return false;
}
result = wl_mount(ffat_partition, &temp_handle); result = wl_mount(ffat_partition, &temp_handle);
if (result == ESP_OK) { if (result == ESP_OK) {
@ -91,6 +95,9 @@ bool F_Fat::format(bool full_wipe, char* partitionLabel)
uint32_t wipe_size = full_wipe ? wl_size(temp_handle) : 16384; uint32_t wipe_size = full_wipe ? wl_size(temp_handle) : 16384;
wl_erase_range(temp_handle, 0, wipe_size); wl_erase_range(temp_handle, 0, wipe_size);
wl_unmount(temp_handle); wl_unmount(temp_handle);
} else {
res = false;
log_w("wl_mount failed!");
} }
// Now do a mount with format_if_fail (which it will) // Now do a mount with format_if_fail (which it will)
esp_vfs_fat_mount_config_t conf = { esp_vfs_fat_mount_config_t conf = {
@ -99,7 +106,11 @@ bool F_Fat::format(bool full_wipe, char* partitionLabel)
}; };
result = esp_vfs_fat_spiflash_mount("/format_ffat", partitionLabel, &conf, &temp_handle); result = esp_vfs_fat_spiflash_mount("/format_ffat", partitionLabel, &conf, &temp_handle);
esp_vfs_fat_spiflash_unmount("/format_ffat", temp_handle); esp_vfs_fat_spiflash_unmount("/format_ffat", temp_handle);
return result; if (result != ESP_OK){
res = false;
log_w("esp_vfs_fat_spiflash_mount failed!");
}
return res;
} }
size_t F_Fat::totalBytes() size_t F_Fat::totalBytes()