docs: update changelog for version 1.2.101

docs: update webpages for version v1.2.101
refactor: always create SPIFFS binary in release workflows
2025-02-21 18:07:47 +01:00 · 2025-02-21 18:07:46 +01:00 · 2025-02-21 18:07:43 +01:00 · 2025-02-21 18:04:05 +01:00 · 2025-02-21 17:49:32 +01:00 · 2025-02-21 17:49:32 +01:00
24 changed files with 915 additions and 419 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@@ -3,16 +3,10 @@ name: Gitea Release
 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,110 +17,164 @@ jobs:
  create-release:
    runs-on: ubuntu-latest
    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
    
-    - name: Install System Dependencies
+    - name: Set up Python
+      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
+    - name: Check for SPIFFS changes
+      id: check_spiffs
      run: |
-        python3 -m venv venv
-        source venv/bin/activate
-        pip install --upgrade pip
-        pip install platformio esptool
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
+          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
    
-        echo "Verifying installations:"
-        platformio --version
-        python3 --version
-        esptool.py version
+    - name: Check for Data changes
+      id: check_data
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/"; then
+          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    
+    - name: Get version from platformio.ini
+      id: get_version
+      run: |
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT

    - name: Build Firmware
      run: |
-        source venv/bin/activate
-        echo "Building SPIFFS..."
-        platformio run -t buildfs
+        VERSION=${{ steps.get_version.outputs.VERSION }}
        
-        echo "Building firmware..."
-        platformio run
+        # Always build firmware and SPIFFS
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
        
-    - name: Create Release Files
+        # Copy firmware binary
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        
+        # Always create SPIFFS binary
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        
+        # Create full binary (always)
+        (cd .pio/build/esp32dev && 
+        esptool.py --chip esp32 merge_bin 
+          --fill-flash-size 4MB 
+          --flash_mode dio 
+          --flash_freq 40m 
+          --flash_size 4MB 
+          -o filaman_full_${VERSION}.bin 
+          0x0000 bootloader.bin 
+          0x8000 partitions.bin 
+          0x10000 firmware.bin 
+          0x390000 spiffs.bin)
+        
+        # Verify file sizes
+        echo "File sizes:"
+        (cd .pio/build/esp32dev && ls -lh *.bin)
+        
+    - name: Prepare binaries
      run: |
-        source venv/bin/activate
-        echo "Creating release files..."
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        
+        # Create full binary only if SPIFFS changed
+        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
+          echo "Creating full binary..."
+          cd .pio/build/esp32dev && \
          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
+            -o filaman_full_${VERSION}.bin \
+            0x0000 bootloader.bin \
+            0x8000 partitions.bin \
+            0x10000 firmware.bin \
+            0x390000 spiffs.bin
+        fi
        
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        # Verify file sizes
+        echo "File sizes:"
+        cd .pio/build/esp32dev && ls -lh *.bin

    - name: Read CHANGELOG.md
      id: changelog
      run: |
-        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
+        VERSION=${{ steps.get_version.outputs.VERSION }}
        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:"
-        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
-        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
-        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}..."
+        API_URL="${{ inputs.gitea_server_url }}/api/v1"
+        REPO="${{ inputs.gitea_repository }}"
+        VERSION=${{ steps.get_version.outputs.VERSION }}
        
        # 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\":\"v${VERSION}\",
+            \"name\":\"Release ${VERSION}\",
+            \"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
-          for file in "filaman_full.bin" "filaman_ota.bin"; do
+          # Always upload firmware and full binary
+          for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do
+            if [ -f ".pio/build/esp32dev/$file" ]; then
              echo "Uploading $file..."
              curl -k -s \
                -X POST \
                -H "Authorization: token ${TOKEN}" \
                -H "Content-Type: application/octet-stream" \
                --data-binary "@.pio/build/esp32dev/$file" \
-              "${UPLOAD_URL}?name=$file"
+                "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+            fi
          done
+          
+          # Upload SPIFFS binary only if it exists (data changes)
+          if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
+            echo "Uploading webpage binary..."
+            curl -k -s \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \
+              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin"
+          fi
        else
          echo "Failed to create release. Response:"
          echo "$RESPONSE"
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@@ -19,37 +19,72 @@ 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: Check for Data changes
+      id: check_data
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/"; then
+          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+
+    - name: Check for SPIFFS changes
+      id: check_spiffs
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
+          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
    
    - name: Build Firmware
      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
        
-    - name: Install esptool
-      run: |
-        pip install esptool
+        # Always build firmware and SPIFFS
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
        
-    - name: Merge firmware and SPIFFS
-      run: |
+        # Copy firmware binary
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        
+        # Always create SPIFFS binary
+        cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin
+        
+        # Create full binary (always)
+        (cd .pio/build/esp32dev && \
        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
+          -o filaman_full_${VERSION}.bin \
+          0x0000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin)
        
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        # Verify file sizes
+        echo "File sizes:"
+        (cd .pio/build/esp32dev && ls -lh *.bin)
    
-    - name: Get version from tag
+    - name: Get version from platformio.ini
      id: get_version
      run: |
-        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
      
    - name: Read CHANGELOG.md
      id: changelog
@@ -64,8 +99,33 @@ jobs:
      env:
        GH_TOKEN: ${{ github.token }}
      run: |
-        gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        
+        # Create release with available files
+        cd .pio/build/esp32dev
+        FILES_TO_UPLOAD=""
+        
+        # Always add firmware
+        if [ -f "filaman_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
+        fi
+        
+        # Add SPIFFS and full binary only if they exist
+        if [ -f "webpage_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
+        fi
+        
+        if [ -f "filaman_full_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
+        fi
+        
+        # Create release with available files
+        if [ -n "$FILES_TO_UPLOAD" ]; then
+          gh release create "v${VERSION}" \
+            --title "Release ${VERSION}" \
            --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .pio/build/esp32dev/filaman_full.bin \
-          .pio/build/esp32dev/filaman_ota.bin
+            $FILES_TO_UPLOAD
+        else
+          echo "Error: No files found to upload"
+          exit 1
+        fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,213 @@
 # Changelog

+## [1.2.101] - 2025-02-21
+### Changed
+- update webpages for version v1.2.101
+- always create SPIFFS binary in release workflows
+- migrate calibration value storage from EEPROM to NVS
+
+
+## [1.2.100] - 2025-02-21
+### Changed
+- update webpages for version v1.2.100
+- remove OTA handling and JSON backup/restore functions
+
+
+## [1.2.99] - 2025-02-21
+### Added
+- add SPIFFS change detection and binary copying to release workflows
+- add backup and restore functions for JSON configurations during OTA updates
+
+### Changed
+- update webpages for version v1.2.99
+- update JSON field type checks from JsonObject to String for improved validation
+- update JSON handling in API and Bambu modules for improved object management
+- update platformio.ini dependencies and improve version handling in website.cpp
+- update Cache-Control header to reflect a 1-week duration
+- remove version definition from website.cpp
+- optimize WiFi and WebSocket settings; enhance TCP/IP stack configuration
+- update upgrade page title and heading; adjust cache control duration
+
+
+## [1.2.98] - 2025-02-21
+### Changed
+- update webpages for version v1.2.98
+
+
+## [1.2.97] - 2025-02-21
+### Changed
+- update webpages for version v1.2.97
+- streamline Gitea and GitHub release workflows to check for data changes and update binary handling
+
+
+## [1.2.96] - 2025-02-21
+### Added
+- add SPIFFS build step to Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.2.96
+
+
+## [1.2.95] - 2025-02-21
+### Added
+- enhance update process with separate forms for firmware and webpage uploads, including validation and improved UI
+- add API endpoint for version retrieval and update HTML to display dynamic version
+
+### Changed
+- update webpages for version v1.2.95
+- bump version to 1.2.94 in platformio.ini
+
+
+## [1.2.91] - 2025-02-20
+### Added
+- add file existence checks before uploading binaries in release workflows
+
+### Changed
+- update webpages for version v1.2.91
+
+
+## [1.2.90] - 2025-02-20
+### Changed
+- update webpages for version v1.2.90
+- update Gitea and GitHub release workflows to include SPIFFS directory creation and firmware copying
+
+
+## [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
--- a/html/header.html
+++ b/html/header.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,4 +44,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

--- a/html/index.html
+++ b/html/index.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->

--- a/html/rfid.html
+++ b/html/rfid.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->

--- a/html/spoolman.html
+++ b/html/spoolman.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->

--- a/html/upgrade.html
+++ b/html/upgrade.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->
    
@@ -40,23 +53,97 @@
        <h1>Firmware Upgrade</h1>

        <div class="warning">
-            <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
-            The device will restart automatically after the update.
+            <strong>Warning:</strong> Do not power off the device during update.
        </div>

+        <div class="update-options">
+            <div class="update-section">
+                <h2>Firmware Update</h2>
+                <p>Upload a new firmware file (filaman_*.bin)</p>
                <div class="update-form">
-            <form id="updateForm" enctype='multipart/form-data'>
+                    <form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
                        <input type='file' name='update' accept='.bin' required>
                        <input type='submit' value='Start Firmware Update'>
                    </form>
                </div>
+            </div>

-        <div class="progress-container">
+            <div class="update-section">
+                <h2>Webpage Update</h2>
+                <p>Upload a new webpage file (webpage_*.bin)</p>
+                <div class="update-form">
+                    <form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
+                        <input type='file' name='update' accept='.bin' required>
+                        <input type='submit' value='Start Webpage Update'>
+                    </form>
+                </div>
+            </div>
+        </div>
+
+        <div class="progress-container" style="display: none;">
            <div class="progress-bar">0%</div>
        </div>
        <div class="status"></div>
    </div>

+    <style>
+        .update-options {
+            display: flex;
+            gap: 2rem;
+            margin: 2rem 0;
+        }
+        .update-section {
+            flex: 1;
+            background: #f5f5f5;
+            padding: 1.5rem;
+            border-radius: 8px;
+        }
+        .update-section h2 {
+            margin-top: 0;
+            color: #333;
+        }
+        .update-section p {
+            color: #666;
+            margin-bottom: 1rem;
+        }
+        .progress-container {
+            margin: 20px 0;
+            background: #f0f0f0;
+            border-radius: 4px;
+            overflow: hidden;
+        }
+        .progress-bar {
+            width: 0;
+            height: 20px;
+            background: #4CAF50;
+            transition: width 0.3s ease-in-out;
+            text-align: center;
+            line-height: 20px;
+            color: white;
+        }
+        .status {
+            margin-top: 20px;
+            padding: 10px;
+            border-radius: 4px;
+            display: none;
+        }
+        .status.success {
+            background: #e8f5e9;
+            color: #2e7d32;
+        }
+        .status.error {
+            background: #ffebee;
+            color: #c62828;
+        }
+        .warning {
+            background: #fff3e0;
+            color: #e65100;
+            padding: 15px;
+            border-radius: 4px;
+            margin-bottom: 20px;
+        }
+    </style>
+
    <script>
        // Hide status indicators during update
        const statusContainer = document.querySelector('.status-container');
@@ -64,30 +151,44 @@
            statusContainer.style.display = 'none';
        }

-        document.getElementById('updateForm').addEventListener('submit', async (e) => {
-            e.preventDefault();
-            const form = e.target;
-            const file = form.update.files[0];
-            if (!file) {
-                alert('Please select a firmware file.');
-                return;
-            }
-
-            const formData = new FormData();
-            formData.append('update', file);
-
        const progress = document.querySelector('.progress-bar');
        const progressContainer = document.querySelector('.progress-container');
        const status = document.querySelector('.status');

+        function handleUpdate(e) {
+            e.preventDefault();
+            const form = e.target;
+            const file = form.update.files[0];
+            const updateType = form.dataset.type;
+
+            if (!file) {
+                alert('Please select a file.');
+                return;
+            }
+
+            // Validate file name pattern
+            if (updateType === 'firmware' && !file.name.startsWith('filaman_')) {
+                alert('Please select a valid firmware file (filaman_*.bin)');
+                return;
+            }
+            if (updateType === 'webpage' && !file.name.startsWith('webpage_')) {
+                alert('Please select a valid webpage file (webpage_*.bin)');
+                return;
+            }
+            
            progressContainer.style.display = 'block';
            status.style.display = 'none';
            status.className = 'status';
-            form.querySelector('input[type=submit]').disabled = true;
+
+            // Reset progress bar
+            progress.style.width = '0%';
+            progress.textContent = '0%';
+
+            // Disable both forms during update
+            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = true);

            const xhr = new XMLHttpRequest();
            xhr.open('POST', '/update', true);
-
            xhr.upload.onprogress = (e) => {
                if (e.lengthComputable) {
                    const percentComplete = (e.loaded / e.total) * 100;
@@ -130,13 +231,13 @@
                    status.style.display = 'block';
                    
                    if (xhr.status !== 200) {
-                        form.querySelector('input[type=submit]').disabled = false;
+                        document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                    }
                } catch (error) {
                    status.textContent = 'Error: ' + error.message;
                    status.classList.add('error');
                    status.style.display = 'block';
-                    form.querySelector('input[type=submit]').disabled = false;
+                    document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                }
            };

@@ -144,11 +245,16 @@
                status.textContent = 'Update failed: Network error';
                status.classList.add('error');
                status.style.display = 'block';
-                form.querySelector('input[type=submit]').disabled = false;
+                document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
            };

+            const formData = new FormData();
+            formData.append('update', file);
            xhr.send(formData);
-        });
+        }
+
+        document.getElementById('firmwareForm').addEventListener('submit', handleUpdate);
+        document.getElementById('webpageForm').addEventListener('submit', handleUpdate);
    </script>
 </body>
 </html>
