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

2025-02-18 22:05:32 +01:00 · 2025-02-18 22:04:50 +01:00
30 changed files with 397 additions and 1767 deletions
--- a/.github/workflows/gitea-release.yml
+++ b/.github/workflows/gitea-release.yml
@@ -1,165 +0,0 @@
-name: Gitea Release
-
-on:
-  workflow_call:
-    secrets:
-      GITEA_TOKEN:
-        description: 'Token für Gitea API-Zugriff'
-        required: true
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install 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 xxd
-    
-    - name: Build Firmware
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        
-        # Build firmware and SPIFFS
-        echo "Building firmware and SPIFFS..."
-        pio run -e esp32dev
-        pio run -t buildfs
-        
-        # Copy firmware binary
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
-        
-        # Create SPIFFS binary with minimal header
-        ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
-        
-        # Create 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 filaman_full_${VERSION}.bin \
-          0x1000 bootloader.bin \
-          0x8000 partitions.bin \
-          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin)
-        
-        # Verify file sizes
-        echo "File sizes:"
-        (cd .pio/build/esp32dev && ls -lh *.bin)
-    
-    - name: Get version from platformio.ini
-      id: get_version
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-      
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        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
-
-    - name: Determine Gitea URL
-      id: gitea_url
-      run: |
-        echo "Debug Environment:"
-        echo "GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-not set}"
-        echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
-        echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}"
-        echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
-        echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
-        
-        # Set API URL based on environment
-        if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
-          GITEA_API_URL="${GITHUB_SERVER_URL}"
-          GITEA_REPO=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f2)
-          GITEA_OWNER=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f1)
-        else
-          echo "Error: This workflow is only for Gitea"
-          exit 1
-        fi
-        
-        echo "GITEA_API_URL=${GITEA_API_URL}" >> $GITHUB_OUTPUT
-        echo "GITEA_REPO=${GITEA_REPO}" >> $GITHUB_OUTPUT
-        echo "GITEA_OWNER=${GITEA_OWNER}" >> $GITHUB_OUTPUT
-
-    - name: Create Gitea Release
-      env:
-        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }}
-        GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }}
-        GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }}
-      run: |
-        # Debug Token (nur Länge ausgeben für Sicherheit)
-        echo "Debug: Token length: ${#GITEA_TOKEN}"
-        if [ -z "$GITEA_TOKEN" ]; then
-          echo "Error: GITEA_TOKEN is empty"
-          exit 1
-        fi
-
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        cd .pio/build/esp32dev
-        
-        # Debug-Ausgaben
-        echo "Debug: API URL: ${GITEA_API_URL}"
-        echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}"
-        
-        # Erstelle zuerst den Release ohne Dateien
-        echo "Debug: Creating release..."
-        RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}"
-        
-        RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \
-          -X POST \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          -H "Content-Type: application/json" \
-          -d "${RELEASE_DATA}" \
-          "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases")
-        
-        RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1)
-        RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1)
-        
-        if [ "$RELEASE_STATUS" != "201" ]; then
-          echo "Error: Failed to create release"
-          echo "Response: $RELEASE_BODY"
-          exit 1
-        fi
-        
-        # Extrahiere die Release-ID aus der Antwort
-        RELEASE_ID=$(echo "$RELEASE_BODY" | grep -o '"id":[0-9]*' | cut -d':' -f2)
-        
-        # Lade die Dateien einzeln hoch
-        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
-          if [ -f "$file" ]; then
-            echo "Debug: Uploading $file..."
-            UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
-              -X POST \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/octet-stream" \
-              --data-binary @"$file" \
-              "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${RELEASE_ID}/assets?name=${file}")
-            
-            UPLOAD_STATUS=$(echo "$UPLOAD_RESPONSE" | tail -n1)
-            if [ "$UPLOAD_STATUS" != "201" ]; then
-              echo "Warning: Failed to upload $file"
-              echo "Response: $(echo "$UPLOAD_RESPONSE" | head -n -1)"
-            else
-              echo "Successfully uploaded $file"
-            fi
-          fi
-        done
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -1,118 +0,0 @@
-name: GitHub Release
-
-on:
-  workflow_call:
-    secrets:
-      RELEASE_TOKEN:
-        description: 'GitHub token for release creation'
-        required: true
-
-permissions:
-  contents: write
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    
-    - 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 xxd
-    
-    - name: Build Firmware
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        
-        # Always build firmware and SPIFFS
-        echo "Building firmware and SPIFFS..."
-        pio run -e esp32dev
-        pio run -t buildfs
-        
-        # Copy firmware binary
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
-        
-        # Create SPIFFS binary with minimal header
-        ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${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 \
-          0x1000 bootloader.bin \
-          0x8000 partitions.bin \
-          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin)
-        
-        # Verify file sizes
-        echo "File sizes:"
-        (cd .pio/build/esp32dev && ls -lh *.bin)
-    
-    - name: Get version from platformio.ini
-      id: get_version
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-      
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        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
-
-    - name: Create GitHub Release
-      env:
-        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-      run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        cd .pio/build/esp32dev
-        
-        # Create release with available files
-        FILES_TO_UPLOAD=""
-        
-        # Always add firmware
-        if [ -f "upgrade_filaman_firmware_v${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
-        fi
-        
-        # Add SPIFFS and full binary only if they exist
-        if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${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 }}" \
-            $FILES_TO_UPLOAD
-        else
-          echo "Error: No files found to upload"
-          exit 1
-        fi
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@@ -0,0 +1,103 @@
+name: Gitea Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v4
+    
+    - 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
+    
+    - name: Build Firmware
+      run: |
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
+        
+    - name: Install esptool
+      run: |
+        pip install esptool
+        
+    - name: Merge firmware and SPIFFS
+      run: |
+        esptool.py --chip esp32 merge_bin \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o .pio/build/esp32dev/filaman_full.bin \
+          0x1000 .pio/build/esp32dev/bootloader.bin \
+          0x8000 .pio/build/esp32dev/partitions.bin \
+          0x10000 .pio/build/esp32dev/firmware.bin \
+          0x290000 .pio/build/esp32dev/spiffs.bin
+
+    - name: Prepare OTA firmware
+      run: |
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+    
+    - name: Get version from tag
+      id: get_version
+      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+      
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    
+    - name: Create Release
+    env:
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+    run: |
+        # Create release using Gitea API
+        RESPONSE=$(curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        -H "accept: application/json" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+        -d '{
+            "tag_name": "${{ github.ref_name }}",
+            "name": "Release ${{ steps.get_version.outputs.VERSION }}",
+            "body": "${{ steps.changelog.outputs.CHANGES }}",
+            "draft": false,
+            "prerelease": false
+        }')
+        
+        # Extract release ID from response
+        RELEASE_ID=$(echo $RESPONSE | jq -r .id)
+        
+        # Upload full firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_full.bin
+        
+        # Upload OTA firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_ota.bin
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@@ -0,0 +1,85 @@
+name: GitHub Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # Required for creating releases at job level
+    steps:
+    - uses: actions/checkout@v4
+    
+    - 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
+    
+    - name: Build Firmware
+      run: |
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
+        
+    - name: Install esptool
+      run: |
+        pip install esptool
+        
+    - name: Merge firmware and SPIFFS
+      run: |
+        esptool.py --chip esp32 merge_bin \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o .pio/build/esp32dev/filaman_full.bin \
+          0x1000 .pio/build/esp32dev/bootloader.bin \
+          0x8000 .pio/build/esp32dev/partitions.bin \
+          0x10000 .pio/build/esp32dev/firmware.bin \
+          0x290000 .pio/build/esp32dev/spiffs.bin
+
+    - name: Prepare OTA firmware
+      run: |
+        # Use PlatformIO to create a proper OTA image
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+    
+    - name: Get version from tag
+      id: get_version
+      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+      
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    
+    - name: Install and Configure GitHub CLI
+      run: |
+        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+        && sudo apt update \
+        && sudo apt install gh -y
+        
+    - name: Create Release with GitHub CLI
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release create "${{ github.ref_name }}" \
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
+          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,41 +1,32 @@
-name: Release Workflow
+name: Release

 on:
  push:
    tags:
      - 'v*'

