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

feat: update version to 1.2.61 and enhance OTA update error handling

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-20 10:06:06 +01:00
parent 05f275142f
commit ce3b423dc1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.2.60" version = "1.2.61"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32

22
src/ota.cpp
View File

@ -19,11 +19,21 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
// Determine if this is a full image (firmware + SPIFFS) or just firmware // Determine if this is a full image (firmware + SPIFFS) or just firmware
bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000 bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) { if (isFullImage) {
Serial.printf("Not enough space: %u required\n", contentLength); // For full images, we need to make sure we have enough space and properly partition it
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); if (!Update.begin(ESP.getFreeSketchSpace(), U_FLASH)) {
Serial.printf("Not enough space for full image: %u bytes required\n", contentLength);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Full image updates are not supported via OTA. Please use USB update for full images.\"}");
return; return;
} }
} else {
// For firmware-only updates
if (!Update.begin(contentLength, U_FLASH)) {
Serial.printf("Not enough space: %u required\n", contentLength);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available for firmware update\"}");
return;
}
}
Serial.println(isFullImage ? "Full image update started" : "Firmware update started"); Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
} }
@ -31,7 +41,8 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
// Write chunk to flash // Write chunk to flash
if (Update.write(data, len) != len) { if (Update.write(data, len) != len) {
Update.printError(Serial); Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}"); String errorMsg = Update.errorString();
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return; return;
} }
@ -42,8 +53,9 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
delay(1000); delay(1000);
ESP.restart(); ESP.restart();
} else { } else {
String errorMsg = Update.errorString();
Update.printError(Serial); Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
} }
} }
} }