Skip to content
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

NRF52 - Remove file totally before opening write #5916

Merged
merged 9 commits into from
Jan 24, 2025
Merged

NRF52 - Remove file totally before opening write #5916

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
590b8e7
Remove prefs first
thebentern Jan 14, 2025
bdc9c7f
Remove file first
thebentern Jan 23, 2025
16c03d5
Remove truncate
thebentern Jan 23, 2025
08f3a35
No longer needed
thebentern Jan 23, 2025
1d89b0c
Missed a param
thebentern Jan 23, 2025
245c84a
That wasn't supposed to be there
thebentern Jan 23, 2025
b1653ee
Remove vestigal lfs assert
thebentern Jan 23, 2025
347c83d
Durr
thebentern Jan 23, 2025
fa16357
Merge branch 'master' into remove-first
thebentern Jan 23, 2025
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
9 changes: 3 additions & 6 deletions src/SafeFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ static File openFile(const char *filename, bool fullAtomic)
concurrency::LockGuard g(spiLock);
LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
#ifdef ARCH_NRF52
File file = FSCom.open(filename, FILE_O_WRITE);
file.seek(0);
return file;
lfs_assert_failed = false;
thebentern marked this conversation as resolved.
Show resolved Hide resolved
FSCom.remove(filename);
return FSCom.open(filename, FILE_O_WRITE);
#endif
if (!fullAtomic)
FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
Expand Down Expand Up @@ -59,9 +59,6 @@ bool SafeFile::close()
return false;

spiLock->lock();
#ifdef ARCH_NRF52
f.truncate();
#endif
f.close();
spiLock->unlock();

Expand Down
1 change: 0 additions & 1 deletion src/mesh/NodeDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,6 @@ bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_
bool fullAtomic)
{
bool okay = false;
#ifdef FSCom
thebentern marked this conversation as resolved.
Show resolved Hide resolved
auto f = SafeFile(filename, fullAtomic);

LOG_INFO("Save %s", filename);
Expand Down
Loading