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

@@ -21,70 +21,57 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
+    
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: '3.x'
-
-    - name: Install dependencies
+    
+    - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install platformio esptool
-
+        pip install --upgrade platformio esptool
+    
     - name: Build Firmware
       run: |
-        # Build SPIFFS first
-        platformio run -t buildfs
-        # Then build firmware
-        platformio run
-
-    - name: Prepare Release Files
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
+        
+    - name: Prepare binaries
       run: |
         cd .pio/build/esp32dev
         
-        # Get bootloader
-        BOOTLOADER_PATH=$(find ~/.platformio -name "bootloader_dio_40m.bin" | head -n 1)
-        if [ ! -f "$BOOTLOADER_PATH" ]; then
-            echo "Error: bootloader not found!"
-            exit 1
-        fi
-        echo "Using bootloader from: $BOOTLOADER_PATH"
-        cp "$BOOTLOADER_PATH" bootloader.bin
-        
-        # Create OTA update binary (firmware only)
+        # Create OTA binary (firmware only)
         cp firmware.bin filaman_ota.bin
         
-        # Create full binary
-        echo "Creating full binary..."
-        esptool.py --chip esp32 merge_bin \
-          -o filaman_full.bin \
-          --flash_mode dio \
-          --flash_freq 40m \
-          --flash_size 4MB \
-          0x1000 bootloader.bin \
-          0x8000 partitions.bin \
-          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+        # Create basic flash layout
+        echo "Creating initial 4MB flash image..."
+        dd if=/dev/zero bs=1M count=4 of=flash_4mb.bin
         
-        # Verify results
+        # Create partition layout
+        echo "Writing bootloader..."
+        dd if=bootloader.bin of=flash_4mb.bin bs=1 seek=$((0x1000)) conv=notrunc
+        
+        echo "Writing partitions..."
+        dd if=partitions.bin of=flash_4mb.bin bs=1 seek=$((0x8000)) conv=notrunc
+        
+        echo "Writing firmware..."
+        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 -l bootloader.bin partitions.bin firmware.bin spiffs.bin filaman_full.bin filaman_ota.bin
+        ls -lh *.bin
         
-        echo "Firmware info:"
-        esptool.py --chip esp32 image_info firmware.bin
-        
-        echo "Full binary first 16 bytes:"
-        hexdump -C -n 16 filaman_full.bin
-
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        VERSION=${GITHUB_REF_NAME#v}
-        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 "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:
@@ -112,13 +99,14 @@ jobs:
           echo "Release created with ID: $RELEASE_ID"
           
           # Upload binaries
+          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" \
               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
           done
         else

.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
-      run: |
+        # Debug: Show all generated files
+        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 \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x3D0000 .pio/build/esp32dev/spiffs.bin
-
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+          -o filaman_full.bin \
+          0x0000 bootloader_with_magic.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x3D0000 spiffs.bin
+        
+        # Verify magic bytes
+        echo "Checking magic bytes:"
+        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,20 @@
 # 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

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.76</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.76</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.76</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.76</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.76</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.76</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.76</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.76"
+version = "1.2.78"
 
 [env:esp32dev]
 platform = espressif32

src/ota.cpp

@@ -21,52 +21,37 @@ void stopAllTasks() {
 }
 
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static size_t contentLength = 0;
-    
     if (!index) {
-        contentLength = request->contentLength();
-        Serial.printf("Update Start: %s (size: %u bytes)\n", filename.c_str(), contentLength);
-        
-        if (contentLength == 0) {
+        Serial.printf("Update Start: %s\n", filename.c_str());
+        if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        // Stoppe alle Tasks vor dem Update
         if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
             stopAllTasks();
             tasksAreStopped = true;
         }
 
-        // Für full.bin keine Magic Byte Prüfung
-        bool isFullImage = (contentLength > 0x300000);
-        if (!isFullImage && data[0] != 0xE9) {
-            Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
-            return;
-        }
-
-        // Bei full.bin UPDATE_SIZE_UNKNOWN verwenden
-        if (!Update.begin(isFullImage ? UPDATE_SIZE_UNKNOWN : contentLength)) {
+        // Da die full.bin jetzt das korrekte Magic Byte hat, 
+        // können wir ein normales Update ohne spezielle Flags starten
+        if (!Update.begin()) {
             Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}");
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
             return;
         }
-        Serial.printf("Starting %s update\n", isFullImage ? "full" : "firmware");
     }
 
-    // Schreibe Update-Daten
     if (Update.write(data, len) != len) {
         Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}");
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
         return;
     }
 
-    // Update abschließen
     if (final) {
         if (!Update.end(true)) {
             Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}");
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
             return;
         }
         Serial.println("Update successful, restarting...");