-permissions:
-  contents: write
-
 jobs:
-  detect-provider:
+  detect-and-run:
    runs-on: ubuntu-latest
-    outputs:
-      provider: ${{ steps.provider.outputs.provider }}
    steps:
-      - name: Determine CI Provider
-        id: provider
-        shell: bash
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Determine hosting platform
+        id: platform
        run: |
-          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
-            echo "provider=gitea" >> "$GITHUB_OUTPUT"
+          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
+            echo "platform=github" >> $GITHUB_OUTPUT
+          elif [[ "$CI_SERVER_URL" == *"gitlab"* ]]; then
+            echo "platform=gitlab" >> $GITHUB_OUTPUT
          else
-            echo "provider=github" >> "$GITHUB_OUTPUT"
+            echo "platform=gitea" >> $GITHUB_OUTPUT
          fi

-  github-release:
-    needs: detect-provider
-    permissions:
-      contents: write
-    if: needs.detect-provider.outputs.provider == 'github'
-    uses: ./.github/workflows/github-release.yml
-    secrets:
-      RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run GitHub Release
+        if: steps.platform.outputs.platform == 'github'
+        uses: ./.github/workflows/providers/github-release.yml

-  gitea-release:
-    needs: detect-provider
-    if: needs.detect-provider.outputs.provider == 'gitea'
-    uses: ./.github/workflows/gitea-release.yml
-    secrets:
-      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+      - name: Run Gitea Release
+        if: steps.platform.outputs.platform == 'gitea'
+        uses: ./.github/workflows/providers/gitea-release.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,921 +1,5 @@
 # Changelog

