docs: update changelog for version 1.2.44

.github/workflows/providers/build.yml

@@ -0,0 +1,87 @@
+name: Build Firmware
+
+on:
+  workflow_call:
+    outputs:
+      version:
+        description: "The version from the tag"
+        value: ${{ jobs.build.outputs.version }}
+      changelog:
+        description: "The changelog for the current version"
+        value: ${{ jobs.build.outputs.changelog }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.VERSION }}
+      changelog: ${{ steps.changelog.outputs.CHANGES }}
+    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: |
+        if [ -n "$GITEA_REF" ]; then
+          echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
+        else
+          echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        fi
+      
+    - 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)
+        if [ -n "$GITEA_OUTPUT" ]; then
+          echo "CHANGES<<EOF" >> $GITEA_OUTPUT
+          echo "$CHANGELOG" >> $GITEA_OUTPUT
+          echo "EOF" >> $GITEA_OUTPUT
+        else
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
+    
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: firmware
+        path: |
+          .pio/build/esp32dev/filaman_full.bin
+          .pio/build/esp32dev/filaman_ota.bin

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

@@ -0,0 +1,116 @@
+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 \
+          0x290000 .pio/build/esp32dev/spiffs.bin
+        
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+
+    - 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 }}
+      run: |
+        echo "Debug environment:"
+        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
+        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
+        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
+        
+        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}\"}" \
+          "${API_URL}/repos/${REPO}/releases")
+        
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        
+        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" \
+              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?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 \
+          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: |
+        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,77 +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: 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.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.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 }}  # Changed from GITHUB_TOKEN to GH_TOKEN
-      run: |
-        gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
-          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          ".pio/build/esp32dev/filaman.bin#filaman.bin"
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - 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: 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
+
+  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
+
+  github-release:
+    needs: [route, verify-provider]
+    if: needs.route.outputs.provider == 'github'
+    uses: ./.github/workflows/providers/github-release.yml
+
+  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,252 @@
 # Changelog
 
+## [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
+- implement OTA update functionality with web interface; update partition settings and build configuration
+- remove unused OTA server setup and related includes; update platformio.ini dependencies
+- adjust weight counter threshold and optimize delay in RFID scanning; include scale header in NFC module
+- update version to v1.2.1 and change upgrade link to OTA in HTML files; modify updateSpoolTagId function to return boolean
+
+
+## [1.2.0] - 2025-02-17
+### Added
+- implement OTA functionality and update build scripts; change upgrade link to OTA in HTML
+- update version to v1.2.0 and modify build scripts in platformio.ini; remove unused includes in scale.cpp and website.cpp
+- update version to v1.2.0 and add upgrade link in HTML files
+- add esp_wifi.h and set maximum transmit power in WiFi initialization
+
+### Changed
+- update changelog for version 1.1.0
+- clean up changelog and update script execution in platformio.ini
+- update changelog for version 1.1.0
+
+### Fixed
+- update version number in header to v1.1.0
+- correct version number in nav bar
+
+
+## [1.1.0] - 2025-02-16
+### Changed
+- clean up changelog and update script execution in platformio.ini
+- update changelog for version 1.1.0
+
+### Fixed
+- correct version number in nav bar
+
+
 ## [1.0.5] - 2025-02-16
 ### Added
 - update version to 1.0.5 and enhance changelog update process with automatic git push

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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">

html/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,7 +34,7 @@
         </div>
     </div>
 
-
+<!-- head -->
 
     <div class="container">
         <h1>FilaMan</h1>

html/rfid.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,6 +34,7 @@
         </div>
     </div>
 
+<!-- head -->
 
 <div class="connection-status hidden">
     <div class="spinner"></div>

html/spoolman.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,6 +34,7 @@
         </div>
     </div>
 
