3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 110 Wiki Activity

feat: enhance OTA upload to support SPIFFS updates

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-20 11:27:11 +01:00
parent 7e776d4816
commit d5b2b2746d
1 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/ota.cpp
View File

@ -12,6 +12,9 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
static size_t contentLength = 0; static size_t contentLength = 0;
static bool isFullImage = false; static bool isFullImage = false;
static uint32_t currentOffset = 0; static uint32_t currentOffset = 0;
static uint8_t *spiffsBuffer = nullptr;
static size_t spiffsSize = 0;
static const uint32_t SPIFFS_START = 0x310000; // Standard SPIFFS start address in full.bin
if (!index) { if (!index) {
contentLength = request->contentLength(); contentLength = request->contentLength();
@ -34,6 +37,17 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
} }
Serial.println(isFullImage ? "Full image update started" : "Firmware update started"); Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
if (isFullImage) {
// Allocate buffer for SPIFFS data if it's a full image
spiffsSize = 0x0F0000; // Standard SPIFFS size
spiffsBuffer = (uint8_t*)malloc(spiffsSize);
if (!spiffsBuffer) {
Serial.println("Failed to allocate SPIFFS buffer");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
return;
}
}
} else { } else {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
return; return;
@ -41,11 +55,24 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
currentOffset = 0; currentOffset = 0;
} }
// Handle SPIFFS data collection for full image
if (isFullImage && spiffsBuffer) {
uint32_t spiffsOffset = currentOffset - SPIFFS_START;
if (currentOffset >= SPIFFS_START && spiffsOffset < spiffsSize) {
size_t copyLen = min(len, spiffsSize - spiffsOffset);
if (spiffsOffset + len > spiffsSize) {
copyLen = spiffsSize - spiffsOffset;
}
memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
}
}
// Schreibe Daten // Schreibe Daten
if (Update.write(data, len) != len) { if (Update.write(data, len) != len) {
String errorMsg = Update.errorString(); String errorMsg = Update.errorString();
if (errorMsg != "No Error") { if (errorMsg != "No Error") {
Update.printError(Serial); Update.printError(Serial);
if (spiffsBuffer) free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return; return;
} }
@ -55,11 +82,38 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
if (final) { if (final) {
if (Update.end(true)) { if (Update.end(true)) {
Serial.println("Update complete"); Serial.println("Firmware update complete");
if (isFullImage && spiffsBuffer) {
Serial.println("Starting SPIFFS update");
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS mount failed");
}
// Update SPIFFS
if (Update.begin(spiffsSize, U_SPIFFS)) {
if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
Serial.println("SPIFFS Write Failed");
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update failed\"}");
return;
}
if (!Update.end(true)) {
Serial.println("SPIFFS End Failed");
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
return;
}
}
free(spiffsBuffer);
Serial.println("SPIFFS update complete");
}
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(1000); delay(1000);
ESP.restart(); ESP.restart();
} else { } else {
if (spiffsBuffer) free(spiffsBuffer);
String errorMsg = Update.errorString(); String errorMsg = Update.errorString();
if (errorMsg != "No Error") { if (errorMsg != "No Error") {
Update.printError(Serial); Update.printError(Serial);