-## [1.3.46] - 2025-02-22
-### Changed
- update webpages for version v1.3.46
-
-
-## [1.3.45] - 2025-02-22
-### Changed
- update webpages for version v1.3.45
- workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic
-
-
-## [1.3.44] - 2025-02-22
-### Changed
- update webpages for version v1.3.44
- update header title to 'Hollo Lollo Trollo'
- update header title to 'Filament Management Tool' and improve update response messages
-
-
-## [1.3.43] - 2025-02-22
-### Changed
- update webpages for version v1.3.43
- update header title to 'Hollo Lollo Trollo'
-
-
-## [1.3.42] - 2025-02-22
-### Changed
- update webpages for version v1.3.42
-
-### Fixed
- correct path for SPIFFS binary creation in Gitea release workflow
-
-
-## [1.3.41] - 2025-02-22
-### Changed
- update webpages for version v1.3.41
-
-### Fixed
- remove redundant buffer size setting in NFC initialization
- update SPIFFS binary creation and enhance NFC buffer size
-
-
-## [1.3.40] - 2025-02-22
-### Changed
- update webpages for version v1.3.40
-
-### Fixed
- update SPIFFS binary header and enhance WebSocket error handling
-
-
-## [1.3.39] - 2025-02-22
-### Changed
- update webpages for version v1.3.39
- workflow: update SPIFFS binary creation to set chip version to max supported
-
-
-## [1.3.38] - 2025-02-22
-### Changed
- update webpages for version v1.3.38
- workflow: update SPIFFS binary creation with minimal ESP32 image header
-
-
-## [1.3.37] - 2025-02-22
-### Changed
- update webpages for version v1.3.37
- workflow: update ESP32-WROOM image header for SPIFFS binary creation
-
-
-## [1.3.36] - 2025-02-22
-### Changed
- update webpages for version v1.3.36
- partition: update SPIFFS binary header and offsets in workflow files
-
-
-## [1.3.35] - 2025-02-22
-### Changed
- update webpages for version v1.3.35
- partition: update SPIFFS binary header and offsets in workflow files
-
-
-## [1.3.34] - 2025-02-22
-### Changed
- update webpages for version v1.3.34
- partition: update SPIFFS binary creation and offsets in workflow files
-
-
-## [1.3.33] - 2025-02-22
-### Changed
- update webpages for version v1.3.33
- partition: update spiffs offset and app sizes in partition files
- partition: update spiffs offset in partition files
- partition: update app sizes and offsets in partitions.csv
-
-
-## [1.3.32] - 2025-02-22
-### Changed
- update webpages for version v1.3.32
- workflow: update magic byte for SPIFFS binary creation
-
-
-## [1.3.31] - 2025-02-22
-### Changed
- update webpages for version v1.3.31
- workflow: remove unnecessary data and SPIFFS change checks from release workflows
-
-
-## [1.3.30] - 2025-02-22
-### Changed
- update webpages for version v1.3.30
- workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte
-
-
-## [1.3.29] - 2025-02-21
-### Changed
- update webpages for version v1.3.29
- workflow: update Gitea release workflow to create release before file uploads
-
-
-## [1.3.28] - 2025-02-21
-### Changed
- update webpages for version v1.3.28
- workflow: update Gitea release workflow to use file uploads with curl
-
-
-## [1.3.27] - 2025-02-21
-### Added
- workflow: add GITEA_TOKEN secret for Gitea API access in release workflows
-
-### Changed
- update webpages for version v1.3.27
-
-
-## [1.3.26] - 2025-02-21
-### Changed
- update webpages for version v1.3.26
-
-### Fixed
- workflow: improve Gitea release workflow with enhanced error handling and debug outputs
-
-
-## [1.3.25] - 2025-02-21
-### Changed
- update webpages for version v1.3.25
- workflow: update Gitea release workflow to include RUNNER_NAME and improve error handling
-
-
-## [1.3.24] - 2025-02-21
-### Changed
- update webpages for version v1.3.24
- workflow: rename update files to upgrade in GitHub release workflow
- workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen
-
-### Fixed
- workflow: improve Gitea release process with dynamic URL determination and debug outputs
-
-
-## [1.3.23] - 2025-02-21
-### Changed
- update webpages for version v1.3.23
-
-### Fixed
- workflow: enhance Gitea release process with debug outputs and API connection checks
-
-
-## [1.3.22] - 2025-02-21
-### Added
- workflow: improve Gitea release process with additional environment variables and error handling
-
-### Changed
- update webpages for version v1.3.22
-
-
-## [1.3.21] - 2025-02-21
-### Changed
- update webpages for version v1.3.21
- workflow: enhance Gitea release process with API integration and token management
-
-
-## [1.3.20] - 2025-02-21
-### Changed
- update webpages for version v1.3.20
- workflow: enable git tagging and pushing for Gitea releases
-
-
-## [1.3.19] - 2025-02-21
-### Changed
- update webpages for version v1.3.19
- workflow: enable git push for version tagging in Gitea release
-
-
-## [1.3.18] - 2025-02-21
-### Changed
- ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten.
- ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained.
-
-
-
-## [1.3.18] - 2025-02-21
-### Added
- add note about filaman_full.bin installation in changelog
-
-### Changed
- update webpages for version v1.3.18
- update changelog for version 1.3.18 and enhance update script for existing entries
-
-## [1.3.17] - 2025-02-21
-### Changed
- update webpages for version v1.3.17
- ci: comment out git tag and push commands in gitea-release workflow
-
-
-## [1.3.16] - 2025-02-21
-### Changed
- update webpages for version v1.3.16
- ci: update filenames for firmware and website binaries in release workflows
-
-
-## [1.3.15] - 2025-02-21
-### Changed
- update webpages for version v1.3.15
-
-### Fixed
- ci: fix missing 'fi' in GitHub release workflow script
-
-
-## [1.3.14] - 2025-02-21
-### Changed
- update webpages for version v1.3.14
- ci: update GitHub release workflow to improve file upload handling
-
-
-## [1.3.13] - 2025-02-21
-### Changed
- update webpages for version v1.3.13
- ci: update GitHub release workflow to use RELEASE_TOKEN for improved security
-
-
-## [1.3.12] - 2025-02-21
-### Changed
- update webpages for version v1.3.12
- ci: enhance GitHub release workflow with token handling and file upload improvements
-
-
-## [1.3.11] - 2025-02-21
-### Changed
- update webpages for version v1.3.11
- ci: refactor Gitea release workflow by simplifying input handling and removing unnecessary checks
-
-
-## [1.3.10] - 2025-02-21
-### Changed
- update webpages for version v1.3.10
- ci: simplify GitHub release workflow by removing provider verification step
-
-
-## [1.3.9] - 2025-02-21
-### Changed
- update webpages for version v1.3.9
- ci: comment out permissions for GitHub release workflow
-
-
-## [1.3.8] - 2025-02-21
-### Added
- add Gitea and GitHub release workflows
-
-### Changed
- update webpages for version v1.3.8
-
-
-## [1.3.7] - 2025-02-21
-### Added
- add GitHub and Gitea release workflows
-
-### Changed
- update webpages for version v1.3.7
-
-
-## [1.3.6] - 2025-02-21
-### Changed
- update webpages for version v1.3.6
-
-### Fixed
- update GitHub token reference and correct file path in release workflow
-
-
-## [1.3.5] - 2025-02-21
-### Added
- enhance release workflow to support Gitea alongside GitHub
-
-### Changed
- update webpages for version v1.3.5
-
-
-## [1.3.4] - 2025-02-21
-### Added
- add Gitea and GitHub release workflows
-
-### Changed
- update webpages for version v1.3.4
- Merge branch 'old'
-
-
-## [1.3.3] - 2025-02-21
-### Changed
- update webpages for version v1.3.3
-
-### Fixed
- correct directory path in GitHub workflows for SPIFFS binary
-
-
-## [1.3.2] - 2025-02-21
-### Added
- add missing conditional exit in release workflow
-
-### Changed
- update webpages for version v1.3.2
-
-
-## [1.3.1] - 2025-02-21
-### Added
- enhance GitHub and Gitea release workflows with Python setup and binary preparation
-
-### Changed
- update webpages for version v1.3.1
-
-
-## [1.3.0] - 2025-02-21
-### Changed
- bump version to 1.3.0 in platformio.ini
-
-
-## [1.2.102] - 2025-02-21
-### Changed
- update webpages for version v1.2.102
-
-### Fixed
- adjust bootloader offset in binary merge for Gitea and GitHub workflows
-
-
-## [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
-
-### 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
-
-### Changed
- update webpages for version v1.2.66
-
-
-## [1.2.65] - 2025-02-20
-### Changed
- update webpages for version v1.2.65
-
-
-## [1.2.64] - 2025-02-20
-### Changed
- update webpages for version v1.2.64
-
-### Fixed
- improve error handling in OTA upload process
-
-
-## [1.2.63] - 2025-02-20
-### Added
- update version to 1.2.63
-
-### Changed
- update webpages for version v1.2.63
-
-
-## [1.2.62] - 2025-02-20
-### Added
- update version to 1.2.62
-
-### Changed
- update webpages for version 1.2.62
-
-
-## [1.2.61] - 2025-02-20
-### Added
- update version to 1.2.61 and enhance OTA update error handling
-
-### Changed
- update webpages for version 1.2.61
-
-
-## [1.2.60] - 2025-02-20
-### Added
- update version to 1.2.60 in platformio configuration
-
-### Changed
- update webpages for version 1.2.60
-
-
-## [1.2.59] - 2025-02-20
-### Added
- update version to 1.2.59 and enhance OTA upload handling
-
-### Changed
- update webpages for version 1.2.59
-
-
-## [1.2.58] - 2025-02-20
-### Added
- update version to 1.2.58 in HTML files and platformio configuration
-
-
-## [1.2.57] - 2025-02-20
-### Added
- update version to 1.2.57 in platformio configuration
-
-### Fixed
- update spiffs offset and sizes in firmware and partitions configuration
-
-
-## [1.2.56] - 2025-02-19
-### Added
- update version to 1.2.56 and adjust firmware and partition settings
-
-### Changed
- remove redundant comment from Gitea release workflow
-
-
-## [1.2.55] - 2025-02-19
-### Added
- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version
-
-
-## [1.2.54] - 2025-02-19
-### Added
- update version to 1.2.54 and add check for missing changelog in Gitea release workflow
-
-
-## [1.2.53] - 2025-02-19
-### Added
- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
-
-
-## [1.2.52] - 2025-02-19
-### Added
- update version to 1.2.52 and improve Gitea release workflow output handling
-
-
-## [1.2.51] - 2025-02-19
-### Added
- update version to 1.2.51 and add debug output in Gitea release workflow
-
-
-## [1.2.50] - 2025-02-19
-### Added
- update version to 1.2.50 and remove obsolete build workflow
-
-
-## [1.2.49] - 2025-02-19
-### Added
- update version to 1.2.49 and modify changelog reading in Gitea release workflow
-
-
-## [1.2.48] - 2025-02-19
-### Added
- update version to 1.2.48 and modify changelog reading in release workflows
-
-
-## [1.2.47] - 2025-02-19
-### Added
- update version to 1.2.47 and modify changelog reading in GitHub release workflow
-
-
-## [1.2.46] - 2025-02-19
-### Added
- update Gitea release workflow to include changelog and increment version to 1.2.46
-
-
-## [1.2.45] - 2025-02-19
-### Added
- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
-
-
-## [1.2.44] - 2025-02-19
-### Added
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
-
-
-## [1.2.43] - 2025-02-19
-### Added
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
-
-
-## [1.2.42] - 2025-02-19
-### Added
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
-
-
-## [1.2.41] - 2025-02-19
-### Added
- update Gitea release workflow debug output and increment version to 1.2.41
-
-
-## [1.2.40] - 2025-02-19
-### Added
- add inputs for Gitea release workflow and increment version to 1.2.40
-
-
-## [1.2.39] - 2025-02-19
-### Added
- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
-
-
-## [1.2.38] - 2025-02-19
-### Added
- update Gitea release workflow and increment version to 1.2.38
-
-
-## [1.2.37] - 2025-02-19
-### Added
- update Gitea release workflow and increment version to 1.2.37
-
-
-## [1.2.36] - 2025-02-19
-### Added
- update Gitea release workflow and increment version to 1.2.36
-
-
-## [1.2.35] - 2025-02-19
-### Added
- update Gitea release workflow and version to 1.2.35
-
-
-## [1.2.34] - 2025-02-19
-### Added
- update version to 1.2.34 and enhance Gitea and GitHub release workflows
-
-
-## [1.2.33] - 2025-02-19
-### Added
- update version to 1.2.33 and refactor release workflows for Gitea and GitHub
-
-
-## [1.2.32] - 2025-02-19
-### Added
- update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases
-
-
-## [1.2.31] - 2025-02-19
-### Added
- update version to 1.2.31
-
-
-## [1.2.30] - 2025-02-19
-### Added
- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
-
-
-## [1.2.29] - 2025-02-19
-### Added
- update version to 1.2.29 and enhance Gitea release workflow with improved error handling and debugging
-
-
-## [1.2.28] - 2025-02-19
-### Added
- add build and release workflows for Gitea and GitHub, increment version to 1.2.28
-
-
-## [1.2.27] - 2025-02-19
-### Added
- enhance CI workflows with provider detection and update version to 1.2.27
-
-
-## [1.2.26] - 2025-02-19
-### Added
- update release workflows for Gitea and GitHub, increment version to 1.2.26
-
-
-## [1.2.25] - 2025-02-19
-### Added
- update GitHub release workflows and increment version to 1.2.25
-
-
-## [1.2.24] - 2025-02-19
-### Added
- update GitHub release workflow and increment version to 1.2.24
-
-
-## [1.2.23] - 2025-02-19
-### Added
- update Gitea release workflow and increment version to 1.2.23
-
-
-## [1.2.22] - 2025-02-19
-### Added
- update Gitea runner configuration and increment version to 1.2.22
-
-
-## [1.2.21] - 2025-02-19
-### Added
- update Gitea release condition and increment version to 1.2.21
-
-
-## [1.2.20] - 2025-02-19
-### Added
- update release workflows for GitHub and Gitea, increment version to 1.2.20
-
-
-## [1.2.19] - 2025-02-19
-### Added
- add Gitea and GitHub release workflows for version 1.2.19
-
-
-## [1.2.18] - 2025-02-19
-### Added
- remove Gitea and GitHub release workflows and increment version to 1.2.18
-
-
-## [1.2.17] - 2025-02-19
-### Added
- update Gitea release workflow for version 1.2.17 and improve job structure
-
-
-## [1.2.16] - 2025-02-19
-### Added
- update Gitea release workflow and increment version to 1.2.16
-
-
-## [1.2.15] - 2025-02-19
-### Added
- update version to 1.2.15 and clean up Gitea release workflow
-
-
-## [1.2.14] - 2025-02-19
-### Added
- update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
-
-
-## [1.2.13] - 2025-02-19
-### Added
- update version to 1.2.13 and enhance release workflow with Python setup and Gitea support
-
-
-## [1.2.12] - 2025-02-19
-### Added
- update version to 1.2.12 and refactor release workflows for improved provider detection and execution
-
-
-## [1.2.11] - 2025-02-18
-### Added
- update version to 1.2.11 and enhance GitHub and Gitea release workflows with input validation and improved error handling
-
-
-## [1.2.10] - 2025-02-18
-### Added
- enhance Gitea release workflow with API connection verification and URL validation; update version to 1.2.10
-
-
-## [1.2.9] - 2025-02-18
-### Added
- update version to 1.2.9 in platformio.ini
- refactor GitHub and Gitea release workflows for improved version handling and firmware uploads
-
-
-## [1.2.8] - 2025-02-18
-### Added
- update version to 1.2.8 in platformio.ini; refactor Gitea and GitHub release workflows
- update version to 1.2.7 in platformio.ini; adjust Gitea release workflow
-
-
-## [1.2.6] - 2025-02-18
-### Added
- update version to 1.2.6 in platformio.ini
- update version to 1.2.5; enhance Gitea release workflow and streamline release process
-
-### Changed
- update changelog for version 1.2.5
-
-
-## [1.2.5] - 2025-02-18
-### Added
- update version to 1.2.5; enhance Gitea release workflow and streamline release process
-
-
 ## [1.2.4] - 2025-02-18
 ### Added
 - update version to 1.2.4 in HTML files and platformio.ini
