docs: update changelog for version 1.2.89

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,95 @@ 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: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio esptool
+    
+    - name: Install xxd
       run: |
         sudo apt-get update
-        sudo apt-get install -y python3 python3-venv build-essential curl git
+        sudo apt-get install xxd
-
+    
-    - 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 -e esp32dev -t buildfs  # Build SPIFFS
-        echo "Building SPIFFS..."
+        pio run -e esp32dev            # Build firmware
-        platformio run -t buildfs
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
-        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..."
+        
+        # Kopiere die Firmware in den SPIFFS-Build-Ordner
+        cp firmware.bin ./spiffs/firmware.bin
+        
+        # Baue das SPIFFS-Image neu mit der eingebetteten Firmware
+        pio run -t buildfs
+        
+        # Erstelle die Release-Dateien
+        cp spiffs.bin filaman_spiffs.bin
+        
+        # Create full binary with magic byte
+        echo "Creating full binary..."
         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.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
+          0x390000 spiffs.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
         
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^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 "CHANGELOG CONTENT:"
-        echo "$CHANGELOG"
-        if [ -z "$CHANGELOG" ]; then
-          echo "No changelog found for version $VERSION"
-          exit 1
-        fi
-
     - 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_ota.bin filaman_spiffs.bin filaman_full.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,49 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        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 -e esp32dev -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        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: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev
         
-    - name: Merge firmware and SPIFFS
+        # Kopiere die Firmware in den SPIFFS-Build-Ordner
-      run: |
+        cp firmware.bin ./spiffs/firmware.bin
+        
+        # Baue das SPIFFS-Image neu mit der eingebetteten Firmware
+        pio run -t buildfs
+        
+        # Erstelle die Release-Dateien
+        cp spiffs.bin filaman_spiffs.bin
+        
+        # Create full binary with magic byte
+        echo "Creating full binary..."
         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.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
+          0x390000 spiffs.bin
-
+        
-    - name: Prepare OTA firmware
+        # Verify file sizes
-      run: |
+        echo "File sizes:"
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        ls -lh *.bin
     
     - name: Get version from tag
       id: get_version
@@ -67,5 +84,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_full.bin
-          .pio/build/esp32dev/filaman_ota.bin

CHANGELOG.md

@@ -1,5 +1,173 @@
 # Changelog
 
+## [1.2.89] - 2025-02-20
+### Changed
+- update webpages for version v1.2.89
+- enhance OTA update process with SPIFFS support and improved error handling
+
+
+## [1.2.88] - 2025-02-20
+### Changed
+- update webpages for version v1.2.88
+
+### Fixed
+- improve OTA update handling and logging for better error reporting
+
+
+## [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
+- 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
+- enhance OTA update process with improved handling of full image updates and SPIFFS data
+
+
+## [1.2.73] - 2025-02-20
+### Changed
+- update webpages for version v1.2.73
+- improve OTA update process with enhanced size checks and progress logging
+
+### Fixed
+- enhance OTA update process with improved size checks and debugging output
+
+
+## [1.2.72] - 2025-02-20
+### Changed
+- update webpages for version v1.2.72
+- simplify OTA update process by removing unnecessary buffer and adjusting offsets
+
+
+## [1.2.71] - 2025-02-20
+### Added
+- update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary
+
+### Changed
+- update webpages for version v1.2.71
+
+
+## [1.2.70] - 2025-02-20
+### Added
+- add logging to stopAllTasks for better debugging
+
+### Changed
+- update webpages for version v1.2.70
+
+
+## [1.2.69] - 2025-02-20
+### Changed
+- update webpages for version v1.2.69
+
+
+## [1.2.68] - 2025-02-20
+### Added
+- add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks
+
+### Changed
+- update webpages for version v1.2.68
+
+### Fixed
+- update stopAllTasks to suspend RfidReaderTask instead of NfcTask
+
+
+## [1.2.67] - 2025-02-20
+### Added
+- improve OTA upload handling and add SPIFFS update support
+
+### Changed
+- update webpages for version v1.2.67
+
+
 ## [1.2.66] - 2025-02-20
 ### Added
 - enhance OTA upload to support SPIFFS updates

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

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.66"
+version = "1.2.89"
 
 [env:esp32dev]
 platform = espressif32
@@ -45,7 +45,7 @@ build_flags =
     -mtext-section-literals
     '-D VERSION="${common.version}"'
     -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=1
+    -DCORE_DEBUG_LEVEL=3
     -DCONFIG_ARDUHAL_LOG_COLORS=1
     -DOTA_DEBUG=1
     -DARDUINO_RUNNING_CORE=1
