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

refactor: improve OTA update process with enhanced size checks and progress logging

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-20 14:31:10 +01:00
parent 5f52775984
commit 3ac7d6b4f7
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ota.cpp
View File

@ -29,9 +29,14 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
static bool isFullImage = false; static bool isFullImage = false;
static uint32_t currentOffset = 0; static uint32_t currentOffset = 0;
// Flash layout constants from partitions.csv
static const uint32_t FLASH_SIZE = 0x400000; // 4MB total
static const uint32_t APP_SIZE = 0x1E0000; // Size per app partition
static const uint32_t SPIFFS_OFFSET = 0x3D0000; // SPIFFS start
if (!index) { if (!index) {
contentLength = request->contentLength(); contentLength = request->contentLength();
Serial.printf("Update size: %u bytes\n", contentLength); Serial.printf("Update size: %u bytes (0x%X)\n", contentLength, contentLength);
if (contentLength == 0) { if (contentLength == 0) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
@ -43,48 +48,63 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
tasksAreStopped = true; tasksAreStopped = true;
} }
// Erweiterte Größenprüfung für full.bin isFullImage = (contentLength >= SPIFFS_OFFSET);
isFullImage = (contentLength >= 0x400000); // 4MB full image
if (!isFullImage) { if (!isFullImage) {
// Regular firmware update must not exceed app partition size
if (contentLength > APP_SIZE) {
Serial.printf("Firmware too large: 0x%X > 0x%X\n", contentLength, APP_SIZE);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Firmware too large\"}");
return;
}
if (!Update.begin(contentLength)) { if (!Update.begin(contentLength)) {
Serial.printf("Not enough space for firmware: %u required\n", contentLength); Serial.printf("Not enough space for firmware: %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;
} }
Serial.println("Firmware update started"); Serial.printf("Firmware update started (size: 0x%X)\n", contentLength);
} else { } else {
// Sicherstellen, dass genügend Flash-Speicher verfügbar ist // Full image update
if(!Update.begin(0x400000, U_FLASH)) { // 4MB Gesamtgröße if (contentLength > FLASH_SIZE) {
Serial.printf("Image too large: 0x%X > 0x%X\n", contentLength, FLASH_SIZE);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Image too large\"}");
return;
}
if (!Update.begin(FLASH_SIZE, U_FLASH)) {
Serial.println("Could not begin full image update"); Serial.println("Could not begin full image update");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Could not start full update\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Could not start full update\"}");
return; return;
} }
Serial.println("Full image update started"); Serial.printf("Full image update started (size: 0x%X)\n", contentLength);
} }
currentOffset = 0; currentOffset = 0;
} }
// Zusätzliche Debug-Ausgaben
if (isFullImage) {
Serial.printf("Writing at offset: 0x%X, length: %u\n", currentOffset, len);
}
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);
Serial.printf("Error at offset: 0x%X\n", currentOffset); Serial.printf("Error at offset: 0x%X of 0x%X bytes\n", currentOffset, contentLength);
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;
} }
} }
// Progress logging
if ((currentOffset % 0x40000) == 0) { // Log every 256KB
Serial.printf("Update progress: 0x%X of 0x%X bytes (%.1f%%)\n",
currentOffset,
contentLength,
(currentOffset * 100.0) / contentLength);
}
currentOffset += len; currentOffset += len;
if (final) { if (final) {
if (Update.end(true)) { if (Update.end(true)) {
Serial.println("Update complete"); Serial.printf("Update complete: 0x%X bytes written\n", currentOffset);
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();