docs: update changelog for version 1.2.61

.github/workflows/providers/github-release.yml

@@ -40,7 +40,7 @@ jobs:
           0x1000 .pio/build/esp32dev/bootloader.bin \
           0x8000 .pio/build/esp32dev/partitions.bin \
           0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
+          0x3D0000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
       run: |

CHANGELOG.md

@@ -1,5 +1,42 @@
 # 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
+
+### Changed
+- update webpages for version 1.2.60
+
+
+## [1.2.59] - 2025-02-20
+### Added
+- update version to 1.2.59 and enhance OTA upload handling
+
+### Changed
+- update webpages for version 1.2.59
+
+
+## [1.2.58] - 2025-02-20
+### Added
+- update version to 1.2.58 in HTML files and platformio configuration
+
+
+## [1.2.57] - 2025-02-20
+### Added
+- update version to 1.2.57 in platformio configuration
+
+### Fixed
+- update spiffs offset and sizes in firmware and partitions configuration
+
+
 ## [1.2.56] - 2025-02-19
 ### Added
 - update version to 1.2.56 and adjust firmware and partition settings

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.61</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

partitions.csv

@@ -1,6 +1,6 @@
 # Name,   Type, SubType,    Offset,   Size,     Flags
 nvs,      data, nvs,       0x9000,   0x5000,
 otadata,  data, ota,       0xe000,   0x2000,
-app0,     app,  ota_0,     0x10000,  0x140000,
+app0,     app,  ota_0,     0x10000,  0x1E0000,
-app1,     app,  ota_1,     0x150000, 0x140000,
+app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x290000, 0x170000,
+spiffs,   data, spiffs,    0x3D0000, 0x30000,

platformio.ini

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

src/ota.cpp

@@ -16,18 +16,33 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        if (!Update.begin(contentLength)) {
+        // Determine if this is a full image (firmware + SPIFFS) or just firmware
-            Serial.printf("Not enough space: %u required\n", contentLength);
+        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+
+        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("Update started");
         }
         
+        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
+    }
+    
+    // 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;
     }
 
@@ -38,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 + "\"}");
         }
     }
 }