--- a/README.md
+++ b/README.md
@@ -124,24 +124,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
    - Configure WiFi settings through the captive portal.
    - Access the web interface at `http://filaman.local` or the IP address.

-## GitHub Actions Configuration
-
-### Required Secrets for Gitea Releases
-
-When using Gitea as your repository host, you need to configure the following secrets in your repository:
-
- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
-
-Example values:
-```
-GITEA_API_URL=https://git.example.com
-GITEA_TOKEN=abcdef1234567890
-GITEA_REPOSITORY=username/filaman
-```
-
-Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.

 ## Documentation

--- a/html/header.html
+++ b/html/header.html
@@ -6,25 +6,14 @@
    <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"></span></h1>
-                <h4>Hollo Lollo Trollo</h4>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h4>Filament Management Tool</h4>
            </div>
        </div>
        <nav style="display: flex; gap: 1rem;">
@@ -44,6 +33,4 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

--- a/html/index.html
+++ b/html/index.html
@@ -6,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

 <!-- head -->

--- a/html/rfid.html
+++ b/html/rfid.html
@@ -6,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

 <!-- head -->

--- a/html/spoolman.html
+++ b/html/spoolman.html
@@ -6,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

 <!-- head -->

--- a/html/upgrade.html
+++ b/html/upgrade.html
@@ -6,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

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

        <div class="warning">
