docs: update changelog for version 1.2.87

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

@@ -32,47 +32,50 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade platformio esptool
     
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
     - name: Prepare binaries
       run: |
         cd .pio/build/esp32dev
         
-        # Create OTA binary (firmware only)
-        cp firmware.bin filaman_ota.bin
+        # Create OTA binary (already has correct magic byte)
+        cp firmware.bin filaman.bin
         
-        # Create basic flash layout
-        echo "Creating initial 4MB flash image..."
-        dd if=/dev/zero bs=1M count=4 of=flash_4mb.bin
+        # Create a magic byte prepended binary for the bootloader
+        echo -ne '\xE9' > bootloader_with_magic.bin
+        cat bootloader.bin >> bootloader_with_magic.bin
         
-        # Create partition layout
-        echo "Writing bootloader..."
-        dd if=bootloader.bin of=flash_4mb.bin bs=1 seek=$((0x1000)) conv=notrunc
+        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 filaman.bin \
+          0x0000 bootloader_with_magic.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin
         
-        echo "Writing partitions..."
-        dd if=partitions.bin of=flash_4mb.bin bs=1 seek=$((0x8000)) conv=notrunc
+        # Verify magic bytes
+        echo "Checking magic bytes:"
+        echo "Full binary first bytes:"
+        xxd -l 16 filaman.bin
         
-        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
+        # Verify file sizes
         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 }}
@@ -100,7 +103,7 @@ jobs:
           
           # Upload binaries
           cd .pio/build/esp32dev
-          for file in filaman_full.bin filaman_ota.bin; do
+          for file in filaman.bin; do
             echo "Uploading $file..."
             curl -k -s \
               -X POST \

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

@@ -21,21 +21,24 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade platformio esptool
     
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
     - name: Prepare binaries
       run: |
         cd .pio/build/esp32dev
         
-        # 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
+        cp firmware.bin filaman.bin
         
         # Create a magic byte prepended binary for the bootloader
         echo -ne '\xE9' > bootloader_with_magic.bin
@@ -47,18 +50,16 @@ jobs:
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o filaman_full.bin \
+          -o filaman.bin \
           0x0000 bootloader_with_magic.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 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
+        xxd -l 16 filaman.bin
         
         # Verify file sizes
         echo "File sizes:"
@@ -85,5 +86,4 @@ jobs:
         gh release create "${{ github.ref_name }}" \
           --title "Release ${{ steps.get_version.outputs.VERSION }}" \
           --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .pio/build/esp32dev/filaman_full.bin \
-          .pio/build/esp32dev/filaman_ota.bin
+          .pio/build/esp32dev/filaman.bin

CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## [1.2.87] - 2025-02-20
+### Changed
+- update webpages for version v1.2.87
+
+### Fixed
+- update firmware build process and remove unused OTA environment
+
+
+## [1.2.86] - 2025-02-20
+### Changed
+- update webpages for version v1.2.86
+
+### Fixed
+- update SPIFFS offset and size in release workflows and partitions.csv
+
+
+## [1.2.85] - 2025-02-20
+### Added
+- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting
+
+### Changed
+- update webpages for version v1.2.85
+
+
+## [1.2.84] - 2025-02-20
+### Changed
+- update webpages for version v1.2.84
+- ci: update installation steps for xxd to include package list update
+
+
+## [1.2.83] - 2025-02-20
+### Changed
+- update webpages for version v1.2.83
+- replace hexdump with xxd for magic byte verification in release workflows
+
+
+## [1.2.82] - 2025-02-20
+### Changed
+- update webpages for version v1.2.82
+- enhance Gitea and GitHub release workflows to include magic byte handling and improve binary verification
+
+
+## [1.2.81] - 2025-02-20
+### Changed
+- update webpages for version v1.2.81
+- update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries
+
+
+## [1.2.80] - 2025-02-20
+### Added
+- update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78
+
+### Changed
+- update webpages for version v1.2.80
+- bump version to 1.2.79 in platformio.ini
+
+
+## [1.2.79] - 2025-02-20
+### Changed
+- update webpages for version v1.2.79
+- simplify Gitea release workflow by using esptool for binary creation
+
+
 ## [1.2.78] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.78

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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,  0x1E0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+app0,     app,  ota_0,     0x10000,  0x1C0000,
+app1,     app,  ota_1,     0x1D0000, 0x1C0000,
+spiffs,   data, spiffs,    0x390000, 0x60000,

platformio.ini

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

scripts/pre_spiffs.py

@@ -4,4 +4,18 @@ Import("env")
 exec(open("./scripts/pre_build.py").read())
 
 # Bind to SPIFFS build
-env.AddPreAction("buildfs", replace_version)
+env.AddPreAction("buildfs", replace_version)
+
+import os
+import shutil
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+
+# Format SPIFFS partition before uploading new files
+spiffs_dir = os.path.join(env.subst("$BUILD_DIR"), "spiffs")
+if os.path.exists(spiffs_dir):
+    shutil.rmtree(spiffs_dir)
+os.makedirs(spiffs_dir)
+
+print("SPIFFS partition formatted.")

src/ota.cpp

@@ -22,7 +22,9 @@ void stopAllTasks() {
 
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
     if (!index) {
-        Serial.printf("Update Start: %s\n", filename.c_str());
+        bool isFullImage = true;
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
+        
         if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
@@ -33,9 +35,21 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             tasksAreStopped = true;
         }
 
-        // Da die full.bin jetzt das korrekte Magic Byte hat, 
-        // können wir ein normales Update ohne spezielle Flags starten
-        if (!Update.begin()) {
+        bool success;
+        if (isFullImage) {
+            // Full image update ohne Magic Byte Check, aber mit U_FLASH
+            success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
+        } else {
+            // Normales OTA update mit Magic Byte Check
+            if (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;
+            }
+            success = Update.begin(request->contentLength());
+        }
+
+        if (!success) {
             Update.printError(Serial);
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
             return;