Compare commits

..

12 Commits

Author SHA1 Message Date
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
c6edf30245 docs: update changelog for version 1.3.45
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 2m44s
2025-02-22 12:21:35 +01:00
65ac207f36 docs: update webpages for version v1.3.45 2025-02-22 12:21:35 +01:00
698abbd669 workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic 2025-02-22 12:21:33 +01:00
04a7c2cce3 docs: update changelog for version 1.3.44
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 2m48s
2025-02-22 12:11:30 +01:00
78f54b72fd docs: update webpages for version v1.3.44 2025-02-22 12:11:30 +01:00
f4eee9af91 docs: update header title to 'Hollo Lollo Trollo' 2025-02-22 12:11:26 +01:00
cad14b3bc2 docs: update header title to 'Filament Management Tool' and improve update response messages 2025-02-22 12:10:57 +01:00
312f75fc5f docs: update changelog for version 1.3.43
All checks were successful
Release Workflow / detect-provider (push) Successful in 7s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m28s
2025-02-22 12:03:29 +01:00
b8714e93e2 docs: update webpages for version v1.3.43 2025-02-22 12:03:28 +01:00
cd9da0fe4f docs: update header title to 'Hollo Lollo Trollo' 2025-02-22 12:03:25 +01:00
6 changed files with 54 additions and 23 deletions

View File

@ -40,8 +40,8 @@ jobs:
# Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary (without header)
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# 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
# Create full binary
(cd .pio/build/esp32dev &&

View File

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

View File

@ -1,5 +1,29 @@
# Changelog
## [1.3.46] - 2025-02-22
### Changed
- update webpages for version v1.3.46
## [1.3.45] - 2025-02-22
### Changed
- update webpages for version v1.3.45
- workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic
## [1.3.44] - 2025-02-22
### Changed
- update webpages for version v1.3.44
- update header title to 'Hollo Lollo Trollo'
- update header title to 'Filament Management Tool' and improve update response messages
## [1.3.43] - 2025-02-22
### Changed
- update webpages for version v1.3.43
- update header title to 'Hollo Lollo Trollo'
## [1.3.42] - 2025-02-22
### Changed
- update webpages for version v1.3.42

View File

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

View File

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

View File

@ -368,11 +368,11 @@ void setupWebserver(AsyncWebServer &server) {
[](AsyncWebServerRequest *request) {
// Nach Update-Abschluss
bool success = !Update.hasError();
String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
AsyncWebServerResponse *response = request->beginResponse(
success ? 200 : 400,
"application/json",
success ? "{\"success\":true,\"message\":\"Update successful\"}"
: "{\"success\":false,\"message\":\"Update failed\"}"
"{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
);
response->addHeader("Connection", "close");
request->send(response);
@ -392,33 +392,38 @@ void setupWebserver(AsyncWebServer &server) {
oledShowMessage("Upgrade please wait");
// TODO: Backup
if (!index) {
updateSize = request->contentLength();
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) {
// Backup JSON config files before SPIFFS update
Serial.println("Backup JSON configs...");
backupJsonConfigs();
}
// Setze spezifische Update-Flags für SPIFFS-Updates
if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) {
if (command == U_SPIFFS) {
// Restore JSON config files if update fails at start
// Deaktiviere alle Validierungen für SPIFFS-Updates
if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) {
Serial.printf("Update Begin Error: %s\n", Update.errorString());
restoreJsonConfigs();
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
} else {
// Normale Validierung für Firmware-Updates
if (!Update.begin(updateSize, command)) {
Serial.printf("Update Begin Error: %s\n", Update.errorString());
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
}
if (len) {
if (Update.write(data, len) != len) {
Serial.printf("Update Write Error: %s\n", Update.errorString());
if (command == U_SPIFFS) {
// Restore JSON config files if update fails during write
restoreJsonConfigs();
}
String errorMsg = String("Write failed: ") + Update.errorString();
@ -426,21 +431,23 @@ void setupWebserver(AsyncWebServer &server) {
return;
}
// Sende den Fortschritt als JSON, um unerwünschte Zeilenumbrüche zu vermeiden
// Sende den Fortschritt als JSON
String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
request->send(200, "application/json", progress);
}
if (final) {
if (!Update.end(true)) {
Serial.printf("Update End Error: %s\n", Update.errorString());
if (command == U_SPIFFS) {
// Restore JSON config files if update fails at end
Serial.println("Restoring JSON configs...");
restoreJsonConfigs();
}
String errorMsg = String("Update end failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
Serial.println("Update Success!");
}
}
);