Skip to content

Include nvs_commit() on three methods #5309

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

Merged
merged 3 commits into from
Aug 23, 2021
Merged

Include nvs_commit() on three methods #5309

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe42564
Include nvs_commit() on three methods
beamholder Jun 19, 2021
e49eae0
Remove comments as requested during review.
beamholder Jul 5, 2021
186c478
Merge branch 'master' into master
igrr Aug 23, 2021
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
26 changes: 21 additions & 5 deletions libraries/Preferences/src/Preferences.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ bool Preferences::begin(const char * name, bool readOnly, const char* partition_
return true;
}

void Preferences::end(){
void Preferences::end(){ // modified to add an nvs_commit()
if(!_started){
return;
}
esp_err_t err = nvs_commit(_handle); // to undo changes: delete the lines from here...
if(err){
log_e("nvs_commit fail: %s %s", key, nvs_error(err));
} // ... to here.
nvs_close(_handle);
_started = false;
}
Expand All @@ -65,7 +69,7 @@ void Preferences::end(){
* Clear all keys in opened preferences
* */

bool Preferences::clear(){
bool Preferences::clear(){ // modified to add an nvs_commit()
if(!_started || _readOnly){
return false;
}
Expand All @@ -74,14 +78,20 @@ bool Preferences::clear(){
log_e("nvs_erase_all fail: %s", nvs_error(err));
return false;
}
return true;
// return true; // to undo changes: uncomment this line and...
err = nvs_commit(_handle); // ... delete the lines from from here...
if(err){
log_e("nvs_commit fail: %s", nvs_error(err));
return false;
}
return true; // ... to here.
}

/*
* Remove a key
* */

bool Preferences::remove(const char * key){
bool Preferences::remove(const char * key){ // modified to add an nvs_commit()
if(!_started || !key || _readOnly){
return false;
}
Expand All @@ -90,7 +100,13 @@ bool Preferences::remove(const char * key){
log_e("nvs_erase_key fail: %s %s", key, nvs_error(err));
return false;
}
return true;
// return true; // to undo changes: uncomment this line and...
err = nvs_commit(_handle); // ... delete the lines from from here...
if(err){
log_e("nvs_commit fail: %s %s", key, nvs_error(err));
return false;
}
return true; // ... to here.
}

/*
Expand Down