docs: update changelog for version 1.2.78

fix: correct version number in HTML files and platformio.ini to v1.2.76
enhance: streamline OTA update handling by removing unnecessary magic byte checks

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

@@ -4,15 +4,12 @@ on:
   workflow_call:
     inputs:
       gitea_ref_name:
-        description: 'Gitea ref name'
         required: true
         type: string
       gitea_server_url:
-        description: 'Gitea server URL'
         required: true
         type: string
       gitea_repository:
-        description: 'Gitea repository'
         required: true
         type: string
     secrets:
@@ -23,109 +20,94 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout Repository
+    - uses: actions/checkout@v4
-      uses: actions/checkout@v4
+    
-
+    - name: Set up Python
-    - name: Install System Dependencies
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    
+    - name: Install PlatformIO
       run: |
-        sudo apt-get update
+        python -m pip install --upgrade pip
-        sudo apt-get install -y python3 python3-venv build-essential curl git
+        pip install --upgrade platformio esptool
-
+    
-    - name: Set up Python Virtual Environment
-      run: |
-        python3 -m venv venv
-        source venv/bin/activate
-        pip install --upgrade pip
-        pip install platformio esptool
-        
-        echo "Verifying installations:"
-        platformio --version
-        python3 --version
-        esptool.py version
-
     - name: Build Firmware
       run: |
-        source venv/bin/activate
+        pio run -t buildfs  # Build SPIFFS
-        echo "Building SPIFFS..."
+        pio run            # Build firmware
-        platformio run -t buildfs
         
-        echo "Building firmware..."
+    - name: Prepare binaries
-        platformio run
-
-    - name: Create Release Files
       run: |
-        source venv/bin/activate
+        cd .pio/build/esp32dev
-        echo "Creating release files..."
-        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 \
-          0x3D0000 .pio/build/esp32dev/spiffs.bin
         
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        # Create OTA binary (firmware only)
-
+        cp firmware.bin filaman_ota.bin
-    - name: Read CHANGELOG.md
+        
-      id: changelog
+        # Create basic flash layout
-      run: |
+        echo "Creating initial 4MB flash image..."
-        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
+        dd if=/dev/zero bs=1M count=4 of=flash_4mb.bin
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
+        
-        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        # Create partition layout
-        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "Writing bootloader..."
-        echo "EOF" >> $GITHUB_OUTPUT
+        dd if=bootloader.bin of=flash_4mb.bin bs=1 seek=$((0x1000)) conv=notrunc
-        echo "CHANGELOG CONTENT:"
+        
-        echo "$CHANGELOG"
+        echo "Writing partitions..."
-        if [ -z "$CHANGELOG" ]; then
+        dd if=partitions.bin of=flash_4mb.bin bs=1 seek=$((0x8000)) conv=notrunc
-          echo "No changelog found for version $VERSION"
+        
-          exit 1
+        echo "Writing firmware..."
-        fi
+        dd if=firmware.bin of=flash_4mb.bin bs=1 seek=$((0x10000)) conv=notrunc
+        
+        echo "Writing SPIFFS..."
+        dd if=spiffs.bin of=flash_4mb.bin bs=1 seek=$((0x3D0000)) conv=notrunc
+        
+        # Rename to final name
+        cp flash_4mb.bin filaman_full.bin
+        
+        # Verify file sizes and content
+        echo "File sizes:"
+        ls -lh *.bin
+        
+        echo "Binary information:"
+        esptool.py --chip esp32 image_info filaman_ota.bin || true
+        echo "Full binary info:"
+        xxd -l 64 filaman_full.bin
 
     - name: Create Release
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
-        GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
-        GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
-        CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
       run: |
-        echo "Debug environment:"
+        TAG="${{ inputs.gitea_ref_name }}"
-        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
+        API_URL="${{ inputs.gitea_server_url }}/api/v1"
-        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
+        REPO="${{ inputs.gitea_repository }}"
-        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
-        echo "CHANGELOG: ${CHANGELOG}"
-        
-        TAG="${GITEA_REF_NAME}"
-        API_URL="${GITEA_SERVER_URL}/api/v1"
-        REPO="${GITEA_REPOSITORY}"
-        
-        echo "Creating release for ${TAG} on ${REPO}..."
         
         # Create release
         RESPONSE=$(curl -k -s \
           -X POST \
           -H "Authorization: token ${TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
+          -d "{
+            \"tag_name\":\"${TAG}\",
+            \"name\":\"Release ${TAG}\",
+            \"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
+          }" \
           "${API_URL}/repos/${REPO}/releases")
         
         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
-        UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
         
         if [ -n "$RELEASE_ID" ]; then
           echo "Release created with ID: $RELEASE_ID"
           
