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

refactor: update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78

Browse Source
This commit is contained in:
Manuel Weiser
2025-02-20 17:04:56 +01:00
parent e5240a9572
commit 17307d8f03
11 changed files with 103 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ota.cpp
View File

@ -22,7 +22,9 @@ void stopAllTasks() {
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
if (!index) {
Serial.printf("Update Start: %s\n", filename.c_str());
bool isFullImage = filename.endsWith("full.bin");
Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
if (request->contentLength() == 0) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
return;
@ -33,9 +35,21 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
tasksAreStopped = true;
}
// Da die full.bin jetzt das korrekte Magic Byte hat,
// können wir ein normales Update ohne spezielle Flags starten
if (!Update.begin()) {
bool success;
if (isFullImage) {
// Full image update ohne Magic Byte Check, aber mit U_FLASH
success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
} else {
// Normales OTA update mit Magic Byte Check
if (data[0] != 0xE9) {
Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
return;
}
success = Update.begin(request->contentLength());
}
if (!success) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
return;