Compare commits
No commits in common. "04b59f48090ff6e81306c02d2dcb1c4f4ec4a687" and "05f275142f00ffc556d6ccfa757042a51be50e0a" have entirely different histories.
04b59f4809
...
05f275142f
@ -1,13 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## [1.2.61] - 2025-02-20
|
||||
### Added
|
||||
- update version to 1.2.61 and enhance OTA update error handling
|
||||
|
||||
### Changed
|
||||
- update webpages for version 1.2.61
|
||||
|
||||
|
||||
## [1.2.60] - 2025-02-20
|
||||
### Added
|
||||
- update version to 1.2.60 in platformio configuration
|
||||
|
||||
@ -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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</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.61</span></h1>
|
||||
<h1>FilaMan<span class="version">v1.2.60</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.61"
|
||||
version = "1.2.60"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
||||
24
src/ota.cpp
24
src/ota.cpp
@ -19,20 +19,10 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
// Determine if this is a full image (firmware + SPIFFS) or just firmware
|
||||
bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
|
||||
|
||||
if (isFullImage) {
|
||||
// For full images, we need to make sure we have enough space and properly partition it
|
||||
if (!Update.begin(ESP.getFreeSketchSpace(), U_FLASH)) {
|
||||
Serial.printf("Not enough space for full image: %u bytes required\n", contentLength);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Full image updates are not supported via OTA. Please use USB update for full images.\"}");
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
// For firmware-only updates
|
||||
if (!Update.begin(contentLength, U_FLASH)) {
|
||||
Serial.printf("Not enough space: %u required\n", contentLength);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available for firmware update\"}");
|
||||
return;
|
||||
}
|
||||
if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) {
|
||||
Serial.printf("Not enough space: %u required\n", contentLength);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
|
||||
@ -41,8 +31,7 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
// Write chunk to flash
|
||||
if (Update.write(data, len) != len) {
|
||||
Update.printError(Serial);
|
||||
String errorMsg = Update.errorString();
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -53,9 +42,8 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
||||
delay(1000);
|
||||
ESP.restart();
|
||||
} else {
|
||||
String errorMsg = Update.errorString();
|
||||
Update.printError(Serial);
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
|
||||
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user