--- a/html/waage.html
+++ b/html/waage.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->

--- a/html/wifi.html
+++ b/html/wifi.html
@@ -6,13 +6,24 @@
    <title>FilaMan - Filament Management Tool</title>
    <link rel="icon" type="image/png" href="/favicon.ico">
    <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
    <div class="navbar">
        <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.70</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -33,6 +44,8 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
+</body>
+</html>

 <!-- head -->

--- a/partitions.csv
+++ b/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,  0x180000,
+app1,     app,  ota_1,     0x190000, 0x180000,
+spiffs,   data, spiffs,    0x310000, 0xE0000,
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.70"
+version = "1.2.101"

 [env:esp32dev]
 platform = espressif32
@@ -20,7 +20,10 @@ 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
+    #me-no-dev/AsyncTCP @ ^1.1.1
+    https://github.com/esphome/AsyncTCP.git
+    #mathieucarbou/ESPAsyncWebServer @ ^3.6.0
+    #esp32async/AsyncTCP @ ^3.3.5
    bogde/HX711 @ ^0.7.5
    adafruit/Adafruit SSD1306 @ ^2.5.13
    adafruit/Adafruit GFX Library @ ^1.11.11
@@ -43,34 +46,30 @@ build_flags =
    -fdata-sections
    -DNDEBUG
    -mtext-section-literals
-    '-D VERSION="${common.version}"'
+    -DVERSION=\"${common.version}\"
    -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=1
+    -DCORE_DEBUG_LEVEL=3
    -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
+    -DBOOT_APP_PARTITION_OTA_0=1
+    -DCONFIG_LOG_DEFAULT_LEVEL=3
+    -DCONFIG_LWIP_TCP_MSL=60000
+    -DCONFIG_LWIP_TCP_WND_DEFAULT=8192
+    -DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096
+    -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
+    -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
    
 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
+    ${env:buildfs.extra_scripts}

-; Remove or comment out the targets line
-;targets = buildfs, build
+[env:buildfs]
+extra_scripts =
+    pre:scripts/combine_html.py  ; Combine header with HTML files
+    scripts/gzip_files.py       ; Compress files for SPIFFS

-; Add a custom target to build both
 [platformio]
 default_envs = esp32dev

--- a/scripts/pre_spiffs.py
+++ b/scripts/pre_spiffs.py
@@ -1,7 +1,39 @@
 Import("env")