+<!-- head -->
 
     <script>
         window.onload = function() {

html/style.css

@@ -1013,4 +1013,83 @@ input[type="submit"]:disabled,
     color: #000;
     vertical-align: middle;
     margin-left: 0.5rem;
+}
+
+.progress-container {
+    width: 100%;
+    margin: 20px 0;
+    display: none;
+    background: #f0f0f0;
+    border-radius: 4px;
+    overflow: hidden;
+}
+.progress-bar {
+    width: 0%;
+    height: 24px;
+    background-color: #4CAF50;
+    text-align: center;
+    line-height: 24px;
+    color: white;
+    transition: width 0.3s ease-in-out;
+    font-weight: bold;
+}
+.status {
+    margin: 10px 0;
+    padding: 15px;
+    border-radius: 4px;
+    display: none;
+}
+.error { 
+    background-color: #ffebee; 
+    color: #c62828; 
+    border: 1px solid #ef9a9a;
+}
+.success { 
+    background-color: #e8f5e9; 
+    color: #2e7d32; 
+    border: 1px solid #a5d6a7;
+}
+.update-form {
+    background: var(--primary-color);
+    padding: 20px;
+    border-radius: 8px;
+    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;
+    width: 80%;
+    padding: 8px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    background: white;
+}
+.update-form input[type="submit"] {
+    background-color: #4CAF50;
+    color: white;
+    padding: 10px 20px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 16px;
+    transition: background-color 0.3s;
+}
+.update-form input[type="submit"]:hover {
+    background-color: #45a049;
+}
+.update-form input[type="submit"]:disabled {
+    background-color: #cccccc;
+    cursor: not-allowed;
+}
+.warning {
+    background-color: var(--primary-color);
+    border: 1px solid #ffe0b2;
+    color: white;
+    padding: 15px;
+    margin: 20px auto;
+    border-radius: 4px;
+    max-width: 600px;
+    text-align: center;
 }

html/upgrade.html

@@ -0,0 +1,154 @@
+<!-- head --><!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+<!-- head -->
+    
+    <div class="content">
+        <h1>Firmware Upgrade</h1>
+
+        <div class="warning">
+            <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
+            The device will restart automatically after the update.
+        </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">
+            <div class="progress-bar">0%</div>
+        </div>
+        <div class="status"></div>
+    </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);
+
+            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';
+            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;
+                    progress.style.width = percentComplete + '%';
+                    progress.textContent = Math.round(percentComplete) + '%';
+                }
+            };
+
+            xhr.onload = function() {
+                try {
+                    let response = this.responseText;
+                    try {
+                        const jsonResponse = JSON.parse(response);
+                        response = jsonResponse.message;
+                        
+                        if (jsonResponse.restart) {
+                            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) {
+                        if (!isNaN(response)) {
+                            const percent = parseInt(response);
+                            progress.style.width = percent + '%';
+                            progress.textContent = percent + '%';
+                            return;
+                        }
+                    }
+                    
+                    status.textContent = response;
+                    status.classList.add(xhr.status === 200 ? 'success' : 'error');
+                    status.style.display = 'block';
+                    
+                    if (xhr.status !== 200) {
+                        form.querySelector('input[type=submit]').disabled = false;
+                    }
+                } catch (error) {
+                    status.textContent = 'Error: ' + error.message;
+                    status.classList.add('error');
+                    status.style.display = 'block';
+                    form.querySelector('input[type=submit]').disabled = false;
+                }
+            };
+
+            xhr.onerror = function() {
+                status.textContent = 'Update failed: Network error';
+                status.classList.add('error');
+                status.style.display = 'block';
+                form.querySelector('input[type=submit]').disabled = false;
+            };
+
+            xhr.send(formData);
+        });
+    </script>
+</body>
+</html>

html/waage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,6 +34,7 @@
         </div>
     </div>
 
+<!-- head -->
 
     <div class="content">
         <h1>Scale Configuration Page</h1>

html/wifi.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- head --><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -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.0.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,6 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,6 +34,7 @@
         </div>
     </div>
 
+<!-- head -->
 
     <div class="content">
         <h1>WiFi Configuration Page</h1>

partitions.csv

@@ -1,5 +1,6 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x5000,
-otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x280000,
-spiffs,   data, spiffs,  0x290000,0x170000,
+# 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.0.6"
+version = "1.2.44"
 
 [env:esp32dev]
 platform = espressif32
@@ -19,7 +19,7 @@ monitor_speed = 115200
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
-    me-no-dev/ESP Async WebServer @ ^1.2.4
+    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
     me-no-dev/AsyncTCP @ ^1.1.1
     bogde/HX711 @ ^0.7.5
     adafruit/Adafruit SSD1306 @ ^2.5.13
@@ -31,9 +31,11 @@ lib_deps =
     
 ; Enable SPIFFS upload
 board_build.filesystem = spiffs
-board_build.spiffs.partition = 2M
-board_build.spiffs.upload_size = 2M
+; Update partition settings
 board_build.partitions = partitions.csv
+board_upload.flash_size = 4MB
+board_build.flash_mode = dio
+board_upload.flash_freq = "40m"
 
 build_flags = 
     -Os