@@ -59,6 +59,14 @@ build_flags =
     -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
+    -DCONFIG_LOG_DEFAULT_LEVEL=3
     
 extra_scripts = 
     scripts/extra_script.py

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/bambu.h

@@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
 void bambu_restart();
 
+extern TaskHandle_t BambuMqttTask;
 #endif

src/ota.cpp

@@ -3,126 +3,166 @@
 #include <Update.h>
 #include <SPIFFS.h>
 #include "commonFS.h"
+#include "bambu.h"
+#include "scale.h"
+#include "nfc.h"
 
-// Magic byte patterns für verschiedene Image-Typen
+static bool tasksAreStopped = false;
-const uint8_t FIRMWARE_MAGIC = 0xE9;
+
-const uint8_t ESP_MAGIC = 0xE9;
+void stopAllTasks() {
+    Serial.println("Stopping RFID Reader");
+    if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
+    Serial.println("Stopping Bambu");
+    if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
+    Serial.println("Stopping Scale");
+    if (ScaleTask) vTaskSuspend(ScaleTask);
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+    Serial.println("All tasks stopped");
+}
+
+void performStageTwo() {
+    if (!SPIFFS.begin(true)) {
+        Serial.println("Error: Could not mount SPIFFS for stage 2");
+        return;
+    }
+
+    File firmwareFile = SPIFFS.open("/firmware.bin", "r");
+    if (!firmwareFile) {
+        Serial.println("Error: Could not open firmware.bin from SPIFFS");
+        return;
+    }
+
+    size_t firmwareSize = firmwareFile.size();
+    size_t maxAppSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+
+    Serial.printf("Stage 2 - Firmware size: %u bytes\n", firmwareSize);
+    Serial.printf("Available space: %u bytes\n", maxAppSpace);
+
+    if (firmwareSize > maxAppSpace) {
+        Serial.printf("Error: Not enough space for firmware. Need %u bytes but only have %u bytes\n", 
+                    firmwareSize, maxAppSpace);
+        return;
+    }
+
+    if (!Update.begin(firmwareSize)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    size_t written = Update.writeStream(firmwareFile);
+    if (written != firmwareSize) {
+        Update.printError(Serial);
+        return;
+    }
+
+    if (!Update.end(true)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    firmwareFile.close();
+    SPIFFS.remove("/firmware.bin"); // Cleanup
+    Serial.println("Stage 2 update successful, restarting...");
+    delay(500);
+    ESP.restart();
+}
+
+void checkForStagedUpdate() {
+    if (!SPIFFS.begin(true)) {
+        return;
+    }
+
+    if (SPIFFS.exists("/firmware.bin")) {
+        Serial.println("Found staged firmware update, initiating stage 2...");
+        performStageTwo();
+    }
+}
 
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static size_t contentLength = 0;
+    static File stagingFile;
-    static bool isFullImage = false;
-    static uint32_t currentOffset = 0;
-    static uint8_t *spiffsBuffer = nullptr;
-    static size_t spiffsSize = 0;
-    static const uint32_t SPIFFS_START = 0x310000;  // Standard SPIFFS start address in full.bin
     
     if (!index) {
-        contentLength = request->contentLength();
+        bool isSpiffsUpdate = filename.endsWith("_spiffs.bin");
-        Serial.printf("Update size: %u bytes\n", contentLength);
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isSpiffsUpdate ? "SPIFFS" : "OTA");
         
-        if (contentLength == 0) {
+        if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        // Prüfe Magic Byte für Image-Typ
+        // Stop tasks before update
-        if (data[0] == ESP_MAGIC) {
+        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
-            // Normales Firmware Image oder full.bin
+            stopAllTasks();
-            isFullImage = (contentLength > 0x3D0000);
+            tasksAreStopped = true;
-            
+        }
-            if (!Update.begin(contentLength)) {
+
-                Serial.printf("Not enough space: %u required\n", contentLength);
+        size_t updateSize = request->contentLength();
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+        
+        if (isSpiffsUpdate) {
+            if (!SPIFFS.begin(true)) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not mount SPIFFS\"}");
                 return;
             }
             
-            Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
+            // Start SPIFFS update
-            
+            if (!Update.begin(updateSize, U_SPIFFS)) {
-            if (isFullImage) {
+                Update.printError(Serial);
-                // Allocate buffer for SPIFFS data if it's a full image
+                request->send(400, "application/json", 
-                spiffsSize = 0x0F0000;  // Standard SPIFFS size
+                            "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
-                spiffsBuffer = (uint8_t*)malloc(spiffsSize);
+                return;
-                if (!spiffsBuffer) {
-                    Serial.println("Failed to allocate SPIFFS buffer");
-                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
-                    return;
-                }
             }
         } else {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
+            // Regular OTA update
-            return;
+            stagingFile = SPIFFS.open("/firmware.bin", "w");
-        }
+            if (!stagingFile) {
-        currentOffset = 0;
+                request->send(400, "application/json", 
-    }
+                            "{\"status\":\"error\",\"message\":\"Could not create staging file\"}");
-    
+                return;
-    // Handle SPIFFS data collection for full image
-    if (isFullImage && spiffsBuffer) {
-        uint32_t spiffsOffset = currentOffset - SPIFFS_START;
-        if (currentOffset >= SPIFFS_START && spiffsOffset < spiffsSize) {
-            size_t copyLen = min(len, spiffsSize - spiffsOffset);
-            if (spiffsOffset + len > spiffsSize) {
-                copyLen = spiffsSize - spiffsOffset;
             }
-            memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
         }
     }
-    
+
-    // Schreibe Daten
+    if (stagingFile) {
-    if (Update.write(data, len) != len) {
+        // Stage 1: Write to SPIFFS
-        String errorMsg = Update.errorString();
+        if (stagingFile.write(data, len) != len) {
-        if (errorMsg != "No Error") {
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write to SPIFFS failed\"}");
+            return;
+        }
+    } else {
+        // Direct SPIFFS update
+        if (Update.write(data, len) != len) {
             Update.printError(Serial);
-            if (spiffsBuffer) free(spiffsBuffer);
+            request->send(400, "application/json", 
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
+                        "{\"status\":\"error\",\"message\":\"Write failed\"}");
             return;
         }
     }
-    
-    currentOffset += len;
 
     if (final) {
-        if (Update.end(true)) {
+        if (stagingFile) {
-            Serial.println("Firmware update complete");
+            // Finish Stage 1
-            
+            stagingFile.close();
-            if (isFullImage && spiffsBuffer) {
+            Serial.println("Stage 1 complete - firmware staged in SPIFFS");
-                Serial.println("Starting SPIFFS update");
+            request->send(200, "application/json", 
-                if (!SPIFFS.begin(true)) {
+                        "{\"status\":\"success\",\"message\":\"Update staged successfully! Starting stage 2...\"}");
-                    Serial.println("SPIFFS mount failed");
+            performStageTwo();
-                }
-                
-                // Update SPIFFS
-                if (Update.begin(spiffsSize, U_SPIFFS)) {
-                    if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
-                        Serial.println("SPIFFS Write Failed");
-                        free(spiffsBuffer);
-                        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update failed\"}");
-                        return;
-                    }
-                    if (!Update.end(true)) {
-                        Serial.println("SPIFFS End Failed");
-                        free(spiffsBuffer);
-                        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
-                        return;
-                    }
-                }
-                free(spiffsBuffer);
-                Serial.println("SPIFFS update complete");
-            }
-            
-            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-            delay(1000);
-            ESP.restart();
         } else {
-            if (spiffsBuffer) free(spiffsBuffer);
+            // Finish direct SPIFFS update
-            String errorMsg = Update.errorString();
+            if (!Update.end(true)) {
-            if (errorMsg != "No Error") {
                 Update.printError(Serial);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
+                request->send(400, "application/json", 
-            } else {
+                            "{\"status\":\"error\",\"message\":\"Update failed\"}");
-                request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+                return;
-                delay(1000);
-                ESP.restart();
             }
+            Serial.println("SPIFFS update successful, restarting...");
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"SPIFFS update successful! Device will restart...\",\"restart\":true}");
+            delay(500);
+            ESP.restart();
         }
     }
 }

src/ota.h

@@ -3,6 +3,12 @@
 
 #include <ESPAsyncWebServer.h>
 
+// Update size unknown constant, falls nicht bereits definiert
+#ifndef UPDATE_SIZE_UNKNOWN
+#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
+#endif
+
+void stopAllTasks();
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
 #endif

src/scale.h

@@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;
 
+extern TaskHandle_t ScaleTask;
+
 #endif

src/wlan.cpp

@@ -12,7 +12,7 @@ bool wm_nonblocking = false;
 void initWiFi() {
     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
   
-    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+    //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
   
     if(wm_nonblocking) wm.setConfigPortalBlocking(false);
     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen