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

docs: update upgrade page message and improve progress display logic

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-22 17:53:51 +01:00
parent 7b52066378
commit 8c5e7e26ac
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html/upgrade.html
View File

@ -206,10 +206,10 @@
progress.textContent = '100%'; progress.textContent = '100%';
// Automatischer Neustart nach erfolgreicher Aktualisierung // Automatischer Neustart nach erfolgreicher Aktualisierung
status.textContent = "Update successful! Restarting device..."; status.textContent = "Update successful! Restarting device... The page will reload in 30 seconds.";
setTimeout(() => { setTimeout(() => {
window.location.reload(); window.location.href = '/';
}, 5000); }, 30000);
} else { } else {
document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
} }

11
src/website.cpp
View File

@ -438,13 +438,18 @@ void setupWebserver(AsyncWebServer &server) {
return; return;
} }
// Update OLED Display alle 25% // Update OLED Display alle 5% und Webseite bei jeder Änderung
static int lastProgress = -1; static int lastProgress = -1;
int currentProgress = (index + len) * 100 / updateSize; int currentProgress = (index + len) * 100 / updateSize;
if (currentProgress % 25 == 0 && currentProgress != lastProgress) { if (currentProgress != lastProgress) {
lastProgress = currentProgress; // OLED nur alle 5% aktualisieren
if (currentProgress % 5 == 0) {
oledShowMessage(String(currentProgress) + "% complete"); oledShowMessage(String(currentProgress) + "% complete");
} }
// Webseite bei jeder Änderung aktualisieren
lastProgress = currentProgress;
ws.textAll("{\"type\":\"updateProgress\",\"progress\":" + String(currentProgress) + "}");
}
} }
if (final) { if (final) {