@@ -42,11 +44,33 @@ build_flags =
     -DNDEBUG
     -mtext-section-literals
     '-D VERSION="${common.version}"'
-
+    -DASYNCWEBSERVER_REGEX
+    -DCORE_DEBUG_LEVEL=1
+    -DCONFIG_ARDUHAL_LOG_COLORS=1
+    -DOTA_DEBUG=1
+    -DARDUINO_RUNNING_CORE=1
+    -DARDUINO_EVENT_RUNNING_CORE=1
+    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
+    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
+    -DCONFIG_ARDUINO_OTA_READSIZE=1024
+    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+    -DCONFIG_ASYNC_TCP_USE_WDT=0
+    -DCONFIG_LWIP_TCP_MSS=1460
+    -DOTA_PARTITION_SUBTYPE=0x10
+    -DPARTITION_TABLE_OFFSET=0x8000
+    -DPARTITION_TABLE_SIZE=0x1000
+    
 extra_scripts = 
-    pre:scripts/combine_html.py
-    pre:scripts/pre_build.py
-    pre:scripts/pre_spiffs.py
-    pre:scripts/gzip_files.py
-    pre:scripts/extra_script.py
-    pre:scripts/update_changelog.py
+    scripts/extra_script.py
+    pre:scripts/pre_build.py     ; wird zuerst ausgeführt
+    pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
+    pre:scripts/combine_html.py  ; wird als drittes ausgeführt
+    scripts/gzip_files.py
+
+; Remove or comment out the targets line
+;targets = buildfs, build
+
+; Add a custom target to build both
+[platformio]
+default_envs = esp32dev
+

scripts/combine_html.py

@@ -1,7 +1,10 @@
 Import("env")
 import os
+import re
 
 def combine_html_files(source, target, env):
+    print("COMBINE HTML FILES")
+    
     html_dir = "./html"
     header_file = os.path.join(html_dir, "header.html")
     
@@ -18,14 +21,14 @@ def combine_html_files(source, target, env):
             with open(file_path, 'r') as f:
                 content = f.read()
             
-            # Replace placeholder with header content
-            if '{{header}}' in content:
-                new_content = content.replace('{{header}}', header_content)
-                
-                # Write back combined content
-                with open(file_path, 'w') as f:
-                    f.write(new_content)
-                print(f"Combined header with {filename}")
+            # Replace content between head comments with header content
+            pattern = r'(<!-- head -->).*?(<!-- head -->)'
+            new_content = re.sub(pattern, r'\1' + header_content + r'\2', content, flags=re.DOTALL)
+            
+            # Write back combined content
+            with open(file_path, 'w') as f:
+                f.write(new_content)
+            print(f"Combined header with {filename}")
 
 # Register the script to run before building SPIFFS
 env.AddPreAction("buildfs", combine_html_files)

scripts/gzip_files.py

@@ -13,6 +13,9 @@ def copy_file(input_file, output_file):
     shutil.copy2(input_file, output_file)
 
 def should_compress(file):
+     # Skip compression for spoolman.html
+    if file == 'spoolman.html':
+        return False
     # Komprimiere nur bestimmte Dateitypen
     return file.endswith(('.js', '.png', '.css', '.html'))
 

scripts/pre_build.py

@@ -22,4 +22,4 @@ def replace_version(source, target, env):
     with open(header_file, 'w') as file:
         file.write(content)
 
-env.AddPreAction("buildfs", replace_version)
+env.AddPreAction("buildfs", replace_version)

scripts/update_changelog.py

@@ -78,19 +78,15 @@ def push_changes(version):
         subprocess.run(['git', 'push', 'origin'], check=True)
         print("Successfully pushed to origin")
         
-        # Ask for upstream push
-        response = input("Do you want to push to GitHub (upstream)? (y/n): ").lower()
-        if response == 'y':
-            subprocess.run(['git', 'push', 'upstream'], check=True)
-            print("Successfully pushed to upstream")
-            
     except subprocess.CalledProcessError as e:
         print(f"Error during git operations: {e}")
         return False
     return True
 
 def update_changelog():
+    print("Starting changelog update...")  # Add this line
     version = get_version()
+    print(f"Current version: {version}")   # Add this line
     today = datetime.now().strftime('%Y-%m-%d')
     
     script_dir = os.path.dirname(os.path.abspath(__file__))

src/api.cpp

