dandri/HaloKeymind
1
0
Fork 0
mirror of https://github.com/mikecarper/MeshCore.git synced 2026-09-02 15:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'webconfig' into observer-firmware-dev

Browse Source
This commit is contained in:
agessaman
2026-07-19 15:49:40 -07:00
parent 25bfac0e93 4ff118ce52
commit 17e68ecc45
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/CommonCLI.cpp
+19 -6
View File
@@ -492,8 +492,16 @@ public:
_finished = false;
_open = false;
_bytes_written = 0;
_fs->remove("/mqtt_prefs.tmp"); // clear only a stale, unpublished transaction
if (_fs->exists("/mqtt_prefs.tmp")) return false;
// Clear only a stale, unpublished transaction. Guarded on exists(): on the
// normal path commit() renames the tmp away, so there is nothing to remove
// and an unconditional remove() makes the ESP32 VFS layer log
// "[E] vfs_api.cpp remove(): /mqtt_prefs.tmp does not exists" on EVERY save.
// Functionally harmless, but it looks like a fault to operators reading the
// serial log during a config change.
if (_fs->exists("/mqtt_prefs.tmp")) {
_fs->remove("/mqtt_prefs.tmp");
if (_fs->exists("/mqtt_prefs.tmp")) return false; // could not clear it
}
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
_file = _fs->open("/mqtt_prefs.tmp", FILE_O_WRITE);
#elif defined(RP2040_PLATFORM)
@@ -537,7 +545,7 @@ public:
if (_open) _file.close();
_open = false;
_finished = false;
_fs->remove("/mqtt_prefs.tmp");
if (_fs->exists("/mqtt_prefs.tmp")) _fs->remove("/mqtt_prefs.tmp");
}
private:
@@ -564,8 +572,13 @@ public:
// The old-name migration only starts when /com_prefs is absent. Refuse to
// overwrite a destination that appeared unexpectedly before this handoff.
if (_fs->exists("/com_prefs")) return false;
_fs->remove("/com_prefs.tmp"); // clear only stale, unpublished output
if (_fs->exists("/com_prefs.tmp")) return false;
// Clear only stale, unpublished output. Guarded on exists() for the same
// reason as the /mqtt_prefs store above: remove() on a missing file logs a
// spurious VFS error on ESP32.
if (_fs->exists("/com_prefs.tmp")) {
_fs->remove("/com_prefs.tmp");
if (_fs->exists("/com_prefs.tmp")) return false; // could not clear it
}
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
_file = _fs->open("/com_prefs.tmp", FILE_O_WRITE);
#elif defined(RP2040_PLATFORM)
@@ -609,7 +622,7 @@ public:
if (_open) _file.close();
_open = false;
_finished = false;
_fs->remove("/com_prefs.tmp");
if (_fs->exists("/com_prefs.tmp")) _fs->remove("/com_prefs.tmp");
}
private: