docs: update changelog for version 1.2.60

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

@@ -0,0 +1,134 @@
+name: Gitea Release
+
+on:
+  workflow_call:
+    inputs:
+      gitea_ref_name:
+        description: 'Gitea ref name'
+        required: true
+        type: string
+      gitea_server_url:
+        description: 'Gitea server URL'
+        required: true
+        type: string
+      gitea_repository:
+        description: 'Gitea repository'
+        required: true
+        type: string
+    secrets:
+      GITEA_TOKEN:
+        required: true
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Install System Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y python3 python3-venv build-essential curl git
+
+    - name: Set up Python Virtual Environment
+      run: |
+        python3 -m venv venv
+        source venv/bin/activate
+        pip install --upgrade pip
+        pip install platformio esptool
+        
+        echo "Verifying installations:"
+        platformio --version
+        python3 --version
+        esptool.py version
+
+    - name: Build Firmware
+      run: |
+        source venv/bin/activate
+        echo "Building SPIFFS..."
+        platformio run -t buildfs
+        
+        echo "Building firmware..."
+        platformio run
+
+    - name: Create Release Files
+      run: |
+        source venv/bin/activate
+        echo "Creating release files..."
+        esptool.py --chip esp32 merge_bin \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o .pio/build/esp32dev/filaman_full.bin \
+          0x1000 .pio/build/esp32dev/bootloader.bin \
+          0x8000 .pio/build/esp32dev/partitions.bin \
+          0x10000 .pio/build/esp32dev/firmware.bin \
+          0x3D0000 .pio/build/esp32dev/spiffs.bin
+        
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+        echo "CHANGELOG CONTENT:"
+        echo "$CHANGELOG"
+        if [ -z "$CHANGELOG" ]; then
+          echo "No changelog found for version $VERSION"
+          exit 1
+        fi
+
+    - name: Create Release
+      env:
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
+        GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
+        GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
+        CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
+      run: |
+        echo "Debug environment:"
+        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
+        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
+        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
+        echo "CHANGELOG: ${CHANGELOG}"
+        
+        TAG="${GITEA_REF_NAME}"
+        API_URL="${GITEA_SERVER_URL}/api/v1"
+        REPO="${GITEA_REPOSITORY}"
+        
+        echo "Creating release for ${TAG} on ${REPO}..."
+        
+        # Create release
+        RESPONSE=$(curl -k -s \
+          -X POST \
+          -H "Authorization: token ${TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
+          "${API_URL}/repos/${REPO}/releases")
+        
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
+        
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
+          
+          # Upload files
+          for file in "filaman_full.bin" "filaman_ota.bin"; do
+            echo "Uploading $file..."
+            curl -k -s \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/$file" \
+              "${UPLOAD_URL}?name=$file"
+          done
+        else
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
+          exit 1
+        fi

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

@@ -0,0 +1,71 @@
+name: GitHub Release
+
+on:
+  workflow_call:
+
+jobs:
+  create-release:
+    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 \
+          0x3D0000 .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: |
+        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: ${{ 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 \
+          .pio/build/esp32dev/filaman_ota.bin

.github/workflows/release.yml

@@ -1,85 +1,70 @@
-name: Create Release
+name: Release Workflow
 
 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:
+  route:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write # Required for creating releases at job level
+    outputs:
+      provider: ${{ steps.provider.outputs.provider }}
+      gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
+      gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
     steps:
-    - uses: actions/checkout@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
+      - name: Debug Environment
+        run: |
+          echo "CI Environment Details:"
+          echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
+          echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
+          echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
+          echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
+          echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
 
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
+      - name: Determine CI Provider
+        id: provider
+        shell: bash
+        run: |
+          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
+            echo "provider=gitea" >> "$GITHUB_OUTPUT"
+            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
+            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
+          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
+            echo "provider=github" >> "$GITHUB_OUTPUT"
+          else
+            echo "provider=unknown" >> "$GITHUB_OUTPUT"
+          fi
 
-    - name: Build Firmware
-      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+  verify-provider:
+    needs: route
+    runs-on: ubuntu-latest
+    steps:
+      - name: Echo detected provider
+        run: |
+          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
+          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
+            echo "::error::Failed to detect CI provider!"
+            exit 1
+          fi
 
-    - name: Install esptool
-      run: |
-        pip install esptool
+  github-release:
+    needs: [route, verify-provider]
+    if: needs.route.outputs.provider == 'github'
+    uses: ./.github/workflows/providers/github-release.yml
 
-    - 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"
+  gitea-release:
+    needs: [route, verify-provider]
+    if: needs.route.outputs.provider == 'gitea'
+    uses: ./.github/workflows/providers/gitea-release.yml
+    with:
+      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
+      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,309 @@
 # Changelog
 
+## [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
+- add GitHub and Gitea release workflows; streamline firmware release process
+
+
+## [1.2.3] - 2025-02-18
+### Added
+- update version to 1.2.3; modify HTML files to reflect new version; enhance firmware update process and UI improvements
+
+
 ## [1.2.2] - 2025-02-18
 ### Added
 - update version to 1.2.2; change OTA upgrade link in HTML files; enhance OTA upload handling with progress updates and JSON responses

README.md

@@ -124,6 +124,24 @@ 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
 

html/header.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/index.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/rfid.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/spoolman.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/style.css

@@ -1056,6 +1056,7 @@ input[type="submit"]:disabled,
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
     margin: 0 auto;
     width: 400px;
+    text-align: center;
 }
 .update-form input[type="file"] {
     margin-bottom: 15px;
@@ -1063,6 +1064,7 @@ input[type="submit"]:disabled,
     padding: 8px;
     border: 1px solid #ddd;
     border-radius: 4px;
+    background: white;
 }
 .update-form input[type="submit"] {
     background-color: #4CAF50;
@@ -1072,6 +1074,7 @@ input[type="submit"]:disabled,
     border-radius: 4px;
     cursor: pointer;
     font-size: 16px;
+    transition: background-color 0.3s;
 }
 .update-form input[type="submit"]:hover {
     background-color: #45a049;
@@ -1083,8 +1086,10 @@ input[type="submit"]:disabled,
 .warning {
     background-color: var(--primary-color);
     border: 1px solid #ffe0b2;
-    color: #e65100;
+    color: white;
     padding: 15px;
-    margin: 20px 0;
+    margin: 20px auto;
     border-radius: 4px;
+    max-width: 600px;
+    text-align: center;
 }

html/upgrade.html

@@ -1,4 +1,3 @@
-
 <!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
@@ -13,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -42,14 +41,13 @@
 
         <div class="warning">
             <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
-                        Configuration files will be automatically backed up and restored after the update.
+            The device will restart automatically after the update.
         </div>
 
-        
-        <div class="update-form" style="align-items: center;">
-            <form id="updateForm" enctype='multipart/form-data' style="text-align: center;"></form>
+        <div class="update-form">
+            <form id="updateForm" enctype='multipart/form-data'>
                 <input type='file' name='update' accept='.bin' required>
-                <input type='submit' value='Firmware Update starten'>
+                <input type='submit' value='Start Firmware Update'>
             </form>
         </div>
 
@@ -60,10 +58,21 @@
     </div>
 
     <script>
+        // Hide status indicators during update
+        const statusContainer = document.querySelector('.status-container');
+        if (statusContainer) {
+            statusContainer.style.display = 'none';
+        }
+
         document.getElementById('updateForm').addEventListener('submit', async (e) => {
             e.preventDefault();
             const form = e.target;
             const file = form.update.files[0];
+            if (!file) {
+                alert('Please select a firmware file.');
+                return;
+            }
+
             const formData = new FormData();
             formData.append('update', file);
 
@@ -91,21 +100,24 @@
                 try {
                     let response = this.responseText;
                     try {
-                        // Versuche als JSON zu parsen
                         const jsonResponse = JSON.parse(response);
                         response = jsonResponse.message;
                         
                         if (jsonResponse.restart) {
-                            // Wenn Gerät neustartet, warte und lade dann neu
-                            status.textContent = response + " Weiterleitung in 5 Sekunden...";
-                            setTimeout(() => {
-                                window.location.href = '/';
-                            }, 5000);
+                            status.textContent = response + " Redirecting in 20 seconds...";
+                            let countdown = 20;
+                            const timer = setInterval(() => {
+                                countdown--;
+                                if (countdown <= 0) {
+                                    clearInterval(timer);
+                                    window.location.href = '/';
+                                } else {
+                                    status.textContent = response + ` Redirecting in ${countdown} seconds...`;
+                                }
+                            }, 1000);
                         }
                     } catch (e) {
-                        // Wenn kein JSON, nutze response als Text
                         if (!isNaN(response)) {
-                            // Wenn es eine Zahl ist, update den Fortschritt
                             const percent = parseInt(response);
                             progress.style.width = percent + '%';
                             progress.textContent = percent + '%';
@@ -121,7 +133,7 @@
                         form.querySelector('input[type=submit]').disabled = false;
                     }
                 } catch (error) {
-                    status.textContent = 'Fehler: ' + error.message;
+                    status.textContent = 'Error: ' + error.message;
                     status.classList.add('error');
                     status.style.display = 'block';
                     form.querySelector('input[type=submit]').disabled = false;
@@ -129,7 +141,7 @@
             };
 
             xhr.onerror = function() {
-                status.textContent = 'Update fehlgeschlagen: Netzwerkfehler';
+                status.textContent = 'Update failed: Network error';
                 status.classList.add('error');
                 status.style.display = 'block';
                 form.querySelector('input[type=submit]').disabled = false;

html/waage.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/wifi.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.1</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

partitions.csv

@@ -1,6 +1,6 @@
-# Name,   Type,  SubType,    Offset,    Size,     Flags
-nvs,      data,  nvs,       0x9000,   0x5000,
-otadata,  data,  ota,       0xe000,   0x2000,
-app0,     app,   factory,   0x10000,  0x1E0000,
-app1,     app,   ota_0,     0x1F0000, 0x1E0000,
-spiffs,   data,  spiffs,    0x3D0000, 0x30000,
+# Name,   Type, SubType,    Offset,   Size,     Flags
+nvs,      data, nvs,       0x9000,   0x5000,
+otadata,  data, ota,       0xe000,   0x2000,
+app0,     app,  ota_0,     0x10000,  0x1E0000,
+app1,     app,  ota_1,     0x1F0000, 0x1E0000,
+spiffs,   data, spiffs,    0x3D0000, 0x30000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.2"
+version = "1.2.60"
 
 [env:esp32dev]
 platform = espressif32
@@ -52,6 +52,13 @@ build_flags =
     -DARDUINO_EVENT_RUNNING_CORE=1
     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
     -DCONFIG_ESP32_PANIC_PRINT_REBOOT
+    -DCONFIG_ARDUINO_OTA_READSIZE=1024
+    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+    -DCONFIG_ASYNC_TCP_USE_WDT=0
+    -DCONFIG_LWIP_TCP_MSS=1460
+    -DOTA_PARTITION_SUBTYPE=0x10
+    -DPARTITION_TABLE_OFFSET=0x8000
+    -DPARTITION_TABLE_SIZE=0x1000
     
 extra_scripts = 
     scripts/extra_script.py

src/ota.cpp

@@ -3,219 +3,48 @@
 #include <Update.h>
 #include <SPIFFS.h>
 #include "commonFS.h"
-#include <esp_task_wdt.h>
-#include <esp_int_wdt.h>
-#include <esp_pthread.h>
-#include <esp_ota_ops.h>
-
-// Reduzierter Puffer für Dateioperationen
-const size_t BUFFER_SIZE = 128;
-const size_t MIN_FREE_HEAP = 32768; // 32KB minimum free heap
-
-// Files to backup before update
-const char* CONFIG_FILES[] = {
-    "/bambu_credentials.json",
-    "/spoolman_url.json"
-};
-const int CONFIG_FILES_COUNT = sizeof(CONFIG_FILES) / sizeof(CONFIG_FILES[0]);
-
-bool backupConfigs() {
-    if (!SPIFFS.begin(true)) {
-        Serial.println("Failed to mount SPIFFS");
-        return false;
-    }
-
-    for (int i = 0; i < CONFIG_FILES_COUNT; i++) {
-        if (SPIFFS.exists(CONFIG_FILES[i])) {
-            String backupFile = String(CONFIG_FILES[i]) + ".bak";
-            
-            if (SPIFFS.exists(backupFile)) {
-                SPIFFS.remove(backupFile);
-            }
-            
-            File sourceFile = SPIFFS.open(CONFIG_FILES[i], "r");
-            File destFile = SPIFFS.open(backupFile, "w");
-            
-            if (!sourceFile || !destFile) {
-                Serial.printf("Failed to open files for backup: %s\n", CONFIG_FILES[i]);
-                return false;
-            }
-
-            // Verwenden Sie einen kleineren Puffer
-            uint8_t* buf = (uint8_t*)malloc(BUFFER_SIZE);
-            if (!buf) {
-                Serial.println("Failed to allocate buffer");
-                sourceFile.close();
-                destFile.close();
-                return false;
-            }
-
-            size_t len = 0;
-            bool success = true;
-            while ((len = sourceFile.read(buf, BUFFER_SIZE)) > 0) {
-                if (destFile.write(buf, len) != len) {
-                    Serial.println("Write failed");
-                    success = false;
-                    break;
-                }
-            }
-
-            free(buf);
-            sourceFile.close();
-            destFile.close();
-
-            if (!success) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-bool restoreConfigs() {
-    if (!SPIFFS.begin(true)) {
-        Serial.println("Failed to mount SPIFFS");
-        return false;
-    }
-
-    bool success = true;
-    for (int i = 0; i < CONFIG_FILES_COUNT; i++) {
-        String backupFile = String(CONFIG_FILES[i]) + ".bak";
-        if (SPIFFS.exists(backupFile)) {
-            if (SPIFFS.exists(CONFIG_FILES[i])) {
-                SPIFFS.remove(CONFIG_FILES[i]);
-            }
-            
-            File sourceFile = SPIFFS.open(backupFile, "r");
-            File destFile = SPIFFS.open(CONFIG_FILES[i], "w");
-            
-            if (!sourceFile || !destFile) {
-                Serial.printf("Failed to open files for restore: %s\n", CONFIG_FILES[i]);
-                success = false;
-                continue;
-            }
-
-            // Verwenden Sie einen kleineren Puffer
-            uint8_t* buf = (uint8_t*)malloc(BUFFER_SIZE);
-            if (!buf) {
-                Serial.println("Failed to allocate buffer");
-                sourceFile.close();
-                destFile.close();
-                success = false;
-                continue;
-            }
-
-            size_t len = 0;
-            while ((len = sourceFile.read(buf, BUFFER_SIZE)) > 0) {
-                if (destFile.write(buf, len) != len) {
-                    Serial.println("Write failed");
-                    success = false;
-                    break;
-                }
-            }
-
-            free(buf);
-            sourceFile.close();
-            destFile.close();
-            
-            SPIFFS.remove(backupFile);
-        }
-    }
-    return success;
-}
 
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static bool updateStarted = false;
-    static size_t totalBytes = 0;
-    static size_t totalSize = 0;
+    static size_t contentLength = 0;
     
     if (!index) {
-        updateStarted = false;
-        totalBytes = 0;
-        totalSize = request->contentLength();
+        contentLength = request->contentLength();
+        Serial.printf("Update size: %u bytes\n", contentLength);
         
-        // Check minimum heap size
-        if (ESP.getFreeHeap() < MIN_FREE_HEAP) {
-            request->send(500, "text/plain", "Not enough memory available");
+        if (contentLength == 0) {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        if (totalSize == 0) {
-            request->send(400, "text/plain", "Invalid file size");
+        // Determine if this is a full image (firmware + SPIFFS) or just firmware
+        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
+
+        if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) {
+            Serial.printf("Not enough space: %u required\n", contentLength);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
             return;
         }
         
-        Serial.printf("Update size: %u bytes\n", totalSize);
-        Serial.printf("Free space: %u bytes\n", ESP.getFreeSketchSpace());
-        Serial.printf("Free heap: %u bytes\n", ESP.getFreeHeap());
-
-        // Backup configs first
-        if (!backupConfigs()) {
-            request->send(500, "text/plain", "Failed to backup configuration");
-            return;
-        }
-
-        // Close all files and unmount SPIFFS
-        SPIFFS.end();
-
-        // Begin update with minimal configuration
-        if (!Update.begin(totalSize)) {
-            Serial.printf("Update.begin failed: %s\n", Update.errorString());
-            request->send(500, "text/plain", "Failed to start update");
-            return;
-        }
-
-        updateStarted = true;
-        Serial.println("Update process started");
-        
-        // Send initial progress
-        request->send(200, "text/plain", "0");
+        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
     }
     
-    if (!updateStarted) {
-        request->send(500, "text/plain", "Update not properly started");
-        return;
-    }
-
-    // Write update data
+    // Write chunk to flash
     if (Update.write(data, len) != len) {
-        Serial.printf("Update.write failed: %s\n", Update.errorString());
-        Update.abort();
-        request->send(500, "text/plain", "Error during update");
+        Update.printError(Serial);
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
         return;
     }
 
-    totalBytes += len;
-    
-    // Send progress update
-    if (!final) {
-        int progress = (totalBytes * 100) / totalSize;
-        request->send(200, "text/plain", String(progress));
-    }
-
     if (final) {
-        if (!Update.end(true)) {
-            Serial.printf("Update.end failed: %s\n", Update.errorString());
-            request->send(500, "text/plain", "Update failed");
-            return;
-        }
-
-        // Try to restore configs
-        if (!SPIFFS.begin(true)) {
-            Serial.println("Failed to mount SPIFFS for restore");
-            request->send(200, "application/json", "{\"status\": \"success\", \"message\": \"Update successful but config restore failed. Device will restart...\", \"restart\": true}");
-            delay(2000);
+        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();
-            return;
+        } else {
+            Update.printError(Serial);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
         }
-
-        if (!restoreConfigs()) {
-            Serial.println("Failed to restore configs");
-        }
-
-        request->send(200, "application/json", "{\"status\": \"success\", \"message\": \"Update successful! Device will restart...\", \"restart\": true}");
-        delay(2000);
-        ESP.restart();
     }
 }
 

src/website.cpp

@@ -164,7 +164,7 @@ void setupWebserver(AsyncWebServer &server) {
     // Route für about
     server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /about erhalten");
-        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/about.html.gz", "text/html");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.html.gz", "text/html");
         response->addHeader("Content-Encoding", "gzip");
         response->addHeader("Cache-Control", CACHE_CONTROL);
         request->send(response);
@@ -338,8 +338,13 @@ void setupWebserver(AsyncWebServer &server) {
         Serial.println("RFID.js gesendet");
     });
 
-    // Route für Firmware Update
+    // 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", CACHE_CONTROL);
@@ -350,7 +355,12 @@ void setupWebserver(AsyncWebServer &server) {
         [](AsyncWebServerRequest *request) {
             // The response will be sent from handleOTAUpload when the upload is complete
         },
-        handleOTAUpload
+        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
+            // Free memory before handling update
+            ws.enable(false);
+            ws.cleanupClients();
+            handleOTAUpload(request, filename, index, data, len, final);
+        }
     );
 
     // Fehlerbehandlung für nicht gefundene Seiten