Compare commits
3 Commits
d41f0f3e67
...
c161216c04
Author | SHA1 | Date | |
---|---|---|---|
c161216c04 | |||
6a016b6ac4 | |||
44dd485e17 |
@ -1,5 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## [1.2.88] - 2025-02-20
|
||||
### Changed
|
||||
- update webpages for version v1.2.88
|
||||
|
||||
### Fixed
|
||||
- improve OTA update handling and logging for better error reporting
|
||||
|
||||
|
||||
## [1.2.87] - 2025-02-20
|
||||
### Changed
|
||||
- update webpages for version v1.2.87
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.87</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.88</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.87"
|
||||
version = "1.2.88"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
@ -45,7 +45,7 @@ build_flags =
|
||||
-mtext-section-literals
|
||||
'-D VERSION="${common.version}"'
|
||||
-DASYNCWEBSERVER_REGEX
|
||||
-DCORE_DEBUG_LEVEL=1
|
||||
-DCORE_DEBUG_LEVEL=3
|
||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||
-DOTA_DEBUG=1
|
||||
-DARDUINO_RUNNING_CORE=1
|
||||
@ -66,6 +66,7 @@ build_flags =
|
||||
-DCONFIG_PARTITION_TABLE_OFFSET=0x8000
|
||||
-DCONFIG_PARTITION_TABLE_MD5=y
|
||||
-DBOOT_APP_PARTITION_OTA_0=1
|
||||
-DCONFIG_LOG_DEFAULT_LEVEL=3
|
||||
|
||||
extra_scripts =
|
||||
scripts/extra_script.py
|
||||
|
43
src/ota.cpp
43
src/ota.cpp
@ -22,7 +22,7 @@ void stopAllTasks() {
|
||||
|
||||
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
|
||||
if (!index) {
|
||||
bool isFullImage = true;
|
||||
bool isFullImage = filename.endsWith(".bin");
|
||||
Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
|
||||
|
||||
if (request->contentLength() == 0) {
|
||||
@ -30,46 +30,69 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
return;
|
||||
}
|
||||
|
||||
// Berechne verfügbaren Speicherplatz
|
||||
size_t updateSize = request->contentLength();
|
||||
size_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
|
||||
|
||||
Serial.printf("Update size: %u bytes\n", updateSize);
|
||||
Serial.printf("Available space: %u bytes\n", maxSketchSpace);
|
||||
|
||||
if (updateSize > maxSketchSpace) {
|
||||
Serial.printf("Error: Not enough space. Need %u bytes but only have %u bytes available\n",
|
||||
updateSize, maxSketchSpace);
|
||||
request->send(400, "application/json",
|
||||
"{\"status\":\"error\",\"message\":\"Not enough space for update\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
|
||||
stopAllTasks();
|
||||
tasksAreStopped = true;
|
||||
}
|
||||
|
||||
// Ensure SPIFFS is ended before update
|
||||
if (SPIFFS.begin()) {
|
||||
SPIFFS.end();
|
||||
}
|
||||
|
||||
bool success;
|
||||
if (isFullImage) {
|
||||
// Full image update ohne Magic Byte Check, aber mit U_FLASH
|
||||
success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
|
||||
success = Update.begin(updateSize, U_FLASH);
|
||||
} else {
|
||||
// Normales OTA update mit Magic Byte Check
|
||||
if (data[0] != 0xE9) {
|
||||
Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
|
||||
request->send(400, "application/json",
|
||||
"{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
|
||||
return;
|
||||
}
|
||||
success = Update.begin(request->contentLength());
|
||||
success = Update.begin(updateSize);
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
|
||||
request->send(400, "application/json",
|
||||
"{\"status\":\"error\",\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (Update.write(data, len) != len) {
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
|
||||
request->send(400, "application/json",
|
||||
"{\"status\":\"error\",\"message\":\"Write failed\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (final) {
|
||||
if (!Update.end(true)) {
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
|
||||
request->send(400, "application/json",
|
||||
"{\"status\":\"error\",\"message\":\"Update failed\"}");
|
||||
return;
|
||||
}
|
||||
Serial.println("Update successful, restarting...");
|
||||
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
|
||||
request->send(200, "application/json",
|
||||
"{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
|
||||
delay(500);
|
||||
ESP.restart();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user