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

feat: improve OTA upload handling and add SPIFFS update support

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-20 11:42:36 +01:00
parent 6b966c02b3
commit 01a926a38d
1 changed files with 86 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/ota.cpp
View File

@ -8,15 +8,29 @@
const uint8_t FIRMWARE_MAGIC = 0xE9; const uint8_t FIRMWARE_MAGIC = 0xE9;
const uint8_t ESP_MAGIC = 0xE9; const uint8_t ESP_MAGIC = 0xE9;
void stopTasks() {
// Stop all tasks
vTaskSuspend(NULL);
}
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
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 uint8_t *spiffsBuffer = nullptr;
static size_t spiffsSize = 0; static size_t spiffsSize = 0;
static const uint32_t SPIFFS_START = 0x310000; // Standard SPIFFS start address in full.bin static const uint32_t SPIFFS_START = 0x310000; // SPIFFS start in full.bin
stopTasks();
vTaskDelay(100 / portTICK_PERIOD_MS);
if (!index) { if (!index) {
// Reset static variables
if (spiffsBuffer) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
contentLength = request->contentLength(); contentLength = request->contentLength();
Serial.printf("Update size: %u bytes\n", contentLength); Serial.printf("Update size: %u bytes\n", contentLength);
@ -25,12 +39,11 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
return; return;
} }
// Prüfe Magic Byte für Image-Typ
if (data[0] == ESP_MAGIC) { if (data[0] == ESP_MAGIC) {
// Normales Firmware Image oder full.bin
isFullImage = (contentLength > 0x3D0000); isFullImage = (contentLength > 0x3D0000);
if (!Update.begin(contentLength)) { // Korrektur: Bei full.bin die gesamte Größe verwenden
if (!Update.begin(contentLength, U_FLASH)) {
Serial.printf("Not enough space: %u required\n", contentLength); Serial.printf("Not enough space: %u required\n", contentLength);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
return; return;
@ -39,14 +52,14 @@ 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) { if (isFullImage) {
// Allocate buffer for SPIFFS data if it's a full image spiffsSize = 0x0F0000; // 960KB SPIFFS size
spiffsSize = 0x0F0000; // Standard SPIFFS size
spiffsBuffer = (uint8_t*)malloc(spiffsSize); spiffsBuffer = (uint8_t*)malloc(spiffsSize);
if (!spiffsBuffer) { if (!spiffsBuffer) {
Serial.println("Failed to allocate SPIFFS buffer"); Serial.println("Failed to allocate SPIFFS buffer");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
return; return;
} }
memset(spiffsBuffer, 0xFF, spiffsSize); // Initialize buffer with 0xFF
} }
} else { } else {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
@ -55,28 +68,38 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
currentOffset = 0; currentOffset = 0;
} }
// Handle SPIFFS data collection for full image if (isFullImage) {
if (isFullImage && spiffsBuffer) { // Zuerst vollständiges Firmware-Update durchführen
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
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); if (spiffsBuffer) free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}");
return;
}
}
// SPIFFS-Daten separat sammeln
if (currentOffset >= SPIFFS_START) {
uint32_t spiffsOffset = currentOffset - SPIFFS_START;
if (spiffsOffset < spiffsSize) {
size_t copyLen = min(len, spiffsSize - spiffsOffset);
memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
Serial.printf("Collecting SPIFFS data at offset %u, length %u\n", spiffsOffset, copyLen);
}
}
} else {
// Normal firmware update
if (Update.write(data, len) != len) {
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
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;
} }
} }
}
currentOffset += len; currentOffset += len;
@ -86,34 +109,57 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
if (isFullImage && spiffsBuffer) { if (isFullImage && spiffsBuffer) {
Serial.println("Starting SPIFFS update"); Serial.println("Starting SPIFFS update");
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS mount failed"); // Unmount SPIFFS first
if (SPIFFS.begin()) {
SPIFFS.end();
} }
// Update SPIFFS // Update SPIFFS
if (Update.begin(spiffsSize, U_SPIFFS)) { if (!Update.begin(spiffsSize, U_SPIFFS)) {
if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) { Serial.println("Could not begin SPIFFS update");
Serial.println("SPIFFS Write Failed");
free(spiffsBuffer); free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update failed\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
return; return;
} }
if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
Serial.println("SPIFFS Write Failed");
Update.printError(Serial);
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
return;
}
if (!Update.end(true)) { if (!Update.end(true)) {
Serial.println("SPIFFS End Failed"); Serial.println("SPIFFS End Failed");
Update.printError(Serial);
free(spiffsBuffer); free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
return; return;
} }
}
free(spiffsBuffer); free(spiffsBuffer);
spiffsBuffer = nullptr;
Serial.println("SPIFFS update complete"); Serial.println("SPIFFS update complete");
// Verify SPIFFS
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS mount after update failed");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
return;
}
SPIFFS.end();
} }
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); if (spiffsBuffer) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
String errorMsg = Update.errorString(); String errorMsg = Update.errorString();
if (errorMsg != "No Error") { if (errorMsg != "No Error") {
Update.printError(Serial); Update.printError(Serial);