docs: update changelog for version 1.2.81

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

@@ -30,33 +30,44 @@ 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
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota            # Build firmware
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
         
-    - name: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev_ota
         
-    - name: Merge firmware and SPIFFS
-      run: |
+        # Create OTA binary (firmware only)
+        cp firmware.bin filaman_ota.bin
+        
+        # Use esptool to create the full binary
         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
+          --target-offset 0x0 \
+          -o filaman_full.bin \
+          0x1000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x3D0000 spiffs.bin
+        
+        # Verify binaries
+        echo "File sizes:"
+        ls -lh *.bin
+        
+        echo "Binary information:"
+        echo "OTA binary info:"
+        esptool.py --chip esp32 image_info filaman_ota.bin || true
+        echo "Full binary first 64 bytes:"
+        od -A x -t x1z -N 64 filaman_full.bin
 
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-    
     - name: Create Release
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
@@ -83,8 +94,8 @@ jobs:
           echo "Release created with ID: $RELEASE_ID"
           
           # Upload binaries
-          cd .pio/build/esp32dev
-          for file in filaman_full.bin filaman_ota.bin; do
+          cd .pio/build/esp32dev_ota
+          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
             echo "Uploading $file..."
             curl -k -s \
               -X POST \

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

@@ -19,32 +19,52 @@ 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
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota            # Build firmware
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
         
-    - name: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev_ota
         
-    - 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
@@ -67,5 +87,7 @@ 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_ota/filaman_full.bin \
+          .pio/build/esp32dev_ota/filaman_ota.bin \
+          .pio/build/esp32dev_ota/filaman.bin \
+          .pio/build/esp32dev_ota/filaman_spiffs.bin

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [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
+- 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

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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</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.77"
+version = "1.2.81"
 
 [env:esp32dev]
 platform = espressif32
@@ -78,6 +78,73 @@ extra_scripts =
 ;targets = buildfs, build
 
 ; Add a custom target to build both
-[platformio]
-default_envs = esp32dev
+[env:esp32dev_ota]
+platform = espressif32
+board = esp32dev
+framework = arduino
+monitor_speed = 115200
+
+lib_deps =
+    tzapu/WiFiManager @ ^2.0.17
+    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    me-no-dev/AsyncTCP @ ^1.1.1
+    bogde/HX711 @ ^0.7.5
+    adafruit/Adafruit SSD1306 @ ^2.5.13
+    adafruit/Adafruit GFX Library @ ^1.11.11
+    adafruit/Adafruit PN532 @ ^1.3.3
+    bblanchon/ArduinoJson @ ^7.3.0
+    knolleary/PubSubClient @ ^2.8
+    digitaldragon/SSLClient @ ^1.3.2
+    
+; Enable SPIFFS upload
+board_build.filesystem = spiffs
+; Update partition settings
+board_build.partitions = partitions.csv
+board_upload.flash_size = 4MB
+board_build.flash_mode = dio
+board_upload.flash_freq = "40m"
+
+build_flags = 
+    -Os
+    -ffunction-sections
+    -fdata-sections
+    -DNDEBUG
+    -mtext-section-literals
+    '-D VERSION="${common.version}"'
+    -DASYNCWEBSERVER_REGEX
+    -DCORE_DEBUG_LEVEL=1
+    -DCONFIG_ARDUHAL_LOG_COLORS=1
+    -DOTA_DEBUG=1
+    -DARDUINO_RUNNING_CORE=1
+    -DARDUINO_EVENT_RUNNING_CORE=1
+    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
+    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
+    -DCONFIG_ARDUINO_OTA_READSIZE=1024
+    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+    -DCONFIG_ASYNC_TCP_USE_WDT=0
+    -DCONFIG_LWIP_TCP_MSS=1460
+    -DOTA_PARTITION_SUBTYPE=0x10
+    -DPARTITION_TABLE_OFFSET=0x8000
+    -DPARTITION_TABLE_SIZE=0x1000
+    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
+    -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
+    pre:scripts/pre_build.py     ; wird zuerst ausgeführt
+    pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
+    pre:scripts/combine_html.py  ; wird als drittes ausgeführt
+    scripts/gzip_files.py
+
+; Remove or comment out the targets line
+;targets = buildfs, build
+
+; Add a custom target to build both
+[platformio]
+default_envs = esp32dev, esp32dev_ota
 

src/ota.cpp

@@ -21,52 +21,51 @@ 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);
+        bool isFullImage = filename.endsWith("full.bin");
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
         
-        if (contentLength == 0) {
+        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;
+        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());
         }
 
-        // Bei full.bin UPDATE_SIZE_UNKNOWN verwenden
-        if (!Update.begin(isFullImage ? UPDATE_SIZE_UNKNOWN : contentLength)) {
+        if (!success) {
             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...");