feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

LITTLEFS update - partition label and multiple partitions, idea copied from SPIFFS (#5023)

Browse Source 
Note, maxOpenFiles parameter is unused but kept for compatibility.
This commit is contained in:
lorol
2021-04-15 07:31:01 -04:00
committed by GitHub
parent 81b7c47203
commit 9a518cd3d7
4 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libraries/LITTLEFS/src/LITTLEFS.cpp
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
static constexpr const char LFS_NAME[] = "spiffs";
#include "vfs_api.h"
@ -20,30 +20,63 @@ extern "C" {
#include <sys/unistd.h>
#include <sys/stat.h>
#include <dirent.h>
#undef B110
#undef B1000000
#include "esp_littlefs.h"
#include "esp_littlefs.h"
}
#include "LITTLEFS.h"
using namespace fs;
LITTLEFSFS::LITTLEFSFS() : FS(FSImplPtr(new VFSImpl()))
class LITTLEFSImpl : public VFSImpl
{
public:
LITTLEFSImpl();
virtual ~LITTLEFSImpl() { }
virtual bool exists(const char* path);
};
LITTLEFSImpl::LITTLEFSImpl()
{
}
bool LITTLEFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFilesUnused)
bool LITTLEFSImpl::exists(const char* path)
{
if(esp_littlefs_mounted(LFS_NAME)){
File f = open(path, "r");
return (f == true);
}
LITTLEFSFS::LITTLEFSFS() : FS(FSImplPtr(new LITTLEFSImpl())), partitionLabel_(NULL)
{
}
LITTLEFSFS::~LITTLEFSFS()
{
if (partitionLabel_){
free(partitionLabel_);
partitionLabel_ = NULL;
}
}
bool LITTLEFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles, const char * partitionLabel)
{
if (partitionLabel_){
free(partitionLabel_);
partitionLabel_ = NULL;
}
if (partitionLabel){
partitionLabel_ = strdup(partitionLabel);
}
if(esp_littlefs_mounted(partitionLabel_)){
log_w("LITTLEFS Already Mounted!");
return true;
}
esp_vfs_littlefs_conf_t conf = {
.base_path = basePath,
.partition_label = LFS_NAME,
.partition_label = partitionLabel_,
.format_if_mount_failed = false
};
@ -63,8 +96,8 @@ bool LITTLEFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpen
void LITTLEFSFS::end()
{
if(esp_littlefs_mounted(LFS_NAME)){
esp_err_t err = esp_vfs_littlefs_unregister(LFS_NAME);
if(esp_littlefs_mounted(partitionLabel_)){
esp_err_t err = esp_vfs_littlefs_unregister(partitionLabel_);
if(err){
log_e("Unmounting LITTLEFS failed! Error: %d", err);
return;
@ -76,7 +109,7 @@ void LITTLEFSFS::end()
bool LITTLEFSFS::format()
{
disableCore0WDT();
esp_err_t err = esp_littlefs_format(LFS_NAME);
esp_err_t err = esp_littlefs_format(partitionLabel_);
enableCore0WDT();
if(err){
log_e("Formatting LITTLEFS failed! Error: %d", err);
@ -88,7 +121,7 @@ bool LITTLEFSFS::format()
size_t LITTLEFSFS::totalBytes()
{
size_t total,used;
if(esp_littlefs_info(LFS_NAME, &total, &used)){
if(esp_littlefs_info(partitionLabel_, &total, &used)){
return 0;
}
return total;
@ -97,7 +130,7 @@ size_t LITTLEFSFS::totalBytes()
size_t LITTLEFSFS::usedBytes()
{
size_t total,used;
if(esp_littlefs_info(LFS_NAME, &total, &used)){
if(esp_littlefs_info(partitionLabel_, &total, &used)){
return 0;
}
return used;