-            <strong>Warning:</strong> Do not power off the device during update.
+            <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
+            The device will restart automatically after the 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="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="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 class="update-form">
+            <form id="updateForm" enctype='multipart/form-data'>
+                <input type='file' name='update' accept='.bin' required>
+                <input type='submit' value='Start Firmware Update'>
+            </form>
        </div>

-        <div class="progress-container" style="display: none;">
+        <div class="progress-container">
            <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');
@@ -151,44 +64,30 @@
            statusContainer.style.display = 'none';
        }

-        const progress = document.querySelector('.progress-bar');
-        const progressContainer = document.querySelector('.progress-container');
-        const status = document.querySelector('.status');
-
-        function handleUpdate(e) {
+        document.getElementById('updateForm').addEventListener('submit', async (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.');
+                alert('Please select a firmware file.');
                return;
            }

-            // Validate file name pattern
-            if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) {
-                alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)');
-                return;
-            }
-            if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) {
-                alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)');
-                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');
            
            progressContainer.style.display = 'block';
            status.style.display = 'none';
            status.className = 'status';
-
-            // 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);
+            form.querySelector('input[type=submit]').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;
@@ -202,16 +101,6 @@
                    let response = this.responseText;
                    try {
                        const jsonResponse = JSON.parse(response);
-                        
-                        // Handle progress updates
-                        if (jsonResponse.progress !== undefined) {
-                            const percent = jsonResponse.progress;
-                            progress.style.width = percent + '%';
-                            progress.textContent = Math.round(percent) + '%';
-                            return;
-                        }
-                        
-                        // Handle success/error messages
                        response = jsonResponse.message;
                        
                        if (jsonResponse.restart) {
@@ -228,9 +117,12 @@
                            }, 1000);
                        }
                    } catch (e) {
-                        console.error('JSON parse error:', e);
-                        status.textContent = 'Update failed: Invalid response from server';
-                        status.classList.add('error');
+                        if (!isNaN(response)) {
+                            const percent = parseInt(response);
+                            progress.style.width = percent + '%';
+                            progress.textContent = percent + '%';
+                            return;
+                        }
                    }
                    
                    status.textContent = response;