-          # Upload files
+          # Upload binaries
-          for file in "filaman_full.bin" "filaman_ota.bin"; do
+          cd .pio/build/esp32dev
+          for file in filaman_full.bin filaman_ota.bin; do
             echo "Uploading $file..."
             curl -k -s \
               -X POST \
               -H "Authorization: token ${TOKEN}" \
               -H "Content-Type: application/octet-stream" \
-              --data-binary "@.pio/build/esp32dev/$file" \
+              --data-binary "@$file" \
-              "${UPLOAD_URL}?name=$file"
+              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
           done
         else
           echo "Failed to create release. Response:"

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

@@ -19,32 +19,50 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        pip install --upgrade platformio esptool
     
     - name: Build Firmware
       run: |
         pio run -t buildfs  # Build SPIFFS
         pio run            # Build firmware
         
-    - name: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev
         
-    - name: Merge firmware and SPIFFS
+        # Debug: Show all generated files
-      run: |
+        echo "Files in build directory:"
+        ls -la
+        
+        # Create OTA binary (already has correct magic byte)
+        cp firmware.bin filaman_ota.bin
+        
+        # Create a magic byte prepended binary for the bootloader
+        echo -ne '\xE9' > bootloader_with_magic.bin
+        cat bootloader.bin >> bootloader_with_magic.bin
+        
+        echo "Creating full binary with magic byte..."
         esptool.py --chip esp32 merge_bin \
+          --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o .pio/build/esp32dev/filaman_full.bin \
+          -o filaman_full.bin \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
+          0x0000 bootloader_with_magic.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
+          0x8000 partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
+          0x10000 firmware.bin \
-          0x3D0000 .pio/build/esp32dev/spiffs.bin
+          0x3D0000 spiffs.bin
-
+        
-    - name: Prepare OTA firmware
+        # Verify magic bytes
-      run: |
+        echo "Checking magic bytes:"
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        echo "OTA binary first bytes:"
+        hexdump -C -n 16 filaman_ota.bin
+        echo "Full binary first bytes:"
+        hexdump -C -n 16 filaman_full.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
     
     - name: Get version from tag
       id: get_version

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [1.2.78] - 2025-02-20
+### Changed
+- update webpages for version v1.2.78
+- streamline Gitea release workflow and update version to 1.2.77
+
+### Fixed
+- update Gitea and GitHub release workflows to improve binary preparation and verification fix: correct version number in HTML files and platformio.ini to v1.2.76 enhance: streamline OTA update handling by removing unnecessary magic byte checks
+
+
+## [1.2.77] - 2025-02-20
+### Changed
+- optimize Gitea release workflow by simplifying build steps and improving file handling
+- update webpages for version v1.2.77
+
+
+## [1.2.76] - 2025-02-20
+### Added
+- enhance OTA update process with improved file verification and new OTA data initialization
+
+### Changed
+- update webpages for version v1.2.76
+- streamline Gitea release workflow and remove obsolete OTA data initialization script
+
+
+## [1.2.75] - 2025-02-20
+### Changed
+- update webpages for version v1.2.75
+- simplify OTA update handling by removing unnecessary variables and improving error reporting
+
+
 ## [1.2.74] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.74

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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74</span></h1>
+                <h1>FilaMan<span class="version">v1.2.78</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.74"
+version = "1.2.78"
 
 [env:esp32dev]
 platform = espressif32
@@ -65,6 +65,7 @@ build_flags =
     -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
     -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
     -DCONFIG_PARTITION_TABLE_MD5=y
+    -DBOOT_APP_PARTITION_OTA_0=1
     
 extra_scripts = 
     scripts/extra_script.py

src/ota.cpp

@@ -7,13 +7,9 @@
 #include "scale.h"
 #include "nfc.h"
 
