docs: update changelog for version 1.2.63

.github/workflows/providers/build.yml

@@ -1,87 +0,0 @@
-name: Build Firmware
-
-on:
-  workflow_call:
-    outputs:
-      version:
-        description: "The version from the tag"
-        value: ${{ jobs.build.outputs.version }}
-      changelog:
-        description: "The changelog for the current version"
-        value: ${{ jobs.build.outputs.changelog }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.get_version.outputs.VERSION }}
-      changelog: ${{ steps.changelog.outputs.CHANGES }}
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
-    
-    - name: Build Firmware
-      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
-        
-    - name: Install esptool
-      run: |
-        pip install esptool
-        
-    - name: Merge firmware and SPIFFS
-      run: |
-        esptool.py --chip esp32 merge_bin \
-          --flash_mode dio \
-          --flash_freq 40m \
-          --flash_size 4MB \
-          -o .pio/build/esp32dev/filaman_full.bin \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
-
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-    
-    - name: Get version from tag
-      id: get_version
-      run: |
-        if [ -n "$GITEA_REF" ]; then
-          echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
-        else
-          echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-        fi
-      
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
-        if [ -n "$GITEA_OUTPUT" ]; then
-          echo "CHANGES<<EOF" >> $GITEA_OUTPUT
-          echo "$CHANGELOG" >> $GITEA_OUTPUT
-          echo "EOF" >> $GITEA_OUTPUT
-        else
-          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        fi
-    
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: firmware
-        path: |
-          .pio/build/esp32dev/filaman_full.bin
-          .pio/build/esp32dev/filaman_ota.bin

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

@@ -64,25 +64,24 @@ 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
         
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
 
-    - name: Get version from tag
-      id: get_version
-      run: |
-        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-
     - name: Read CHANGELOG.md
       id: changelog
       run: |
-        VERSION=${{ inputs.gitea_ref_name }}
+        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
         echo "CHANGELOG CONTENT:"
         echo "$CHANGELOG"
+        if [ -z "$CHANGELOG" ]; then
+          echo "No changelog found for version $VERSION"
+          exit 1
+        fi
 
     - name: Create Release
       env:

.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,101 @@
 # Changelog
 
+## [1.2.63] - 2025-02-20
+### Added
+- update version to 1.2.63
+
+### Changed
+- update webpages for version v1.2.63
+
+
+## [1.2.62] - 2025-02-20
+### Added
+- update version to 1.2.62
+
+### Changed
+- update webpages for version 1.2.62
+
+
+## [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
+
+### Changed
+- remove redundant comment from Gitea release workflow
+
+
+## [1.2.55] - 2025-02-19
+### Added
+- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version
+
+
+## [1.2.54] - 2025-02-19
+### Added
+- update version to 1.2.54 and add check for missing changelog in Gitea release workflow
+
+
+## [1.2.53] - 2025-02-19
+### Added
+- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
+
+
+## [1.2.52] - 2025-02-19
+### Added
+- update version to 1.2.52 and improve Gitea release workflow output handling
+
+
+## [1.2.51] - 2025-02-19
+### Added
+- update version to 1.2.51 and add debug output in Gitea release workflow
+
+
+## [1.2.50] - 2025-02-19
+### Added
+- update version to 1.2.50 and remove obsolete build workflow
+
+
+## [1.2.49] - 2025-02-19
+### Added
+- update version to 1.2.49 and modify changelog reading in Gitea release workflow
+
+
 ## [1.2.48] - 2025-02-19
 ### Added
 - update version to 1.2.48 and modify changelog reading in release workflows

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

platformio.ini

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

src/ota.cpp

@@ -4,8 +4,14 @@
 #include <SPIFFS.h>
 #include "commonFS.h"
 
+// Magic byte patterns für verschiedene Image-Typen
+const uint8_t FIRMWARE_MAGIC = 0xE9;
+const uint8_t ESP_MAGIC = 0xE9;
+
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
     static size_t contentLength = 0;
+    static bool isFullImage = false;
+    static uint32_t currentOffset = 0;
     
     if (!index) {
         contentLength = request->contentLength();
@@ -16,20 +22,34 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        if (!Update.begin(contentLength)) {
+        // Prüfe Magic Byte für Image-Typ
-            Serial.printf("Not enough space: %u required\n", contentLength);
+        if (data[0] == ESP_MAGIC) {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+            // Normales Firmware Image oder full.bin
+            isFullImage = (contentLength > 0x3D0000);
+            
+            if (!Update.begin(contentLength)) {
+                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");
+        } else {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
             return;
         }
-        
+        currentOffset = 0;
-        Serial.println("Update started");
     }
-
+    
+    // Schreibe Daten
     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;
     }
+    
+    currentOffset += len;
 
     if (final) {
         if (Update.end(true)) {
@@ -38,8 +58,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 + "\"}");
         }
     }
 }