+board_config = env.BoardConfig()
+
+# Calculate SPIFFS size based on partition table
+SPIFFS_START = 0x310000  # From partitions.csv
+SPIFFS_SIZE = 0xE0000   # From partitions.csv
+SPIFFS_PAGE = 256
+SPIFFS_BLOCK = 4096
+
+env.Replace(
+    MKSPIFFSTOOL="mkspiffs",
+    SPIFFSBLOCKSZ=SPIFFS_BLOCK,
+    SPIFFSBLOCKSIZE=SPIFFS_BLOCK,
+    SPIFFSSTART=SPIFFS_START,
+    SPIFFSEND=SPIFFS_START + SPIFFS_SIZE,
+    SPIFFSPAGESZ=SPIFFS_PAGE,
+    SPIFFSSIZE=SPIFFS_SIZE
+)
+
 # Wiederverwendung der replace_version Funktion
 exec(open("./scripts/pre_build.py").read())

 # Bind to SPIFFS build
 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.")
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -60,10 +60,10 @@ JsonDocument fetchSpoolsForWebsite() {
            JsonArray filteredSpools = filteredDoc.to<JsonArray>();

            for (JsonObject spool : spools) {
-                JsonObject filteredSpool = filteredSpools.createNestedObject();
+                JsonObject filteredSpool = filteredSpools.add<JsonObject>();
                filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"];

-                JsonObject filament = filteredSpool.createNestedObject("filament");
+                JsonObject filament = filteredSpool["filament"].to<JsonObject>();
                filament["sm_id"] = spool["id"];
                filament["id"] = spool["filament"]["id"];
                filament["name"] = spool["filament"]["name"];
@@ -73,7 +73,7 @@ JsonDocument fetchSpoolsForWebsite() {
                filament["price_meter"] = spool["filament"]["extra"]["price_meter"];
                filament["price_gramm"] = spool["filament"]["extra"]["price_gramm"];

-                JsonObject vendor = filament.createNestedObject("vendor");
+                JsonObject vendor = filament["vendor"].to<JsonObject>();
                vendor["id"] = spool["filament"]["vendor"]["id"];
                vendor["name"] = spool["filament"]["vendor"]["name"];
            }
@@ -110,13 +110,13 @@ JsonDocument fetchAllSpoolsInfo() {
            JsonArray filteredSpools = filteredDoc.to<JsonArray>();

            for (JsonObject spool : spools) {
-                JsonObject filteredSpool = filteredSpools.createNestedObject();
+                JsonObject filteredSpool = filteredSpools.add<JsonObject>();
                filteredSpool["price"] = spool["price"];
                filteredSpool["remaining_weight"] = spool["remaining_weight"];
                filteredSpool["used_weight"] = spool["used_weight"];
                filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"];

-                JsonObject filament = filteredSpool.createNestedObject("filament");
+                JsonObject filament = filteredSpool["filament"].to<JsonObject>();
                filament["id"] = spool["filament"]["id"];
                filament["name"] = spool["filament"]["name"];
                filament["material"] = spool["filament"]["material"];
@@ -125,11 +125,11 @@ JsonDocument fetchAllSpoolsInfo() {
                filament["spool_weight"] = spool["filament"]["spool_weight"];
                filament["color_hex"] = spool["filament"]["color_hex"];

-                JsonObject vendor = filament.createNestedObject("vendor");
+                JsonObject vendor = filament["vendor"].to<JsonObject>();
                vendor["id"] = spool["filament"]["vendor"]["id"];
                vendor["name"] = spool["filament"]["vendor"]["name"];

-                JsonObject extra = filament.createNestedObject("extra");
+                JsonObject extra = filament["extra"].to<JsonObject>();
                extra["nozzle_temperature"] = spool["filament"]["extra"]["nozzle_temperature"];
                extra["price_gramm"] = spool["filament"]["extra"]["price_gramm"];
                extra["price_meter"] = spool["filament"]["extra"]["price_meter"];
@@ -186,7 +186,7 @@ bool updateSpoolTagId(String uidString, const char* payload) {
    }
    
    // Überprüfe, ob die erforderlichen Felder vorhanden sind
-    if (!doc.containsKey("sm_id") || doc["sm_id"] == "") {
+    if (!doc["sm_id"].is<String>() || doc["sm_id"].as<String>() == "") {
        Serial.println("Keine Spoolman-ID gefunden.");
        return false;
    }
@@ -368,7 +368,7 @@ bool checkSpoolmanExtraFields() {
                for (uint8_t s = 0; s < extraLength; s++) {
                    bool found = false;
                    for (JsonObject field : doc.as<JsonArray>()) {
-                        if (field.containsKey("key") && field["key"] == extraFields[s]) {
+                        if (field["key"].is<String>() && field["key"] == extraFields[s]) {
                            Serial.println("Feld gefunden: " + extraFields[s]);
                            found = true;
                            break;
@@ -430,7 +430,7 @@ bool checkSpoolmanInstance(const String& url) {
            String payload = http.getString();
            JsonDocument doc;
            DeserializationError error = deserializeJson(doc, payload);
-            if (!error && doc.containsKey("status")) {
+            if (!error && doc["status"].is<String>()) {
                const char* status = doc["status"];
                http.end();

@@ -469,7 +469,7 @@ bool saveSpoolmanUrl(const String& url) {

 String loadSpoolmanUrl() {
    JsonDocument doc;
-    if (loadJsonValue("/spoolman_url.json", doc) && doc.containsKey("url")) {
+    if (loadJsonValue("/spoolman_url.json", doc) && doc["url"].is<String>()) {
        return doc["url"].as<String>();
    }
    Serial.println("Keine gültige Spoolman-URL gefunden.");
--- a/src/bambu.cpp
+++ b/src/bambu.cpp
@@ -58,7 +58,7 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String

 bool loadBambuCredentials() {
    JsonDocument doc;
-    if (loadJsonValue("/bambu_credentials.json", doc) && doc.containsKey("bambu_ip")) {
+    if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
        // Temporäre Strings für die Werte
        String ip = doc["bambu_ip"].as<String>();
        String code = doc["bambu_accesscode"].as<String>();
@@ -270,9 +270,9 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
    }

    // Prüfen, ob "print->upgrade_state" und "print.ams.ams" existieren
-    if (doc["print"].containsKey("upgrade_state")) {
+    if (doc["print"]["upgrade_state"].is<String>()) {
        // Prüfen ob AMS-Daten vorhanden sind
-        if (!doc["print"].containsKey("ams") || !doc["print"]["ams"].containsKey("ams")) {
+        if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) {
            return;
        }

@@ -315,7 +315,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        }

        // Prüfe die externe Spule
-        if (!hasChanges && doc["print"].containsKey("vt_tray")) {
+        if (!hasChanges && doc["print"]["vt_tray"].is<String>()) {
            JsonObject vtTray = doc["print"]["vt_tray"];
            bool foundExternal = false;
            
@@ -363,7 +363,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        ams_count = amsArray.size();

        // Wenn externe Spule vorhanden, füge sie hinzu
-        if (doc["print"].containsKey("vt_tray")) {
+        if (doc["print"]["vt_tray"].is<String>()) {
            JsonObject vtTray = doc["print"]["vt_tray"];
            int extIdx = ams_count;  // Index für externe Spule
            ams_data[extIdx].ams_id = 255;  // Spezielle ID für externe Spule
@@ -387,14 +387,14 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        JsonArray wsArray = wsDoc.to<JsonArray>();

        for (int i = 0; i < ams_count; i++) {
-            JsonObject amsObj = wsArray.createNestedObject();
+            JsonObject amsObj = wsArray.add<JsonObject>();
            amsObj["ams_id"] = ams_data[i].ams_id;

-            JsonArray trays = amsObj.createNestedArray("tray");
+            JsonArray trays = amsObj["tray"].to<JsonArray>();
            int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4;
            
            for (int j = 0; j < maxTrays; j++) {
-                JsonObject trayObj = trays.createNestedObject();
+                JsonObject trayObj = trays.add<JsonObject>();
                trayObj["id"] = ams_data[i].trays[j].id;
                trayObj["tray_info_idx"] = ams_data[i].trays[j].tray_info_idx;
                trayObj["tray_type"] = ams_data[i].trays[j].tray_type;
@@ -427,14 +427,14 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                JsonArray wsArray = wsDoc.to<JsonArray>();

                for (int j = 0; j < ams_count; j++) {
-                    JsonObject amsObj = wsArray.createNestedObject();
+                    JsonObject amsObj = wsArray.add<JsonObject>();
                    amsObj["ams_id"] = ams_data[j].ams_id;

-                    JsonArray trays = amsObj.createNestedArray("tray");
+                    JsonArray trays = amsObj["tray"].to<JsonArray>();
                    int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4;
                    
                    for (int k = 0; k < maxTrays; k++) {
-                        JsonObject trayObj = trays.createNestedObject();
+                        JsonObject trayObj = trays.add<JsonObject>();
                        trayObj["id"] = ams_data[j].trays[k].id;
                        trayObj["tray_info_idx"] = ams_data[j].trays[k].tray_info_idx;
                        trayObj["tray_type"] = ams_data[j].trays[k].tray_type;
--- a/src/commonFS.cpp
+++ b/src/commonFS.cpp
@@ -1,4 +1,5 @@
 #include "commonFS.h"
+#include <SPIFFS.h>

 bool saveJsonValue(const char* filename, const JsonDocument& doc) {
    File file = SPIFFS.open(filename, "w");
@@ -35,23 +36,12 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
    return true;
 }

-bool initializeSPIFFS() {
-    // Erster Versuch
-    if (SPIFFS.begin(true)) {
-        Serial.println("SPIFFS mounted successfully.");
-        return true;
+void initializeSPIFFS() {
+    if (!SPIFFS.begin(true, "/spiffs", 10, "spiffs")) {
+        Serial.println("SPIFFS Mount Failed");
+        return;
    }
-    
-    // Formatierung versuchen
-    Serial.println("Failed to mount SPIFFS. Formatting...");
-    SPIFFS.format();
-    
-    // Zweiter Versuch nach Formatierung
-    if (SPIFFS.begin(true)) {
-        Serial.println("SPIFFS formatted and mounted successfully.");
-        return true;
-    }
-    
-    Serial.println("SPIFFS initialization failed completely.");
-    return false;
+    Serial.printf("SPIFFS Total: %u bytes\n", SPIFFS.totalBytes());
+    Serial.printf("SPIFFS Used: %u bytes\n", SPIFFS.usedBytes());
+    Serial.printf("SPIFFS Free: %u bytes\n", SPIFFS.totalBytes() - SPIFFS.usedBytes());
 }
--- a/src/commonFS.h
+++ b/src/commonFS.h
@@ -7,6 +7,6 @@

 bool saveJsonValue(const char* filename, const JsonDocument& doc);
 bool loadJsonValue(const char* filename, JsonDocument& doc);
-bool initializeSPIFFS();
+void initializeSPIFFS();

 #endif
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -78,6 +78,8 @@ uint8_t wifiErrorCounter = 0;

 // ##### PROGRAM START #####
 void loop() {
+
+  /*
  // Überprüfe den WLAN-Status
  if (WiFi.status() != WL_CONNECTED) {
    wifiErrorCounter++;
@@ -87,6 +89,7 @@ void loop() {
    wifiOn = true;
  }
  if (wifiErrorCounter > 20) ESP.restart();
+  */
 
  unsigned long currentMillis = millis();

--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -1,183 +0,0 @@
-#include <Arduino.h>
-#include "ota.h"
-#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
-const uint8_t FIRMWARE_MAGIC = 0xE9;
-const uint8_t ESP_MAGIC = 0xE9;
-
-void stopAllTasks() {
-    // Stop all tasks
-    Serial.println("Stopping all tasks");
-    vTaskSuspend(RfidReaderTask);
-    vTaskSuspend(BambuMqttTask);
-    vTaskSuspend(ScaleTask);
-    vTaskDelay(100 / portTICK_PERIOD_MS);
-    Serial.println("All tasks stopped");
-}
-
-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 = 0;
-    static const uint32_t SPIFFS_START = 0x310000;  // SPIFFS start in full.bin
-    
-    stopAllTasks();
-
-    Serial.println("Start Main Upgrad Function");
-    if (!index) {
-        // Reset static variables
-        if (spiffsBuffer) {
-            free(spiffsBuffer);
-            spiffsBuffer = nullptr;
-        }
-        
-        contentLength = request->contentLength();
-        Serial.printf("Update size: %u bytes\n", contentLength);
-        
-        if (contentLength == 0) {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
-            return;
-        }
-
-        if (data[0] == ESP_MAGIC) {
-            isFullImage = (contentLength > 0x3D0000);
-            
-            // Korrektur: Bei full.bin die gesamte Größe verwenden
-            if (!Update.begin(contentLength, U_FLASH)) {
-                Serial.printf("Not enough space: %u required\n", contentLength);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
-                return;
-            }
-            
-            Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
-            
-            if (isFullImage) {
-                spiffsSize = 0x0F0000;  // 960KB SPIFFS size
-                spiffsBuffer = (uint8_t*)malloc(spiffsSize);
-                if (!spiffsBuffer) {
-                    Serial.println("Failed to allocate SPIFFS buffer");
-                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
-                    return;
-                }
-                memset(spiffsBuffer, 0xFF, spiffsSize); // Initialize buffer with 0xFF
-            }
-        } else {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
-            return;
-        }
-        currentOffset = 0;
-    }
-    
-    if (isFullImage) {
-        // Zuerst vollständiges Firmware-Update durchführen
-        if (Update.write(data, len) != len) {
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
-                Update.printError(Serial);
-                if (spiffsBuffer) free(spiffsBuffer);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}");
-                return;
-            }
-        }
-        
-        // SPIFFS-Daten separat sammeln
-        if (currentOffset >= SPIFFS_START) {
-            uint32_t spiffsOffset = currentOffset - SPIFFS_START;
-            if (spiffsOffset < spiffsSize) {
-                size_t copyLen = min(len, spiffsSize - spiffsOffset);
-                memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
-                Serial.printf("Collecting SPIFFS data at offset %u, length %u\n", spiffsOffset, copyLen);
-            }
-        }
-    } else {
-        // Normal firmware update
-        if (Update.write(data, len) != len) {
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
-                return;
-            }
-        }
-    }
-    
-    currentOffset += len;
-
-    if (final) {
-        if (Update.end(true)) {
-            Serial.println("Firmware update complete");
-            
-            if (isFullImage && spiffsBuffer) {
-                Serial.println("Starting SPIFFS update");
-                
-                // Unmount SPIFFS first
-                if (SPIFFS.begin()) {
-                    SPIFFS.end();
-                }
-                
-                // Update SPIFFS
-                if (!Update.begin(spiffsSize, U_SPIFFS)) {
-                    Serial.println("Could not begin SPIFFS update");
-                    free(spiffsBuffer);
-                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
-                    return;
-                }
-                
-                if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
-                    Serial.println("SPIFFS Write Failed");
-                    Update.printError(Serial);
-                    free(spiffsBuffer);
-                    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);
-                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
-                    return;
-                }
-                
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-                Serial.println("SPIFFS update complete");
-                
-                // 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();
-            }
-            
-            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-            delay(1000);
-            ESP.restart();
-        } else {
-            if (spiffsBuffer) {
-                free(spiffsBuffer);
-                spiffsBuffer = nullptr;
-            }
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
-            } else {
-                request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-                delay(1000);
-                ESP.restart();
-            }
-        }
-    }
-}
-
--- a/src/ota.h
+++ b/src/ota.h
@@ -1,8 +0,0 @@
-#ifndef OTA_H
-#define OTA_H
-
-#include <ESPAsyncWebServer.h>
-
-void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
-
-#endif
--- a/src/scale.cpp
+++ b/src/scale.cpp
@@ -3,9 +3,9 @@
 #include <ArduinoJson.h>
 #include "config.h"
 #include "HX711.h"
-#include <EEPROM.h>
 #include "display.h"
 #include "esp_task_wdt.h"
+#include <Preferences.h>

 HX711 scale;

@@ -17,6 +17,10 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 uint8_t pauseMainTask = 0;

+Preferences preferences;
+const char* NVS_NAMESPACE = "scale";
+const char* NVS_KEY_CALIBRATION = "cal_value";
+
 // ##### Funktionen für Waage #####
 uint8_t tareScale() {
  Serial.println("Tare scale");
@@ -48,13 +52,12 @@ void scale_loop(void * parameter) {

 void start_scale() {
  Serial.println("Prüfe Calibration Value");
-  long calibrationValue; // calibration value (see example file "Calibration.ino")
-  //calibrationValue = 696.0; // uncomment this if you want to set the calibration value in the sketch
+  long calibrationValue;

-  EEPROM.begin(512);
-  EEPROM.get(calVal_eepromAdress, calibrationValue); // uncomment this if you want to fetch the calibration value from eeprom
-
-  //calibrationValue = EEPROM.read(calVal_eepromAdress);
+  // NVS
+  preferences.begin(NVS_NAMESPACE, true); // true = readonly
+  calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  preferences.end();

  Serial.print("Read Scale Calibration Value ");
  Serial.println(calibrationValue);
@@ -137,18 +140,19 @@ uint8_t calibrate_scale() {
    {
      Serial.print("New calibration value has been set to: ");
      Serial.println(newCalibrationValue);
-      Serial.print("Save this value to EEPROM adress ");
-      Serial.println(calVal_eepromAdress);

-      //EEPROM.put(calVal_eepromAdress, newCalibrationValue);
-      EEPROM.put(calVal_eepromAdress, newCalibrationValue);
-      EEPROM.commit();
+      // Speichern mit NVS
+      preferences.begin(NVS_NAMESPACE, false); // false = readwrite
+      preferences.putLong(NVS_KEY_CALIBRATION, newCalibrationValue);
+      preferences.end();

-      EEPROM.get(calVal_eepromAdress, newCalibrationValue);
-      //newCalibrationValue = EEPROM.read(calVal_eepromAdress);
+      // Verifizieren
+      preferences.begin(NVS_NAMESPACE, true);
+      long verifyValue = preferences.getLong(NVS_KEY_CALIBRATION, 0);
+      preferences.end();

-      Serial.print("Read Value ");
-      Serial.println(newCalibrationValue);
+      Serial.print("Verified stored value: ");
+      Serial.println(verifyValue);

      Serial.println("End calibration, revome weight");

--- a/src/website.cpp
+++ b/src/website.cpp
@@ -7,10 +7,14 @@
 #include "nfc.h"
 #include "scale.h"
 #include "esp_task_wdt.h"
-#include "ota.h"
+#include <Update.h>
+
+#ifndef VERSION
+  #define VERSION "1.1.0"
+#endif

 // Cache-Control Header definieren
-#define CACHE_CONTROL "max-age=31536000" // Cache für 1 Jahr
+#define CACHE_CONTROL "max-age=604800" // Cache für 1 Woche

 AsyncWebServer server(webserverPort);
 AsyncWebSocket ws("/ws");
@@ -44,7 +48,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
        }

        else if (doc["type"] == "writeNfcTag") {
-            if (doc.containsKey("payload")) {
+            if (doc["payload"].is<String>()) {
                // Versuche NFC-Daten zu schreiben
                String payloadString;
                serializeJson(doc["payload"], payloadString);
@@ -156,6 +160,14 @@ void sendAmsData(AsyncWebSocketClient *client) {
 }

 void setupWebserver(AsyncWebServer &server) {
+    // WebSocket-Optimierungen
+    ws.onEvent(onWsEvent);
+    ws.enable(true);
+
+    // Konfiguriere Server für große Uploads
+    server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){});
+    server.onFileUpload([](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final){});
+
    // Lade die Spoolman-URL beim Booten
    spoolmanUrl = loadSpoolmanUrl();
    Serial.print("Geladene Spoolman-URL: ");
@@ -222,7 +234,7 @@ void setupWebserver(AsyncWebServer &server) {
        html.replace("{{spoolmanUrl}}", spoolmanUrl);

        JsonDocument doc;
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc.containsKey("bambu_ip")) {
+        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
            String bambuIp = doc["bambu_ip"].as<String>();
            String bambuSerial = doc["bambu_serialnr"].as<String>();
            String bambuCode = doc["bambu_accesscode"].as<String>();
@@ -338,31 +350,81 @@ void setupWebserver(AsyncWebServer &server) {
        Serial.println("RFID.js gesendet");
    });

-    // Route for Firmware Update
+    // Vereinfachter Update-Handler
    server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
-        // During OTA, reduce memory usage
-        ws.enable(false);  // Temporarily disable WebSocket
-        ws.cleanupClients();
-        
-        Serial.println("Request for /upgrade received");
        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/upgrade.html.gz", "text/html");
        response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Cache-Control", CACHE_CONTROL);
+        response->addHeader("Cache-Control", "no-store");
        request->send(response);
    });

+    // Update-Handler mit verbesserter Fehlerbehandlung
    server.on("/update", HTTP_POST, 
        [](AsyncWebServerRequest *request) {
-            // The response will be sent from handleOTAUpload when the upload is complete
+            // Nach Update-Abschluss
+            bool success = !Update.hasError();
+            AsyncWebServerResponse *response = request->beginResponse(
+                success ? 200 : 400,
+                "application/json",
+                success ? "{\"success\":true,\"message\":\"Update successful\"}" 
+                       : "{\"success\":false,\"message\":\"Update failed\"}"
+            );
+            response->addHeader("Connection", "close");
+            request->send(response);
+            
+            if (success) {
+                delay(500);
+                ESP.restart();
+            }
        },
        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
-            // Free memory before handling update
-            ws.enable(false);
-            ws.cleanupClients();
-            handleOTAUpload(request, filename, index, data, len, final);
+            static size_t updateSize = 0;
+            static int command = 0;
+
+            if (!index) {
+                updateSize = request->contentLength();
+                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
+                Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
+
+                if (!Update.begin(updateSize, command)) {
+                    Serial.printf("Update Begin Error: ");
+                    Update.printError(Serial);
+                    String errorMsg = String("Update begin failed: ") + Update.errorString();
+                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                    return;
+                }
+            }
+
+            if (len) {
+                if (Update.write(data, len) != len) {
+                    Serial.printf("Update Write Error: ");
+                    Update.printError(Serial);
+                    String errorMsg = String("Write failed: ") + Update.errorString();
+                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                    return;
+                }
+                Serial.printf("Progress: %u/%u\r", index + len, updateSize);
+            }
+
+            if (final) {
+                if (!Update.end(true)) {
+                    Serial.printf("Update End Error: ");
+                    Update.printError(Serial);
+                    String errorMsg = String("Update end failed: ") + Update.errorString();
+                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                    return;
+                }
+                Serial.printf("\nUpdate Success: %uB\n", index+len);
+            }
        }
    );

+    server.on("/api/version", HTTP_GET, [](AsyncWebServerRequest *request){
+        String fm_version = VERSION;
+        String jsonResponse = "{\"version\": \""+ fm_version +"\"}";
+        request->send(200, "application/json", jsonResponse);
+    });
+
    // Fehlerbehandlung für nicht gefundene Seiten
    server.onNotFound([](AsyncWebServerRequest *request){
        Serial.print("404 - Nicht gefunden: ");
@@ -379,3 +441,80 @@ void setupWebserver(AsyncWebServer &server) {
    server.begin();
    Serial.println("Webserver gestartet");
 }
+
+void handleOTAUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
+    static bool isSpiffsUpdate = false;
+    if (!index) {
+        // Start eines neuen Uploads
+        Serial.println("Update Start: " + filename);
+        
+        // Überprüfe den Dateityp basierend auf dem Dateinamen
+        bool isFirmware = filename.startsWith("filaman_");
+        isSpiffsUpdate = filename.startsWith("webpage_");
+        
+        if (!isFirmware && !isSpiffsUpdate) {
+            request->send(400, "application/json", "{\"message\":\"Invalid file type. File must start with 'filaman_' or 'webpage_'\"}");
+            return;
+        }
+
+        // Wähle den Update-Typ basierend auf dem Dateinamen
+        if (isSpiffsUpdate) {
+            if (!Update.begin(SPIFFS.totalBytes(), U_SPIFFS)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", "{\"message\":\"SPIFFS Update failed: " + String(Update.errorString()) + "\"}");
+                return;
+            }
+            // Backup JSON configs before SPIFFS update
+            backupJsonConfigs();
+        } else {
+            if (!Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", "{\"message\":\"Firmware Update failed: " + String(Update.errorString()) + "\"}");
+                return;
+            }
+        }
+    }
+
+    if (Update.write(data, len) != len) {
+        Update.printError(Serial);
+        request->send(400, "application/json", "{\"message\":\"Write failed: " + String(Update.errorString()) + "\"}");
+        return;
+    }
+
+    if (final) {
+        if (!Update.end(true)) {
+            Update.printError(Serial);
+            request->send(400, "application/json", "{\"message\":\"Update failed: " + String(Update.errorString()) + "\"}");
+            return;
+        }
+        if (isSpiffsUpdate) {
+            // Restore JSON configs after SPIFFS update
+            restoreJsonConfigs();
+        }
+        request->send(200, "application/json", "{\"message\":\"Update successful!\", \"restart\": true}");
+        delay(500);
+        ESP.restart();
+    }
+}
+
+void backupJsonConfigs() {
+    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
+    for (const char* config : configs) {
+        if (SPIFFS.exists(config)) {
+            String backupPath = String(config) + ".bak";
+            SPIFFS.remove(backupPath);
+            SPIFFS.rename(config, backupPath);
+        }
+    }
+}
+
+void restoreJsonConfigs() {
+    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
+    for (const char* config : configs) {
+        String backupPath = String(config) + ".bak";
+        if (SPIFFS.exists(backupPath)) {
+            SPIFFS.remove(config);
+            SPIFFS.rename(backupPath, config);
+        }
+    }
+}
--- a/src/website.h
+++ b/src/website.h
@@ -6,8 +6,8 @@
 #include "commonFS.h"
 #include "api.h"
 #include <ArduinoJson.h>
-#include <ESPAsyncWebServer.h>
-#include <AsyncWebSocket.h>
+#include <Update.h>
+#include <AsyncTCP.h>
 #include "bambu.h"
 #include "nfc.h"
 #include "scale.h"
@@ -17,10 +17,20 @@ extern String spoolmanUrl;
 extern AsyncWebServer server;
 extern AsyncWebSocket ws;

+// Server-Initialisierung und Handler
+void initWebServer();
+void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
+void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total);
 void setupWebserver(AsyncWebServer &server);
+
+// WebSocket-Funktionen
 void sendAmsData(AsyncWebSocketClient *client);
 void sendNfcData(AsyncWebSocketClient *client);
 void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
 void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);

+// Upgrade-Funktionen
+void backupJsonConfigs();
+void restoreJsonConfigs();
+
 #endif
--- a/src/wlan.cpp
+++ b/src/wlan.cpp
@@ -10,9 +10,19 @@ WiFiManager wm;
 bool wm_nonblocking = false;

 void initWiFi() {
+    // Optimierte WiFi-Einstellungen
    WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
+    WiFi.setSleep(false); // disable sleep mode
+    esp_wifi_set_ps(WIFI_PS_NONE);
    
-    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+    // Maximale Sendeleistung
+    WiFi.setTxPower(WIFI_POWER_19_5dBm); // Set maximum transmit power
+  
+    // Optimiere TCP/IP Stack
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
+    
+    // Aktiviere WiFi-Roaming für bessere Stabilität
+    esp_wifi_set_rssi_threshold(-80);
  
    if(wm_nonblocking) wm.setConfigPortalBlocking(false);
    wm.setConfigPortalTimeout(320); // Portal nach 5min schließen