iarv/Meck
1
0
Fork 1
mirror of https://github.com/pelgraine/Meck.git synced 2026-05-06 05:22:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

update readme for v1.8; added fix: robust SPIFFS recovery when auto-format fails

Browse Source 
SPIFFS.begin(true) auto-formats on mount failure, but the auto-format
itself can fail if the partition contains residual data from a previous
firmware (e.g. stock LilyGo, Meshtastic, or MeshCore with a different
partition layout). When that happens the firmware previously printed
"SPIFFS format FAILED!" and continued in a broken state with no
persistence.

Now on auto-format failure:
1. Find the SPIFFS partition via esp_partition_find_first()
2. Erase it completely with esp_partition_erase_range()
3. Call SPIFFS.format() + SPIFFS.begin(false) with up to 3 retries

Added #include <esp_partition.h> under ESP32 guard.

The existing first-boot display feedback ("Formatting storage...
First boot - please wait") is unchanged -- it fires on the initial
mount failure. The new partition erase code only triggers if the
auto-format also fails.
This commit is contained in:
pelgraine
2026-05-03 21:22:07 +10:00
parent c2bfc3c985
commit 4ba130ccfa
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
examples/companion_radio/main.cpp
View File

@@ -5,6 +5,9 @@
#if defined(ESP32) && defined(MECK_OTA_UPDATE)
#include <esp_ota_ops.h>
#endif
#ifdef ESP32
#include <esp_partition.h>
#endif
#include <Mesh.h>
#include "MyMesh.h"
#include "variant.h" // Board-specific defines (HAS_GPS, etc.)
@@ -1870,7 +1873,7 @@ void setup() {
#elif defined(ESP32)
MESH_DEBUG_PRINTLN("setup() - ESP32 filesystem init - calling SPIFFS.begin()");
if (!SPIFFS.begin(false)) {
// First boot or corrupted partition — format required (can take 1-2 minutes)
// First boot or corrupted partition -- format required (can take 1-2 minutes)
Serial.println("SPIFFS mount failed - formatting (this may take 1-2 minutes)...");
if (disp) {
disp->startFrame();
@@ -1882,7 +1885,27 @@ void setup() {
disp->endFrame();
}
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS format FAILED!");
// Auto-format failed -- partition likely contains non-SPIFFS data from
// a previous firmware. Erase the entire partition and retry.
Serial.println("SPIFFS auto-format failed -- erasing partition and retrying...");
const esp_partition_t* spiffsPart = esp_partition_find_first(
ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
if (spiffsPart) {
Serial.printf("SPIFFS partition: offset=0x%x size=0x%x -- erasing...\n",
spiffsPart->address, spiffsPart->size);
esp_partition_erase_range(spiffsPart, 0, spiffsPart->size);
}
bool spiffsMounted = false;
for (int attempt = 0; attempt < 3 && !spiffsMounted; attempt++) {
if (attempt > 0) { Serial.printf("SPIFFS retry %d/3...\n", attempt + 1); delay(500); }
SPIFFS.format();
spiffsMounted = SPIFFS.begin(false);
}
if (spiffsMounted) {
Serial.println("SPIFFS mounted after explicit format");
} else {
Serial.println("ERROR: SPIFFS mount failed after all retries");
}
} else {
Serial.println("SPIFFS format complete");
}