@@ -175,20 +175,20 @@ void sendToApi(void *parameter) {
     vTaskDelete(NULL);
 }
 
-uint8_t updateSpoolTagId(String uidString, const char* payload) {
+bool updateSpoolTagId(String uidString, const char* payload) {
     JsonDocument doc;
     DeserializationError error = deserializeJson(doc, payload);
     
     if (error) {
         Serial.print("Fehler beim JSON-Parsing: ");
         Serial.println(error.c_str());
-        return 0;
+        return false;
     }
     
     // Überprüfe, ob die erforderlichen Felder vorhanden sind
     if (!doc.containsKey("sm_id") || doc["sm_id"] == "") {
         Serial.println("Keine Spoolman-ID gefunden.");
-        return 0;
+        return false;
     }
 
     String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + doc["sm_id"].as<String>();
@@ -207,7 +207,7 @@ uint8_t updateSpoolTagId(String uidString, const char* payload) {
     SendToApiParams* params = new SendToApiParams();
     if (params == nullptr) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
-        return 0;
+        return false;
     }
     params->httpType = "PATCH";
     params->spoolsUrl = spoolsUrl;
@@ -223,7 +223,7 @@ uint8_t updateSpoolTagId(String uidString, const char* payload) {
         NULL                      // Task-Handle (nicht benötigt)
     );
 
-    return 1;
+    return true;
 }
 
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {

src/api.h

@@ -17,7 +17,7 @@ bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafeld
 JsonDocument fetchSpoolsForWebsite(); // API-Funktion für die Webseite
 JsonDocument fetchAllSpoolsInfo();
 void sendAmsData(AsyncWebSocketClient *client); // Neue Funktion zum Senden von AMS-Daten
-uint8_t updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
+bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
 bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
 

src/main.cpp

@@ -1,10 +1,10 @@
 #include <Arduino.h>
-#include <WiFi.h>
 #include <DNSServer.h>
-#include <WiFiManager.h>
 #include <ESPmDNS.h>
 #include <Wire.h>
+#include <WiFi.h>
 
+#include "wlan.h"
 #include "config.h"
 #include "website.h"
 #include "api.h"
@@ -15,12 +15,6 @@
 #include "esp_task_wdt.h"
 #include "commonFS.h"
 
-// ***** WIFI initialisieren
-WiFiManager wm;
-bool wm_nonblocking = false;
-void initWiFi();
-// ################### Functions
-
 // ##### SETUP #####
 void setup() {
   Serial.begin(115200);
@@ -96,9 +90,6 @@ void loop() {
 
   unsigned long currentMillis = millis();
 
-  // Falls WifiManager im nicht blockenden Modus ist
-  //if(wm_nonblocking) wm.process();
-
   // Send AMS Data min every Minute
   if (currentMillis - lastAmsSendTime >= amsSendInterval) {
     lastAmsSendTime = currentMillis;
@@ -137,6 +128,7 @@ void loop() {
       weightSend = 0;
     }
   }
+
   // reset weight counter after writing tag
   if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag > 1)
   {
@@ -146,7 +138,7 @@ void loop() {
   lastWeight = weight;
 
   // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-  if (spoolId != "" && weigthCouterToApi > 5 && weightSend == 0 && hasReadRfidTag == 1) {
+  if (spoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && hasReadRfidTag == 1) {
     oledShowIcon("loading");
     if (updateSpoolWeight(spoolId, weight)) 
     {
@@ -164,38 +156,3 @@ void loop() {
   yield();
   esp_task_wdt_reset();
 }
-
-// ##### Funktionen für Konfiguration #####
-void initWiFi() {
-  WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
-
-  if(wm_nonblocking) wm.setConfigPortalBlocking(false);
-  wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
-
-  oledShowTopRow();
-  oledShowMessage("WiFi Setup");
-  
-  bool res;
-  // res = wm.autoConnect(); // auto generated AP name from chipid
-  res = wm.autoConnect("FilaMan"); // anonymous ap
-  // res = wm.autoConnect("spoolman","password"); // password protected ap
-
-  if(!res) {
-    Serial.println("Failed to connect or hit timeout");
-    // ESP.restart();
-    oledShowTopRow();
-    oledShowMessage("WiFi not connected Check Portal");
-  } 
-  else {
-    wifiOn = true;
-
-    //if you get here you have connected to the WiFi    
-    Serial.println("connected...yeey :)");
-    Serial.print("IP address: ");
-    Serial.println(WiFi.localIP());
-
-    oledShowTopRow();
-    display.display();
-  }
-}
-// ##### Funktionen für Konfiguration Ende #####

src/nfc.cpp

@@ -6,6 +6,7 @@
 #include "website.h"
 #include "api.h"
 #include "esp_task_wdt.h"
+#include "scale.h"
 
 //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
 Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -93,14 +94,6 @@ bool formatNdefTag() {
   }
 
 uint8_t ntag2xx_WriteNDEF(const char *payload) {
-  /*
-  if (!formatNdefTag()) {
-    Serial.println("Fehler beim Formatieren des NDEF-Tags.");
-    hasReadRfidTag = 2;
-    return 0;
-  }
-  */
-
   uint8_t tagSize = 240; // 144 bytes is maximum for NTAG213
   Serial.print("Tag Size: ");Serial.println(tagSize);
 
@@ -137,9 +130,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     return 0;
   }
 
-  //Serial.println();
-  //Serial.print("Header Size: ");Serial.println(sizeof(pageHeader));
-
   // Kombiniere Header und Payload
   int totalSize = sizeof(pageHeader) + len;
   uint8_t* combinedData = (uint8_t*) malloc(totalSize);
@@ -149,37 +139,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     return 0;
   }
 
-  // Überprüfe die Kombination von Header und Payload
-  /*
-  Serial.print("Header: ");
-  for (int i = 0; i < sizeof(pageHeader); i++) {
-    Serial.print(pageHeader[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-
-  Serial.print("Payload: ");
-  for (int i = 0; i < len; i++) {
-    Serial.print(payload[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-  */
-
   // Kombiniere Header und Payload
   memcpy(combinedData, pageHeader, sizeof(pageHeader));
   memcpy(&combinedData[sizeof(pageHeader)], payload, len);
 
-  // Überprüfe die Kombination von Header und Payload
-  /*
-  Serial.print("Kombinierte Daten: ");
-  for (int i = 0; i < totalSize; i++) {
-    Serial.print(combinedData[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-  */
-
   // Schreibe die Seiten
   uint8_t a = 0;
   uint8_t i = 0;
@@ -188,21 +151,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     int bytesToWrite = (totalSize < 4) ? totalSize : 4;
     memcpy(pageBuffer, combinedData + a, bytesToWrite);
 
-    // Überprüfe die Schreibung der Seiten
-    /*
-    Serial.print("Seite ");
-    Serial.print(i);
-    Serial.print(": ");
-    for (int j = 0; j < bytesToWrite; j++) {
-      Serial.print(pageBuffer[j], HEX);
-      Serial.print(" ");
-    }
-    Serial.println();
-    */
-    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-    uint8_t uidLength;
-    nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
-    //Serial.print("Schreibe Seite: ");Serial.println(i);
+    //uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+    //uint8_t uidLength;
+    //nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 100);
 
     if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
     {
@@ -210,8 +161,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
       free(combinedData);
       return 0;
     }
-    
-    //Serial.print("Seite geschrieben: ");Serial.println(i);
 
     yield();
     //esp_task_wdt_reset();
@@ -285,11 +234,15 @@ void writeJsonToTag(void *parameter) {
 
   // Gib die erstellte NDEF-Message aus
   Serial.println("Erstelle NDEF-Message...");
+  Serial.println(payload);
+
   hasReadRfidTag = 3;
   vTaskSuspend(RfidReaderTask);
+  vTaskDelay(500 / portTICK_PERIOD_MS);
   //pauseBambuMqttTask = true;
   // aktualisieren der Website wenn sich der Status ändert
   sendNfcData(nullptr);
+  oledShowMessage("Waiting for NFC-Tag");
 
   // Wait 10sec for tag
   uint8_t success = 0;
@@ -326,13 +279,23 @@ void writeJsonToTag(void *parameter) {
         Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
         //oledShowMessage("NFC-Tag written");
         oledShowIcon("success");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
         hasReadRfidTag = 5;
         // aktualisieren der Website wenn sich der Status ändert
         sendNfcData(nullptr);
-        vTaskResume(RfidReaderTask);
         pauseBambuMqttTask = false;
-        updateSpoolTagId(uidString, payload);
+        
+        if (updateSpoolTagId(uidString, payload)) {
+          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+          uint8_t uidLength;
+          oledShowIcon("success");
+          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+            yield();
+          }
+        }
+          
+        vTaskResume(RfidReaderTask);
+        vTaskDelay(500 / portTICK_PERIOD_MS);        
     } 
     else 
     {
@@ -361,16 +324,19 @@ void writeJsonToTag(void *parameter) {
 
 void startWriteJsonToTag(const char* payload) {
   char* payloadCopy = strdup(payload);
-    
-  // Erstelle die Task
-  xTaskCreate(
-      writeJsonToTag,        // Task-Funktion
-      "WriteJsonToTagTask",       // Task-Name
-      4096,                        // Stackgröße in Bytes
-      (void*)payloadCopy,         // Parameter
-      rfidWriteTaskPrio,           // Priorität
-      NULL                         // Task-Handle (nicht benötigt)
-  );
+  
+  // Task nicht mehrfach starten
+  if (hasReadRfidTag != 3) {
+    // Erstelle die Task
+    xTaskCreate(
+        writeJsonToTag,        // Task-Funktion
+        "WriteJsonToTagTask",       // Task-Name
+        4096,                        // Stackgröße in Bytes
+        (void*)payloadCopy,         // Parameter
+        rfidWriteTaskPrio,           // Priorität
+        NULL                         // Task-Handle (nicht benötigt)
+    );
+  }
 }
 
 void scanRfidTask(void * parameter) {
@@ -397,7 +363,7 @@ void scanRfidTask(void * parameter) {
         hasReadRfidTag = 6;
 
         oledShowIcon("transfer");
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
+        vTaskDelay(500 / portTICK_PERIOD_MS);
 
         if (uidLength == 7)
         {

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\"}");
+        }
+    }
+}
+

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

src/scale.cpp

@@ -5,7 +5,6 @@
 #include "HX711.h"
 #include <EEPROM.h>
 #include "display.h"
-#include "nfc.h"
 #include "esp_task_wdt.h"
 
 HX711 scale;

src/website.cpp

@@ -3,11 +3,11 @@
 #include "api.h"
 #include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>
-//#include <AsyncWebSocket.h>
 #include "bambu.h"
 #include "nfc.h"
 #include "scale.h"
 #include "esp_task_wdt.h"
+#include "ota.h"
 
 // Cache-Control Header definieren
 #define CACHE_CONTROL "max-age=31536000" // Cache für 1 Jahr
@@ -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);
@@ -337,7 +337,32 @@ void setupWebserver(AsyncWebServer &server) {
         request->send(response);
         Serial.println("RFID.js gesendet");
     });
-    
+
+    // 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);
+        request->send(response);
+    });
+
+    server.on("/update", HTTP_POST, 
+        [](AsyncWebServerRequest *request) {
+            // 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) {
+            // Free memory before handling update
+            ws.enable(false);
+            ws.cleanupClients();
+            handleOTAUpload(request, filename, index, data, len, final);
+        }
+    );
+
     // Fehlerbehandlung für nicht gefundene Seiten
     server.onNotFound([](AsyncWebServerRequest *request){
         Serial.print("404 - Nicht gefunden: ");

src/wlan.cpp

@@ -0,0 +1,45 @@
+#include <Arduino.h>
+#include "wlan.h"
+#include <WiFi.h>
+#include <esp_wifi.h>
+#include <WiFiManager.h>
+#include "display.h"
+#include "config.h"
+
+WiFiManager wm;
+bool wm_nonblocking = false;
+
+void initWiFi() {
+    WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
+  
+    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+  
+    if(wm_nonblocking) wm.setConfigPortalBlocking(false);
+    wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
+  
+    oledShowTopRow();
+    oledShowMessage("WiFi Setup");
+    
+    bool res;
+    // res = wm.autoConnect(); // auto generated AP name from chipid
+    res = wm.autoConnect("FilaMan"); // anonymous ap
+    // res = wm.autoConnect("spoolman","password"); // password protected ap
+  
+    if(!res) {
+      Serial.println("Failed to connect or hit timeout");
+      // ESP.restart();
+      oledShowTopRow();
+      oledShowMessage("WiFi not connected Check Portal");
+    } 
+    else {
+      wifiOn = true;
+  
+      //if you get here you have connected to the WiFi    
+      Serial.println("connected...yeey :)");
+      Serial.print("IP address: ");
+      Serial.println(WiFi.localIP());
+  
+      oledShowTopRow();
+      display.display();
+    }
+  }

src/wlan.h

@@ -0,0 +1,8 @@
+#ifndef WLAN_H
+#define WLAN_H
+
+#include <Arduino.h>
+
+void initWiFi();
+
+#endif