Compare commits

..

27 Commits

Author SHA1 Message Date
807eca3c43 docs: update changelog for version 1.3.54
Some checks failed
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m12s
2025-02-22 16:47:52 +01:00
b52730bf67 docs: update webpages for version v1.3.54 2025-02-22 16:47:52 +01:00
9a59b91e88 workflow: update SPIFFS binary creation to exclude header 2025-02-22 16:47:27 +01:00
a5af4013d8 docs: update changelog for version 1.3.53
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m34s
2025-02-22 16:22:30 +01:00
e54ce58ec4 version: update to version 1.3.53 2025-02-22 16:22:27 +01:00
142eafd232 docs: update changelog for version 1.3.51 2025-02-22 16:22:04 +01:00
63ab9e0993 docs: update changelog for version 1.3.51 2025-02-22 16:21:54 +01:00
aaa5506d40 workflow: update SPIFFS binary magic byte and revert version to 1.3.51 2025-02-22 16:21:51 +01:00
8037adc045 docs: update changelog for version 1.3.52
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m20s
2025-02-22 16:09:46 +01:00
6e7c728cd8 docs: update webpages for version v1.3.52 2025-02-22 16:09:46 +01:00
3fe8271344 workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3) 2025-02-22 16:09:41 +01:00
f2bc6eab92 docs: update changelog for version 1.3.51
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m35s
2025-02-22 15:50:55 +01:00
37df492339 docs: update webpages for version v1.3.51 2025-02-22 15:50:54 +01:00
c4b425403f config: update platformio.ini to specify correct chip revision and remove unused dependencies 2025-02-22 15:50:49 +01:00
73244689dd docs: update changelog for version 1.3.50
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m31s
2025-02-22 15:16:53 +01:00
27296104d2 docs: update webpages for version v1.3.50 2025-02-22 15:16:53 +01:00
5f99773897 docs: update changelog for version 1.3.49
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m43s
2025-02-22 14:54:23 +01:00
7416285fb9 docs: update webpages for version v1.3.49 2025-02-22 14:54:23 +01:00
85928e358d workflow: update SPIFFS binary header to use correct chip revision 2025-02-22 14:54:19 +01:00
092b4fd8ec docs: update changelog for version 1.3.48
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m52s
2025-02-22 14:31:23 +01:00
399645a2b3 docs: update webpages for version v1.3.48 2025-02-22 14:31:23 +01:00
164bb241b7 workflow: update SPIFFS binary header for firmware release 2025-02-22 14:29:33 +01:00
e564c6eeae docs: update changelog for version 1.3.47
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m37s
2025-02-22 14:04:37 +01:00
4288dd0cd4 docs: update webpages for version v1.3.47 2025-02-22 14:04:37 +01:00
37d43b2d7d workflow: optimize firmware and SPIFFS update process, improve progress handling and logging 2025-02-22 14:04:34 +01:00
adb354ddcd docs: update changelog for version 1.3.46
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m39s
2025-02-22 13:55:42 +01:00
15d5e5edce docs: update webpages for version v1.3.46 2025-02-22 13:55:42 +01:00
11 changed files with 102 additions and 63 deletions

View File

@ -40,8 +40,8 @@ jobs:
# Copy firmware binary # Copy firmware binary
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 without header
( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cp .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 &&

View File

@ -47,8 +47,8 @@ jobs:
# Copy firmware binary # Copy firmware binary
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 without header
( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&

View File

@ -1,5 +1,58 @@
# Changelog # Changelog
## [1.3.54] - 2025-02-22
### Changed
- update webpages for version v1.3.54
- workflow: update SPIFFS binary creation to exclude header
## [1.3.53] - 2025-02-22
### Changed
- version: update to version 1.3.53
- update changelog for version 1.3.51
- update changelog for version 1.3.51
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
## [1.3.52] - 2025-02-22
### Changed
- update webpages for version v1.3.52
- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
## [1.3.51] - 2025-02-22
### Changed
- update changelog for version 1.3.51
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
## [1.3.50] - 2025-02-22
### Changed
- update webpages for version v1.3.50
## [1.3.49] - 2025-02-22
### Changed
- update webpages for version v1.3.49
- workflow: update SPIFFS binary header to use correct chip revision
## [1.3.48] - 2025-02-22
### Changed
- update webpages for version v1.3.48
- workflow: update SPIFFS binary header for firmware release
## [1.3.47] - 2025-02-22
### Changed
- update webpages for version v1.3.47
- workflow: optimize firmware and SPIFFS update process, improve progress handling and logging
## [1.3.46] - 2025-02-22
### Changed
- update webpages for version v1.3.46
## [1.3.45] - 2025-02-22 ## [1.3.45] - 2025-02-22
### Changed ### Changed
- update webpages for version v1.3.45 - update webpages for version v1.3.45

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">
@ -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) {

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4> <h4>Hollo Lollo Trollo</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.3.45" version = "1.3.54"
#test #test

View File

@ -165,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
} }
void setupWebserver(AsyncWebServer &server) { void setupWebserver(AsyncWebServer &server) {
// Deaktiviere alle Debug-Ausgaben
Serial.setDebugOutput(false);
// WebSocket-Optimierungen // WebSocket-Optimierungen
ws.onEvent(onWsEvent); ws.onEvent(onWsEvent);
ws.enable(true); ws.enable(true);
@ -390,29 +393,33 @@ void setupWebserver(AsyncWebServer &server) {
static size_t updateSize = 0; static size_t updateSize = 0;
static int command = 0; static int command = 0;
oledShowMessage("Upgrade please wait"); //oledShowMessage("Upgrade please wait");
if (!index) { if (!index) {
updateSize = request->contentLength(); updateSize = request->contentLength();
command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH; command = (filename.indexOf("website") > -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 // SPIFFS update with pure binary data
if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) { if (!Update.begin((updateSize - 4), command)) { // Exclude header size
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 + "\"}");
return; return;
} }
// Skip initial header completely for SPIFFS update
if (index == 0 && len >= 4) {
data += 4;
len -= 4;
updateSize -= 4;
}
} 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 + "\"}");
return; return;
@ -422,7 +429,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 +437,24 @@ 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 + "\"}");
return; return;
} }
Serial.println("Update Success!");
} }
} }
); );