@@ -238,13 +130,13 @@
                    status.style.display = 'block';
                    
                    if (xhr.status !== 200) {
-                        document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                        form.querySelector('input[type=submit]').disabled = false;
                    }
                } catch (error) {
                    status.textContent = 'Error: ' + error.message;
                    status.classList.add('error');
                    status.style.display = 'block';
-                    document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                    form.querySelector('input[type=submit]').disabled = false;
                }
            };

@@ -252,16 +144,11 @@
                status.textContent = 'Update failed: Network error';
                status.classList.add('error');
                status.style.display = 'block';
-                document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                form.querySelector('input[type=submit]').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,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

 <!-- head -->

--- a/html/wifi.html
+++ b/html/wifi.html
@@ -6,24 +6,13 @@
    <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"></span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
@@ -44,8 +33,6 @@
            <div class="ram-status" id="ramStatus"></div>
        </div>
    </div>
-</body>
-</html>

 <!-- head -->

--- a/platformio.ini
+++ b/platformio.ini
@@ -9,9 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.3.46"
-
-#test
+version = "1.2.4"

 [env:esp32dev]
 platform = espressif32
@@ -22,10 +20,7 @@ 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
-    https://github.com/esphome/AsyncTCP.git
-    #mathieucarbou/ESPAsyncWebServer @ ^3.6.0
-    #esp32async/AsyncTCP @ ^3.3.5
+    me-no-dev/AsyncTCP @ ^1.1.1
    bogde/HX711 @ ^0.7.5
    adafruit/Adafruit SSD1306 @ ^2.5.13
    adafruit/Adafruit GFX Library @ ^1.11.11
@@ -48,26 +43,34 @@ build_flags =
    -fdata-sections
    -DNDEBUG
    -mtext-section-literals
-    -DVERSION=\"${common.version}\"
+    '-D VERSION="${common.version}"'
    -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=3
+    -DCORE_DEBUG_LEVEL=1
    -DCONFIG_ARDUHAL_LOG_COLORS=1
    -DOTA_DEBUG=1
+    -DARDUINO_RUNNING_CORE=1
+    -DARDUINO_EVENT_RUNNING_CORE=1
    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
-    -DBOOT_APP_PARTITION_OTA_0=1
-    -DCONFIG_LWIP_TCP_MSL=60000
-    -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
-    -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
+    -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
    
 extra_scripts = 
    scripts/extra_script.py
-    ${env:buildfs.extra_scripts}
+    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 =
-    pre:scripts/combine_html.py  ; Combine header with HTML files
-    scripts/gzip_files.py       ; Compress files for SPIFFS
+; Remove or comment out the targets line
+;targets = buildfs, build

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

--- a/scripts/pre_spiffs.py
+++ b/scripts/pre_spiffs.py
@@ -1,39 +1,7 @@
 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.")
+env.AddPreAction("buildfs", replace_version)
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -122,29 +122,7 @@ def update_changelog():
                f.write(updated_content)
            push_changes(version)
        else:
-            # Version existiert bereits, aktualisiere die bestehenden Einträge
-            version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
-            next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}"
-            
-            # Finde den Start der aktuellen Version
-            version_match = re.search(version_pattern, content)
-            if version_match:
-                version_start = version_match.start()
-                # Suche nach der nächsten Version
-                next_version_match = re.search(next_version_pattern, content[version_start + 1:])
-                
-                if next_version_match:
-                    # Ersetze den Inhalt zwischen aktueller und nächster Version
-                    next_version_pos = version_start + 1 + next_version_match.start()
-                    updated_content = content[:version_start] + changelog_entry + content[next_version_pos:]
-                else:
-                    # Wenn keine nächste Version existiert, ersetze bis zum Ende
-                    updated_content = content[:version_start] + changelog_entry + "\n"
-                
-                with open(changelog_path, 'w') as f:
-                    f.write(updated_content)
-                push_changes(version)
-                print(f"Updated entries for version {version}")
+            print(f"Version {version} already exists in changelog")

 if __name__ == "__main__":
    update_changelog()
