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

workflow: optimize firmware and SPIFFS update process, improve progress handling and logging

Browse Source
This commit is contained in:
Manuel Weiser
2025-02-22 14:04:34 +01:00
parent adb354ddcd
commit 37d43b2d7d
3 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/gitea-release.yml vendored
View File

@@ -41,7 +41,7 @@ jobs:
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with minimal header # Create SPIFFS binary with minimal header
( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin ( printf '\xe9' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary # Create full binary
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&

51
html/upgrade.html
View File

@@ -189,13 +189,6 @@
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open('POST', '/update', true); xhr.open('POST', '/update', true);
xhr.upload.onprogress = (e) => {
if (e.lengthComputable) {
const percentComplete = (e.loaded / e.total) * 100;
progress.style.width = percentComplete + '%';
progress.textContent = Math.round(percentComplete) + '%';
}
};
xhr.onload = function() { xhr.onload = function() {
try { try {
@@ -203,41 +196,27 @@
try { try {
const jsonResponse = JSON.parse(response); const jsonResponse = JSON.parse(response);
// Handle progress updates // Zeige finale Nachricht
if (jsonResponse.progress !== undefined) { status.textContent = jsonResponse.message || "Update complete";
const percent = jsonResponse.progress; status.classList.add(jsonResponse.success ? 'success' : 'error');
progress.style.width = percent + '%'; status.style.display = 'block';
progress.textContent = Math.round(percent) + '%';
return;
}
// Handle success/error messages if (jsonResponse.success) {
response = jsonResponse.message; progress.style.width = '100%';
progress.textContent = '100%';
if (jsonResponse.restart) {
status.textContent = response + " Redirecting in 20 seconds..."; // Automatischer Neustart nach erfolgreicher Aktualisierung
let countdown = 20; status.textContent = "Update successful! Restarting device...";
const timer = setInterval(() => { setTimeout(() => {
countdown--; window.location.reload();
if (countdown <= 0) { }, 5000);
clearInterval(timer); } else {
window.location.href = '/'; document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
} else {
status.textContent = response + ` Redirecting in ${countdown} seconds...`;
}
}, 1000);
} }
} catch (e) { } catch (e) {
console.error('JSON parse error:', e); console.error('JSON parse error:', e);
status.textContent = 'Update failed: Invalid response from server'; status.textContent = 'Update failed: Invalid response from server';
status.classList.add('error'); status.classList.add('error');
}
status.textContent = response;
status.classList.add(xhr.status === 200 ? 'success' : 'error');
status.style.display = 'block';
if (xhr.status !== 200) {
document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
} }
} catch (error) { } catch (error) {

36
src/website.cpp
View File

@@ -7,6 +7,7 @@
#include "nfc.h" #include "nfc.h"
#include "scale.h" #include "scale.h"
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include "esp_log.h"
#include <Update.h> #include <Update.h>
#include "display.h" #include "display.h"
@@ -393,28 +394,31 @@ void setupWebserver(AsyncWebServer &server) {
oledShowMessage("Upgrade please wait"); oledShowMessage("Upgrade please wait");
if (!index) { if (!index) {
// Reduziere Debug-Level während des Updates
esp_log_level_set("*", ESP_LOG_ERROR);
updateSize = request->contentLength(); updateSize = request->contentLength();
command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH; command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
Serial.println("Backup JSON configs..."); oledShowMessage("SPIFFS Update...");
backupJsonConfigs(); backupJsonConfigs();
// Deaktiviere alle Validierungen für SPIFFS-Updates if (!Update.begin(updateSize, command)) {
if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) {
Serial.printf("Update Begin Error: %s\n", Update.errorString());
restoreJsonConfigs(); restoreJsonConfigs();
String errorMsg = String("Update begin failed: ") + Update.errorString(); String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
} else { } else {
// Normale Validierung für Firmware-Updates oledShowMessage("Firmware Update...");
if (!Update.begin(updateSize, command)) { if (!Update.begin(updateSize, command)) {
Serial.printf("Update Begin Error: %s\n", Update.errorString());
String errorMsg = String("Update begin failed: ") + Update.errorString(); String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
} }
@@ -422,7 +426,6 @@ void setupWebserver(AsyncWebServer &server) {
if (len) { if (len) {
if (Update.write(data, len) != len) { if (Update.write(data, len) != len) {
Serial.printf("Update Write Error: %s\n", Update.errorString());
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
restoreJsonConfigs(); restoreJsonConfigs();
} }
@@ -431,23 +434,28 @@ void setupWebserver(AsyncWebServer &server) {
return; return;
} }
// Sende den Fortschritt als JSON // Update OLED Display alle 25%
String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}"; static int lastProgress = -1;
request->send(200, "application/json", progress); int currentProgress = (index + len) * 100 / updateSize;
if (currentProgress % 25 == 0 && currentProgress != lastProgress) {
lastProgress = currentProgress;
oledShowMessage(String(currentProgress) + "% complete");
}
} }
if (final) { if (final) {
if (!Update.end(true)) { if (!Update.end(true)) {
Serial.printf("Update End Error: %s\n", Update.errorString());
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
Serial.println("Restoring JSON configs...");
restoreJsonConfigs(); restoreJsonConfigs();
} }
String errorMsg = String("Update end failed: ") + Update.errorString(); String errorMsg = String("Update end failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
Serial.println("Update Success!"); // Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
} }
} }
); );