-// Magic byte patterns für verschiedene Image-Typen
-const uint8_t FIRMWARE_MAGIC = 0xE9;
-const uint8_t ESP_MAGIC = 0xE9;
 static bool tasksAreStopped = false;
 
 void stopAllTasks() {
-    // Stop all tasks
     Serial.println("Stopping RFID Reader");
     if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
     Serial.println("Stopping Bambu");
@@ -25,18 +21,9 @@ void stopAllTasks() {
 }
 
 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;
-    static uint8_t *spiffsBuffer = nullptr;
-    static size_t spiffsSize = 0x30000;  // 192KB SPIFFS size
-    static size_t spiffsStored = 0;
-    
     if (!index) {
-        contentLength = request->contentLength();
+        Serial.printf("Update Start: %s\n", filename.c_str());
-        Serial.printf("Update size: %u bytes (0x%X)\n", contentLength, contentLength);
+        if (request->contentLength() == 0) {
-        
-        if (contentLength == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
@@ -46,145 +33,28 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             tasksAreStopped = true;
         }
 
-        isFullImage = (contentLength > 0x300000);  // Über 3MB ist ein full image
+        // Da die full.bin jetzt das korrekte Magic Byte hat, 
-        
+        // können wir ein normales Update ohne spezielle Flags starten
-        if (isFullImage) {
+        if (!Update.begin()) {
-            // Alloziere Buffer für SPIFFS-Daten
+            Update.printError(Serial);
-            spiffsBuffer = (uint8_t*)malloc(spiffsSize);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
-            if (!spiffsBuffer) {
+            return;
-                Serial.println("Failed to allocate SPIFFS buffer");
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
-                return;
-            }
-            memset(spiffsBuffer, 0xFF, spiffsSize);
-            spiffsStored = 0;
-            
-            // Starte Update mit der Firmware-Größe
-            if (!Update.begin(0x3D0000, U_FLASH)) {  // Nur bis zum SPIFFS-Start
-                Serial.println("Could not begin full image update");
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Could not start full update\"}");
-                return;
-            }
-        } else {
-            // Normales Firmware-Update
-            if (!Update.begin(contentLength)) {
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
-                return;
-            }
         }
-        
-        currentOffset = 0;
-        Serial.printf("%s update started\n", isFullImage ? "Full image" : "Firmware");
     }
 
-    if (isFullImage && currentOffset >= 0x3D0000) {
+    if (Update.write(data, len) != len) {
-        // SPIFFS-Daten sammeln
+        Update.printError(Serial);
-        size_t spiffsOffset = currentOffset - 0x3D0000;
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
-        if (spiffsOffset < spiffsSize) {
-            size_t copyLen = min(len, spiffsSize - spiffsOffset);
-            memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
-            spiffsStored += copyLen;
-            Serial.printf("Stored SPIFFS data: offset=0x%X, len=%u\n", spiffsOffset, copyLen);
-        }
-        
-        // Nur die Firmware-Daten an Update.write() übergeben
         return;
     }
 
-    // Schreibe Firmware-Daten
-    size_t writeLen = isFullImage ? min(len, 0x3D0000 - currentOffset) : len;
-    if (writeLen > 0) {
-        if (Update.write(data, writeLen) != writeLen) {
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
-                Update.printError(Serial);
-                if (spiffsBuffer) {
-                    free(spiffsBuffer);
-                    spiffsBuffer = nullptr;
-                }
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
-                return;
-            }
-        }
-    }
-    
-    currentOffset += len;
-    
-    // Progress logging
-    if ((currentOffset % 0x40000) == 0) {
-        Serial.printf("Update progress: 0x%X of 0x%X bytes (%.1f%%)\n", 
-            currentOffset, contentLength, (currentOffset * 100.0) / contentLength);
-    }
-    
     if (final) {
-        bool success = true;
-        
-        // Beende Firmware-Update
         if (!Update.end(true)) {
-            success = false;
+            Update.printError(Serial);
-            String errorMsg = Update.errorString();
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
-            if (errorMsg != "No Error") {
+            return;
-                Update.printError(Serial);
-                if (spiffsBuffer) {
-                    free(spiffsBuffer);
-                    spiffsBuffer = nullptr;
-                }
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Firmware update failed: " + errorMsg + "\"}");
-                return;
-            }
         }
-        
+        Serial.println("Update successful, restarting...");
-        // SPIFFS aktualisieren wenn es ein full image war
-        if (success && isFullImage && spiffsBuffer && spiffsStored > 0) {
-            Serial.printf("Starting SPIFFS update (size: 0x%X)\n", spiffsStored);
-            
-            if (SPIFFS.begin(true)) {
-                SPIFFS.end();  // Unmount first
-            }
-            
-            if (!Update.begin(spiffsSize, U_SPIFFS)) {
-                Serial.println("Could not begin SPIFFS update");
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update failed to start\"}");
-                return;
-            }
-            
-            if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
-                Serial.println("SPIFFS Write Failed");
-                Update.printError(Serial);
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
-                return;
-            }
-            
-            if (!Update.end(true)) {
-                Serial.println("SPIFFS End Failed");
-                Update.printError(Serial);
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
-                return;
-            }
-            
-            // Cleanup
-            free(spiffsBuffer);
-            spiffsBuffer = nullptr;
-            
-            // Verify SPIFFS
-            if (!SPIFFS.begin(true)) {
-                Serial.println("SPIFFS mount after update failed");
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
-                return;
-            }
-            SPIFFS.end();
-        }
-        
-        // Alles erfolgreich
-        Serial.printf("Update complete: 0x%X bytes written\n", currentOffset);
         request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
         delay(500);
         ESP.restart();