--- 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.add<JsonObject>();
+                JsonObject filteredSpool = filteredSpools.createNestedObject();
                filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"];

-                JsonObject filament = filteredSpool["filament"].to<JsonObject>();
+                JsonObject filament = filteredSpool.createNestedObject("filament");
                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["vendor"].to<JsonObject>();
+                JsonObject vendor = filament.createNestedObject("vendor");
                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.add<JsonObject>();
+                JsonObject filteredSpool = filteredSpools.createNestedObject();
                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["filament"].to<JsonObject>();
+                JsonObject filament = filteredSpool.createNestedObject("filament");
                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["vendor"].to<JsonObject>();
+                JsonObject vendor = filament.createNestedObject("vendor");
                vendor["id"] = spool["filament"]["vendor"]["id"];
                vendor["name"] = spool["filament"]["vendor"]["name"];

-                JsonObject extra = filament["extra"].to<JsonObject>();
+                JsonObject extra = filament.createNestedObject("extra");
                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["sm_id"].is<String>() || doc["sm_id"].as<String>() == "") {
+    if (!doc.containsKey("sm_id") || doc["sm_id"] == "") {
        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["key"].is<String>() && field["key"] == extraFields[s]) {
+                        if (field.containsKey("key") && 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["status"].is<String>()) {
+            if (!error && doc.containsKey("status")) {
                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["url"].is<String>()) {
+    if (loadJsonValue("/spoolman_url.json", doc) && doc.containsKey("url")) {
        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["bambu_ip"].is<String>()) {
+    if (loadJsonValue("/bambu_credentials.json", doc) && doc.containsKey("bambu_ip")) {
        // 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"]["upgrade_state"].is<String>()) {
+    if (doc["print"].containsKey("upgrade_state")) {
        // Prüfen ob AMS-Daten vorhanden sind
-        if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) {
+        if (!doc["print"].containsKey("ams") || !doc["print"]["ams"].containsKey("ams")) {
            return;
        }

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

        // Prüfe die externe Spule
-        if (!hasChanges && doc["print"]["vt_tray"].is<String>()) {
+        if (!hasChanges && doc["print"].containsKey("vt_tray")) {
            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"]["vt_tray"].is<String>()) {
+        if (doc["print"].containsKey("vt_tray")) {
            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.add<JsonObject>();
+            JsonObject amsObj = wsArray.createNestedObject();
            amsObj["ams_id"] = ams_data[i].ams_id;

-            JsonArray trays = amsObj["tray"].to<JsonArray>();
+            JsonArray trays = amsObj.createNestedArray("tray");
            int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4;
            
            for (int j = 0; j < maxTrays; j++) {
-                JsonObject trayObj = trays.add<JsonObject>();
+                JsonObject trayObj = trays.createNestedObject();
                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.add<JsonObject>();
+                    JsonObject amsObj = wsArray.createNestedObject();
                    amsObj["ams_id"] = ams_data[j].ams_id;

-                    JsonArray trays = amsObj["tray"].to<JsonArray>();
+                    JsonArray trays = amsObj.createNestedArray("tray");
                    int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4;
                    
                    for (int k = 0; k < maxTrays; k++) {
-                        JsonObject trayObj = trays.add<JsonObject>();
+                        JsonObject trayObj = trays.createNestedObject();
                        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/bambu.h
+++ b/src/bambu.h
@@ -36,5 +36,4 @@ void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
 void bambu_restart();

-extern TaskHandle_t BambuMqttTask;
 #endif
--- a/src/commonFS.cpp
+++ b/src/commonFS.cpp
@@ -1,5 +1,4 @@
 #include "commonFS.h"
-#include <SPIFFS.h>

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

-void initializeSPIFFS() {
-    if (!SPIFFS.begin(true, "/spiffs", 10, "spiffs")) {
-        Serial.println("SPIFFS Mount Failed");
-        return;
+bool initializeSPIFFS() {
+    // Erster Versuch
+    if (SPIFFS.begin(true)) {
+        Serial.println("SPIFFS mounted successfully.");
+        return true;
    }
-    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());
+    
+    // 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;
 }
--- 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);
-void initializeSPIFFS();
+bool initializeSPIFFS();

 #endif
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,12 +19,6 @@
 void setup() {
  Serial.begin(115200);

-  uint64_t chipid;
-
-  chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes).
-  Serial.printf("ESP32 Chip ID = %04X", (uint16_t)(chipid >> 32)); //print High 2 bytes
-  Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.
-
  // Initialize SPIFFS
  initializeSPIFFS();

@@ -84,8 +78,6 @@ uint8_t wifiErrorCounter = 0;

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

  // Send AMS Data min every Minute
--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -0,0 +1,46 @@
+#include <Arduino.h>
+#include "ota.h"
+#include <Update.h>
+#include <SPIFFS.h>
+#include "commonFS.h"
+
+void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+    static size_t contentLength = 0;
+    
+    if (!index) {
+        contentLength = request->contentLength();
+        Serial.printf("Update size: %u bytes\n", contentLength);
+        
+        if (contentLength == 0) {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
+            return;
+        }
+
+        if (!Update.begin(contentLength)) {
+            Serial.printf("Not enough space: %u required\n", contentLength);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+            return;
+        }
+        
+        Serial.println("Update started");
+    }
+
+    if (Update.write(data, len) != len) {
+        Update.printError(Serial);
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
+        return;
+    }
+
+    if (final) {
+        if (Update.end(true)) {
+            Serial.println("Update complete");
+            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+            delay(1000);
+            ESP.restart();
+        } else {
+            Update.printError(Serial);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
+        }
+    }
+}
+
--- a/src/ota.h
+++ b/src/ota.h
@@ -0,0 +1,8 @@
+#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,10 +17,6 @@ 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");
@@ -52,12 +48,13 @@ void scale_loop(void * parameter) {

 void start_scale() {
  Serial.println("Prüfe Calibration Value");
-  long calibrationValue;
+  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

-  // NVS
-  preferences.begin(NVS_NAMESPACE, true); // true = readonly
-  calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
-  preferences.end();
+  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);

  Serial.print("Read Scale Calibration Value ");
  Serial.println(calibrationValue);
@@ -140,19 +137,18 @@ 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);

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

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

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

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

--- a/src/scale.h
+++ b/src/scale.h
@@ -15,6 +15,4 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;

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

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

 AsyncWebServer server(webserverPort);
 AsyncWebSocket ws("/ws");
@@ -33,10 +28,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
        sendWriteResult(client, 3);
    } else if (type == WS_EVT_DISCONNECT) {
        Serial.println("Client getrennt.");
-    } else if (type == WS_EVT_ERROR) {
-        Serial.printf("WebSocket Client #%u error(%u): %s\n", client->id(), *((uint16_t*)arg), (char*)data);
-    } else if (type == WS_EVT_PONG) {
-        Serial.printf("WebSocket Client #%u pong\n", client->id());
    } else if (type == WS_EVT_DATA) {
        String message = String((char*)data);
        JsonDocument doc;
@@ -53,7 +44,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
        }

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

 void sendAmsData(AsyncWebSocketClient *client) {
    if (ams_count > 0) {
-        ws.textAll("{\"type\":\"amsData\",\"payload\":" + amsJsonData + "}");
+        ws.textAll("{\"type\":\"amsData\", \"payload\":" + amsJsonData + "}");
    }
 }

 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: ");
@@ -239,7 +222,7 @@ void setupWebserver(AsyncWebServer &server) {
        html.replace("{{spoolmanUrl}}", spoolmanUrl);

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

-    // Vereinfachter Update-Handler
+    // Route for Firmware Update
    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", "no-store");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
        request->send(response);
    });

-    // Update-Handler mit verbesserter Fehlerbehandlung
    server.on("/update", HTTP_POST, 
        [](AsyncWebServerRequest *request) {
-            // Nach Update-Abschluss
-            bool success = !Update.hasError();
-            String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
-            AsyncWebServerResponse *response = request->beginResponse(
-                success ? 200 : 400,
-                "application/json",
-                "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
-            );
-            response->addHeader("Connection", "close");
-            request->send(response);
-            
-            if (success) {
-                oledShowMessage("Upgrade successful Rebooting");
-                delay(500);
-                ESP.restart();
-            }
-            else {
-                oledShowMessage("Upgrade failed");
-            }
+            // The response will be sent from handleOTAUpload when the upload is complete
        },
        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
-            static size_t updateSize = 0;
-            static int command = 0;
-
-            oledShowMessage("Upgrade please wait");
-
-            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 (command == U_SPIFFS) {
-                    Serial.println("Backup JSON configs...");
-                    backupJsonConfigs();
-                    
-                    // Deaktiviere alle Validierungen für SPIFFS-Updates
-                    if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) {
-                        Serial.printf("Update Begin Error: %s\n", Update.errorString());
-                        restoreJsonConfigs();
-                        String errorMsg = String("Update begin failed: ") + Update.errorString();
-                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                        return;
-                    }
-                } else {
-                    // Normale Validierung für Firmware-Updates
-                    if (!Update.begin(updateSize, command)) {
-                        Serial.printf("Update Begin Error: %s\n", Update.errorString());
-                        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: %s\n", Update.errorString());
-                    if (command == U_SPIFFS) {
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Write failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-                
-                // Sende den Fortschritt als JSON
-                String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
-                request->send(200, "application/json", progress);
-            }
-
-            if (final) {
-                if (!Update.end(true)) {
-                    Serial.printf("Update End Error: %s\n", Update.errorString());
-                    if (command == U_SPIFFS) {
-                        Serial.println("Restoring JSON configs...");
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Update end failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-                Serial.println("Update Success!");
-            }
+            // Free memory before handling update
+            ws.enable(false);
+            ws.cleanupClients();
+            handleOTAUpload(request, filename, index, data, len, final);
        }
    );

-    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: ");
@@ -474,26 +379,3 @@ void setupWebserver(AsyncWebServer &server) {
    server.begin();
    Serial.println("Webserver gestartet");
 }
-
-
-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 <Update.h>
-#include <AsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <AsyncWebSocket.h>
 #include "bambu.h"
 #include "nfc.h"
 #include "scale.h"
@@ -17,20 +17,10 @@ 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,19 +10,9 @@ 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);
-    
-    // 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);
+    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
Author	SHA1	Message	Date
Manuel Weiser	920e4cfb69	.github/workflows/providers/gitea-release.yml aktualisiert	2025-02-18 22:05:32 +01:00
Manuel Weiser	e646edd6f4	.github/workflows/providers/gitea-release.yml aktualisiert	2025-02-18 22:04:50 +01:00