docs: update changelog for version 1.2.61

docs: update webpages for version 1.2.61
feat: update version to 1.2.61 and enhance OTA update error handling
2025-02-20 10:06:15 +01:00 · 2025-02-20 10:06:15 +01:00 · 2025-02-20 10:06:06 +01:00
10 changed files with 34 additions and 14 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 # 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
--- a/html/header.html
+++ b/html/header.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/index.html
+++ b/html/index.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/rfid.html
+++ b/html/rfid.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/spoolman.html
+++ b/html/spoolman.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/upgrade.html
+++ b/html/upgrade.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/waage.html
+++ b/html/waage.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/wifi.html
+++ b/html/wifi.html
@ -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.60</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.60"
+version = "1.2.61"

 [env:esp32dev]
 platform = espressif32
--- a/src/ota.cpp
+++ b/src/ota.cpp
@ -19,10 +19,20 @@ 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 (!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;
+        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;
+            }
        }
        
        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
@ -31,7 +41,8 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
    // Write chunk to flash
    if (Update.write(data, len) != len) {
        Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
+        String errorMsg = Update.errorString();
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
        return;
    }

@ -42,8 +53,9 @@ 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\"}");
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
        }
    }
 }
Author	SHA1	Message	Date
Manuel Weiser	04b59f4809	docs: update changelog for version 1.2.61 All checks were successful Release Workflow / route (push) Successful in 8s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m9s Details	2025-02-20 10:06:15 +01:00
Manuel Weiser	b31861af67	docs: update webpages for version 1.2.61	2025-02-20 10:06:15 +01:00
Manuel Weiser	ce3b423dc1	feat: update version to 1.2.61 and enhance OTA update error handling	2025-02-20 10:06:06 +01:00