docs: update changelog for version 1.2.60

docs: update webpages for version 1.2.60
feat: update version to 1.2.60 in platformio configuration
2025-02-20 01:28:56 +01:00 · 2025-02-20 01:28:56 +01:00 · 2025-02-20 01:28:45 +01:00 · 2025-02-20 01:08:56 +01:00 · 2025-02-20 01:08:56 +01:00 · 2025-02-20 01:08:48 +01:00
12 changed files with 48 additions and 15 deletions
--- a/.github/workflows/providers/github-release.yml
+++ b/.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: |
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,34 @@
 # Changelog

+## [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
--- 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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</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.56</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/partitions.csv
+++ b/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,
-app1,     app,  ota_1,     0x150000, 0x140000,
-spiffs,   data, spiffs,    0x290000, 0x170000,
+app0,     app,  ota_0,     0x10000,  0x1E0000,
+app1,     app,  ota_1,     0x1F0000, 0x1E0000,
+spiffs,   data, spiffs,    0x3D0000, 0x30000,
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

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

 [env:esp32dev]
 platform = espressif32
--- a/src/ota.cpp
+++ b/src/ota.cpp
@ -16,15 +16,19 @@ 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
+        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;
        }
        
-        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\"}");
Author	SHA1	Message	Date
Manuel Weiser	05f275142f	docs: update changelog for version 1.2.60 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m11s Details	2025-02-20 01:28:56 +01:00
Manuel Weiser	72af54bd20	docs: update webpages for version 1.2.60	2025-02-20 01:28:56 +01:00
Manuel Weiser	a1e30a3b7f	feat: update version to 1.2.60 in platformio configuration	2025-02-20 01:28:45 +01:00
Manuel Weiser	8f8322e629	docs: update changelog for version 1.2.59 All checks were successful Release Workflow / route (push) Successful in 6s 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 3m10s Details	2025-02-20 01:08:56 +01:00
Manuel Weiser	1e386c49af	docs: update webpages for version 1.2.59	2025-02-20 01:08:56 +01:00
Manuel Weiser	3070d75d07	feat: update version to 1.2.59 and enhance OTA upload handling	2025-02-20 01:08:48 +01:00
Manuel Weiser	34ee9badea	docs: update changelog for version 1.2.58 All checks were successful Release Workflow / route (push) Successful in 7s 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 3m16s Details	2025-02-20 00:50:53 +01:00
Manuel Weiser	6594af9540	feat: update version to 1.2.58 in HTML files and platformio configuration	2025-02-20 00:50:48 +01:00
Manuel Weiser	c21bd2d4ec	docs: update changelog for version 1.2.57 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 3m15s Details	2025-02-20 00:33:35 +01:00
Manuel Weiser	e5f895b560	feat: update version to 1.2.57 in platformio configuration	2025-02-20 00:33:31 +01:00
Manuel Weiser	bb0f50ce1d	fix: update spiffs offset and sizes in firmware and partitions configuration	2025-02-20 00:33:16 +01:00