Skip to content

AP_Filesystem: use wear levelling sector size for ESP32 FlashFS #34071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muramura wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

AP_Filesystem: use wear levelling sector size for ESP32 FlashFS #34071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions libraries/AP_Filesystem/AP_Filesystem_ESP32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@

extern const AP_HAL::HAL& hal;

#if defined(HAL_ESP32_FLASHFS)
#define ESP32_FILESYSTEM_SECTOR_SIZE FF_SS_WL
#else
#define ESP32_FILESYSTEM_SECTOR_SIZE FF_SS_SDCARD
#endif

int AP_Filesystem_ESP32::open(const char *fname, int flags, bool allow_absolute_paths)
{
#if FSDEBUG
Expand Down Expand Up @@ -170,7 +176,7 @@ int64_t AP_Filesystem_ESP32::disk_free(const char *path)
/* Get total sectors and free sectors */
fre_sect = fre_clust * fs->csize;

return (int64_t)fre_sect * FF_SS_SDCARD;
return (int64_t)fre_sect * ESP32_FILESYSTEM_SECTOR_SIZE;
}

// return total disk space in bytes
Expand All @@ -191,7 +197,7 @@ int64_t AP_Filesystem_ESP32::disk_space(const char *path)
/* Get total sectors and free sectors */
tot_sect = (fs->n_fatent - 2) * fs->csize;

return (int64_t)tot_sect * FF_SS_SDCARD;
return (int64_t)tot_sect * ESP32_FILESYSTEM_SECTOR_SIZE;
}

/*
Expand Down
Loading