Compare commits

..

No commits in common. "5793dc1a1f604e5e4657fdcbedff80960788c190" and "ef9ef7257adc56658fe2932c01199b9b6966fed5" have entirely different histories.

10 changed files with 13 additions and 29 deletions

View File

@ -1,13 +1,5 @@
# Changelog
## [1.2.64] - 2025-02-20
### Changed
- update webpages for version v1.2.64
### Fixed
- improve error handling in OTA upload process
## [1.2.63] - 2025-02-20
### Added
- update version to 1.2.63

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.64</span></h1>
<h1>FilaMan<span class="version">v1.2.63</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.2.64"
version = "1.2.63"
[env:esp32dev]
platform = espressif32

View File

@ -43,12 +43,10 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
// Schreibe Daten
if (Update.write(data, len) != len) {
Update.printError(Serial);
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return;
}
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return;
}
currentOffset += len;
@ -61,14 +59,8 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
ESP.restart();
} else {
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
} else {
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(1000);
ESP.restart();
}
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
}
}
}