docs: update changelog for version 1.2.40

.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: |
+        TAG="${GITEA_REF_NAME}"
+        API_URL="${GITEA_SERVER_URL}/api/v1"
+        REPO="${GITEA_REPOSITORY}"
+        
+        echo "Debug environment:"
+        echo "TAG: ${TAG}"
+        echo "API_URL: ${API_URL}"
+        echo "REPO: ${REPO}"
+        
+        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

@@ -0,0 +1,59 @@
+name: Release Workflow
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  route:
+    runs-on: ubuntu-latest
+    outputs:
+      provider: ${{ steps.provider.outputs.provider }}
+    steps:
+      - 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 "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"
+          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
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -0,0 +1,263 @@
+# Changelog
+
+## [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
+- update changelog script to categorize commits and handle new changelog creation
+- improve changelog update script to handle absolute paths and create new changelog if missing
+
+
+## [1.0.4] - 2025-02-16
+### Added
+- improve changelog update script to handle absolute paths and create new changelog if missing
+
+
+## [1.0.3] - 2025-02-16
+### Added
+- 
+
+### Changed
+-
+
+### Fixed
+-
+
+## [1.0.2] - 2025-02-16
+### Added
+- Feature 1
+- Feature 2
+
+### Changed
+- Change 1
+- Change 2
+
+### Fixed
+- Fix 1
+- Fix 2

README.de.md

@@ -0,0 +1,155 @@
+# FilaMan - Filament Management System
+
+FilaMan ist ein Filament-Managementsystem für den 3D-Druck. Es verwendet ESP32-Hardware für Gewichtsmessungen und NFC-Tag-Management. 
+Benutzer können Filamentspulen verwalten, den Status des Automatic Material System (AMS) von Bablulab Druckern überwachen und Einstellungen über eine Weboberfläche vornehmen. 
+Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/Spoolman) Filamentverwaltung, zusätzlich mit [Bambulab](https://bambulab.com/en-us) 3D-Druckern und sowie dem [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG Format.
+
+![Scale](./img/scale_trans.png)
+
+Weitere Bilder finden Sie im [img Ordner](/img/)  
+oder auf meiner Website: [FilaMan Website](https://www.filaman.app)  
+Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
+
+### ESP32 Hardware-Funktionen
+- **Gewichtsmessung:** Verwendung einer Wägezelle mit HX711-Verstärker für präzise Gewichtsverfolgung.
+- **NFC-Tag Lesen/Schreiben:** PN532-Modul zum Lesen und Schreiben von Filamentdaten auf NFC-Tags.
+- **OLED-Display:** Zeigt aktuelles Gewicht, Verbindungsstatus (WiFi, Bambu Lab, Spoolman).
+- **WLAN-Konnektivität:** WiFiManager für einfache Netzwerkkonfiguration.
+- **MQTT-Integration:** Verbindet sich mit Bambu Lab Drucker für AMS-Steuerung.
+- **NFC-Tag NTAG215:** Verwendung von NTAG215 wegen ausreichendem Speicherplatz auf dem Tag
+
+### Weboberflächen-Funktionen
+- **Echtzeit-Updates:** WebSocket-Verbindung für Live-Daten-Updates.
+- **NFC-Tag-Verwaltung:** 
+    - Filamentdaten auf NFC-Tags schreiben.
+    - Verwendet das NFC-Tag-Format von [Openspool](https://github.com/spuder/OpenSpool)
+    - Ermöglicht automatische Spulenerkennung im AMS
+- **Bambulab AMS-Integration:** 
+  - Anzeige der aktuellen AMS-Fachbelegung.
+  - Zuordnung von Filamenten zu AMS-Slots.
+  - Unterstützung für externe Spulenhalter.
+- **Spoolman-Integration:**
+  - Auflistung verfügbarer Filamentspulen.
+  - Filtern und Auswählen von Filamenten.
+  - Automatische Aktualisierung der Spulengewichte.
+  - Verfolgung von NFC-Tag-Zuweisungen.
+
+### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
+
+## Detaillierte Funktionalität
+
+### ESP32-Funktionalität
+- **Druckaufträge steuern und überwachen:** Der ESP32 kommuniziert mit dem Bambu Lab Drucker.
+- **Drucker-Kommunikation:** Nutzt MQTT für Echtzeit-Kommunikation mit dem Drucker.
+- **Benutzerinteraktionen:** Das OLED-Display bietet sofortiges Feedback zum Systemstatus.
+
+### Weboberflächen-Funktionalität
+- **Benutzerinteraktionen:** Die Weboberfläche ermöglicht Benutzern die Interaktion mit dem System.
+- **UI-Elemente:** Enthält Dropdown-Menüs für Hersteller und Filamente, Buttons zum Beschreiben von NFC-Tags und Echtzeit-Statusanzeigen.
+
+## Hardware-Anforderungen
+
+### Komponenten
+- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
+[Amazon Link](https://amzn.eu/d/aXThslf)
+- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung.
+[Amazon Link](https://amzn.eu/d/1wZ4v0x)
+- **OLED Display:** 128x64 SSD1306.
+[Amazon Link](https://amzn.eu/d/dozAYDU)
+- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
+[Amazon Link](https://amzn.eu/d/8205DDh)
+- **NFC-Tag:** NTAG215
+[Amazon Link](https://amzn.eu/d/fywy4c4)
+
+### Pin-Konfiguration
+| Komponente        | ESP32 Pin |
+|-------------------|-----------|
+| HX711 DOUT        | 16        |
+| HX711 SCK         | 17        |
+| OLED SDA          | 21        |
+| OLED SCL          | 22        |
+| PN532 IRQ         | 32        |
+| PN532 RESET       | 33        |
+| PN532 SCK         | 14        |
+| PN532 MOSI        | 13        |
+| PN532 MISO        | 12        |
+| PN532 CS/SS       | 15        |
+
+## Software-Abhängigkeiten
+
+### ESP32-Bibliotheken
+- `WiFiManager`: Netzwerkkonfiguration
+- `ESPAsyncWebServer`: Webserver-Funktionalität
+- `ArduinoJson`: JSON-Verarbeitung
+- `PubSubClient`: MQTT-Kommunikation
+- `Adafruit_PN532`: NFC-Funktionalität
+- `Adafruit_SSD1306`: OLED-Display-Steuerung
+- `HX711`: Wägezellen-Kommunikation
+
+## Installation
+
+### Voraussetzungen
+- **Software:**
+  - [PlatformIO](https://platformio.org/) in VS Code
+  - [Spoolman](https://github.com/Donkie/Spoolman) Instanz
+- **Hardware:**
+  - ESP32 Entwicklungsboard
+  - HX711 Wägezellen-Verstärker
+  - Wägezelle (Gewichtssensor)
+  - OLED Display (128x64 SSD1306)
+  - PN532 NFC Modul
+  - Verbindungskabel
+
+### Schritt-für-Schritt Installation
+1. **Repository klonen:**
+    ```bash
+    git clone https://github.com/ManuelW77/Filaman.git
+    cd FilaMan
+    ```
+2. **Abhängigkeiten installieren:**
+    ```bash
+    pio lib install
+    ```
+3. **ESP32 flashen:**
+    ```bash
+    pio run --target upload
+    ```
+4. **Ersteinrichtung:**
+    - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden.
+    - WLAN-Einstellungen über das Konfigurationsportal vornehmen.
+    - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen.
+
+## Dokumentation
+
+### Relevante Links
+- [PlatformIO Dokumentation](https://docs.platformio.org/)
+- [Spoolman Dokumentation](https://github.com/Donkie/Spoolman)
+- [Bambu Lab Drucker Dokumentation](https://www.bambulab.com/)
+
+### Tutorials und Beispiele
+- [PlatformIO erste Schritte](https://docs.platformio.org/en/latest/tutorials/espressif32/arduino_debugging_unit_testing.html)
+- [ESP32 Webserver Tutorial](https://randomnerdtutorials.com/esp32-web-server-arduino-ide/)
+
+## Lizenz
+
+Dieses Projekt ist unter der MIT-Lizenz lizenziert. Siehe [LICENSE](LICENSE) Datei für Details.
+
+## Materialien
+
+### Nützliche Ressourcen
+- [ESP32 Offizielle Dokumentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/)
+- [Arduino Bibliotheken](https://www.arduino.cc/en/Reference/Libraries)
+- [NFC Tag Informationen](https://learn.adafruit.com/adafruit-pn532-rfid-nfc/overview)
+
+### Community und Support
+- [PlatformIO Community](https://community.platformio.org/)
+- [Arduino Forum](https://forum.arduino.cc/)
+- [ESP32 Forum](https://www.esp32.com/)
+
+## Verfügbarkeit
+
+Der Code kann getestet und die Anwendung kann vom [GitHub Repository](https://github.com/ManuelW77/Filaman) heruntergeladen werden.
+
+### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>

README.md

@@ -1,9 +1,18 @@
 # FilaMan - Filament Management System
 
+[Deutsche Version](README.de.md)
+
 FilaMan is a filament management system for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management. 
 Users can manage filament spools, monitor the status of the Automatic Material System (AMS) and make settings via a web interface. 
 The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D printers and [Spoolman](https://github.com/Donkie/Spoolman) filament management as well as the [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG format.
 
+![Scale](./img/scale_trans.png)
+
+
+More Images can be found in the [img Folder](/img/)  
+or my website:[FilaMan Website](https://www.filaman.app)  
+german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
+
 ### ESP32 Hardware Features
 - **Weight Measurement:** Using a load cell with HX711 amplifier for precise weight tracking.
 - **NFC Tag Reading/Writing:** PN532 module for reading and writing filament data to NFC tags.
@@ -29,7 +38,7 @@ The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D
   - Track NFC tag assignments.
 
 ### If you want to support my work, i would be happy to get a coffe
-<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
 
 ## Detailed Functionality
 
@@ -46,14 +55,15 @@ The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D
 
 ### Components
 - **ESP32 Development Board:** Any ESP32 variant.
-[https://amzn.eu/d/aXThslf](url)
+[Amazon Link](https://amzn.eu/d/aXThslf)
 - **HX711 Load Cell Amplifier:** For weight measurement.
-[https://amzn.eu/d/1wZ4v0x](url)
+[Amazon Link](https://amzn.eu/d/1wZ4v0x)
 - **OLED Display:** 128x64 SSD1306.
-[https://amzn.eu/d/dozAYDU](url)
+[Amazon Link](https://amzn.eu/d/dozAYDU)
 - **PN532 NFC Module:** For NFC tag operations.
-[https://amzn.eu/d/8205DDh](url)
-- **NFC-Tag:** [https://amzn.eu/d/fywy4c4](url)
+[Amazon Link](https://amzn.eu/d/8205DDh)
+- **NFC-Tag:** NTAG215
+[Amazon Link](https://amzn.eu/d/fywy4c4)
 
 
 ### Pin Configuration
@@ -114,6 +124,24 @@ The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D
     - 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
 
@@ -147,4 +175,4 @@ This project is licensed under the MIT License. See the [LICENSE](LICENSE) file
 The code can be tested and the application can be downloaded from the [GitHub repository](https://github.com/ManuelW77/Filaman).
 
 ### If you want to support my work, i would be happy to get a coffe
-<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>

html/header.html

@@ -6,14 +6,13 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
-    <link rel="stylesheet" href="style2.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</h1>
+                <h1>FilaMan<span class="version">v1.2.29</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,7 +20,8 @@
             <a href="/">Start</a>
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
-            <a href="/">About</a>
+            <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">
@@ -33,3 +33,4 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+

html/index.html

@@ -1,4 +1,40 @@
-{{header}}
+<!-- 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="container">
         <h1>FilaMan</h1>

html/rfid.html

@@ -1,4 +1,41 @@
-{{header}}
+<!-- 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="connection-status hidden">
     <div class="spinner"></div>
     <span>Connection lost. Trying to reconnect...</span>
@@ -35,11 +72,11 @@
                             </li>
                             <li>
                                 <span class="stat-label">Weight:</span>
-                                <span class="stat-value"><span id="totalWeight"></span> kg</span>
+                                <span class="stat-value"><span id="totalWeight"></span></span>
                             </li>
                             <li>
                                 <span class="stat-label">Length:</span>
-                                <span class="stat-value"><span id="totalLength"></span> m</span>
+                                <span class="stat-value"><span id="totalLength"></span></span>
                             </li>
                         </ul>
                     </div>

html/rfid.js

@@ -112,9 +112,39 @@ function initWebSocket() {
                 
                 if (bambuDot) {
                     bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
+                    // Add click handler only when offline
+                    if (!data.bambu_connected) {
+                        bambuDot.style.cursor = 'pointer';
+                        bambuDot.onclick = function() {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'bambu'
+                                }));
+                            }
+                        };
+                    } else {
+                        bambuDot.style.cursor = 'default';
+                        bambuDot.onclick = null;
+                    }
                 }
                 if (spoolmanDot) {
                     spoolmanDot.className = 'status-dot ' + (data.spoolman_connected ? 'online' : 'offline');
+                    // Add click handler only when offline
+                    if (!data.spoolman_connected) {
+                        spoolmanDot.style.cursor = 'pointer';
+                        spoolmanDot.onclick = function() {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'spoolman'
+                                }));
+                            }
+                        };
+                    } else {
+                        spoolmanDot.style.cursor = 'default';
+                        spoolmanDot.onclick = null;
+                    }
                 }
                 if (ramStatus) {
                     ramStatus.textContent = `${data.freeHeap}k`;
@@ -209,16 +239,6 @@ function updateNfcInfo() {
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
-    if (selectedSpool && selectedSpool.extra.nfc_id) {
-        nfcInfo.textContent = "NFC Tag assigned";
-        nfcInfo.classList.add("nfc-success");
-        nfcInfo.classList.remove("nfc-error");
-    } else {
-        nfcInfo.textContent = "No NFC-Tag assigned";
-        nfcInfo.classList.add("nfc-error");
-        nfcInfo.classList.remove("nfc-success");
-    }
-
     if (selectedSpool) {
         writeButton.classList.remove("hidden");
     } else {
@@ -236,7 +256,7 @@ function displayAmsData(amsData) {
         
         const trayHTML = ams.tray.map(tray => {
             // Prüfe ob überhaupt Daten vorhanden sind
-            const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id'];
+            const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id', 'cali_idx'];
             const hasAnyContent = relevantFields.some(field => 
                 tray[field] !== null && 
                 tray[field] !== undefined && 
@@ -244,23 +264,38 @@ function displayAmsData(amsData) {
                 tray[field] !== 'null'
             );
 
-            if (!hasAnyContent) {
-                return `
-                    <div class="tray">
-                        <p class="tray-head">Tray ${tray.id}</p>
-                        <p>Empty</p>
-                    </div>
-                    <hr>`;
-            }
+            // Bestimme den Anzeigenamen für das Tray
+            const trayDisplayName = (ams.ams_id === 255) ? 'External' : `Tray ${tray.id}`;
 
             // Nur für nicht-leere Trays den Button-HTML erstellen
             const buttonHtml = `
                 <button class="spool-button" onclick="handleSpoolIn(${ams.ams_id}, ${tray.id})" 
-                        style="position: absolute; top: -35px; left: -15px; 
+                        style="position: absolute; top: -30px; left: -15px; 
                                background: none; border: none; padding: 0; 
                                cursor: pointer; display: none;">
                     <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px;">
                 </button>`;
+            
+                        // Nur für nicht-leere Trays den Button-HTML erstellen
+            const outButtonHtml = `
+                <button class="spool-button" onclick="handleSpoolOut()" 
+                        style="position: absolute; top: -35px; right: -15px; 
+                               background: none; border: none; padding: 0; 
+                               cursor: pointer; display: block;">
+                    <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px; transform: rotate(180deg) scaleX(-1);">
+                </button>`;
+
+            if (!hasAnyContent) {
+                return `
+                    <div class="tray">
+                        <p class="tray-head">${trayDisplayName}</p>
+                        <p>
+                            ${(ams.ams_id === 255 && tray.tray_type === '') ? buttonHtml : ''}
+                            Empty
+                        </p>
+                    </div>
+                    <hr>`;
+            }
 
             // Generiere den Type mit Color-Box zusammen
             const typeWithColor = tray.tray_type ? 
@@ -277,8 +312,9 @@ function displayAmsData(amsData) {
             // Array mit restlichen Tray-Eigenschaften
             const trayProperties = [
                 { key: 'tray_sub_brands', label: 'Sub Brands' },
-                { key: 'tray_info_idx', label: 'Filament Index' },
-                { key: 'setting_id', label: 'Setting ID' }
+                { key: 'tray_info_idx', label: 'Filament IDX' },
+                { key: 'setting_id', label: 'Setting ID' },
+                { key: 'cali_idx', label: 'Calibration IDX' }
             ];
 
             // Nur gültige Felder anzeigen
@@ -289,7 +325,13 @@ function displayAmsData(amsData) {
                     tray[prop.key] !== '' &&
                     tray[prop.key] !== 'null'
                 )
-                .map(prop => `<p>${prop.label}: ${tray[prop.key]}</p>`)
+                .map(prop => {
+                    // Spezielle Behandlung für setting_id
+                    if (prop.key === 'cali_idx' && tray[prop.key] === '-1') {
+                        return `<p>${prop.label}: not calibrated</p>`;
+                    }
+                    return `<p>${prop.label}: ${tray[prop.key]}</p>`;
+                })
                 .join('');
 
             // Temperaturen nur anzeigen, wenn beide nicht 0 sind
@@ -297,9 +339,6 @@ function displayAmsData(amsData) {
                 ? `<p>Nozzle Temp: ${tray.nozzle_temp_min}°C - ${tray.nozzle_temp_max}°C</p>`
                 : '';
 
-            // Bestimme den Anzeigenamen für das Tray
-            const trayDisplayName = (ams.ams_id === 255) ? 'External' : `Tray ${tray.id}`;
-
             return `
                 <div class="tray" ${tray.tray_color ? `style="border-left: 4px solid #${tray.tray_color};"` : 'style="border-left: 4px solid #007bff;"'}>
                     <div style="position: relative;">
@@ -308,7 +347,9 @@ function displayAmsData(amsData) {
                         ${typeWithColor}
                         ${trayDetails}
                         ${tempHTML}
+                        ${(ams.ams_id === 255 && tray.tray_type !== '') ? outButtonHtml : ''}
                     </div>
+                    
                 </div>`;
         }).join('');
 
@@ -332,6 +373,30 @@ function updateSpoolButtons(show) {
     });
 }
 
+function handleSpoolOut() {
+    // Erstelle Payload
+    const payload = {
+        type: 'setBambuSpool',
+        payload: {
+            amsId: 255,
+            trayId: 254,
+            color: "FFFFFF",
+            nozzle_temp_min: 0,
+            nozzle_temp_max: 0,
+            type: "",
+            brand: ""
+        }
+    };
+
+    try {
+        socket.send(JSON.stringify(payload));
+        showNotification(`External Spool removed. Pls wait`, true);
+    } catch (error) {
+        console.error("Fehler beim Senden der WebSocket Nachricht:", error);
+        showNotification("Error while sending!", false);
+    }
+}
+
 // Neue Funktion zum Behandeln des Spool-In-Klicks
 function handleSpoolIn(amsId, trayId) {
     // Prüfe WebSocket Verbindung zuerst
@@ -361,7 +426,7 @@ function handleSpoolIn(amsId, trayId) {
     // Temperaturwerte extrahieren
     let minTemp = "175";
     let maxTemp = "275";
-    
+
     if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
         selectedSpool.filament.nozzle_temperature.length >= 2) {
         minTemp = selectedSpool.filament.nozzle_temperature[0];
@@ -378,19 +443,30 @@ function handleSpoolIn(amsId, trayId) {
             nozzle_temp_min: parseInt(minTemp),
             nozzle_temp_max: parseInt(maxTemp),
             type: selectedSpool.filament.material,
-            brand: selectedSpool.filament.vendor.name
+            brand: selectedSpool.filament.vendor.name,
+            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
+            cali_idx: "-1"  // Default-Wert setzen
         }
     };
 
-    // Debug logging
-    console.log("Sende WebSocket Nachricht:", payload);
+    // Prüfe, ob der Key cali_idx vorhanden ist und setze ihn
+    if (selectedSpool.filament.extra.bambu_cali_id) {
+        payload.payload.cali_idx = selectedSpool.filament.extra.bambu_cali_id.replace(/['"]+/g, '').trim();
+    }
+
+    // Prüfe, ob der Key bambu_setting_id vorhanden ist
+    if (selectedSpool.filament.extra.bambu_setting_id) {
+        payload.payload.bambu_setting_id = selectedSpool.filament.extra.bambu_setting_id.replace(/['"]+/g, '').trim();
+    }
+
+    console.log("Spool-In Payload:", payload);
 
     try {
         socket.send(JSON.stringify(payload));
         showNotification(`Spool set in AMS ${amsId} Tray ${trayId}. Pls wait`, true);
     } catch (error) {
         console.error("Fehler beim Senden der WebSocket Nachricht:", error);
-        showNotification("Fehler beim Senden der Daten", false);
+        showNotification("Error while sending", false);
     }
 }
 
@@ -440,7 +516,7 @@ function updateNfcData(data) {
             }
 
         } else {
-            nfcDataDiv.innerHTML = '<div style="margin-top: 10px;"></div>';
+            nfcDataDiv.innerHTML = '<div class="info-message-inner" style="margin-top: 10px;"></div>';
         }
         nfcStatusContainer.appendChild(nfcDataDiv);
         return;
@@ -566,4 +642,4 @@ function showNotification(message, isSuccess) {
             notification.remove();
         }, 300);
     }, 3000);
-}
+}

html/spoolman.html

@@ -1,4 +1,41 @@
-{{header}}
+<!-- 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 -->
+
     <script>
         window.onload = function() {
             if (spoolmanUrl && spoolmanUrl.trim() !== "") {

html/spoolman.js

@@ -61,9 +61,6 @@ function populateVendorDropdown(data, selectedSmId = null) {
             totalLength += spool.remaining_length;
         }
 
-        console.log("Länge gesamt: " + spool.remaining_length);
-        console.log("Gewicht gesamt" + spool.remaining_weight);
-
         const vendor = spool.filament.vendor;
         
         const hasValidNfcId = spool.extra && 
@@ -88,6 +85,18 @@ function populateVendorDropdown(data, selectedSmId = null) {
         }
     });
 
+    // Nach der Schleife: Formatierung der Gesamtlänge
+    console.log("Total Lenght: ", totalLength);
+    const formattedLength = totalLength > 1000 
+        ? (totalLength / 1000).toFixed(2) + " km" 
+        : totalLength.toFixed(2) + " m";
+
+    // Formatierung des Gesamtgewichts (von g zu kg zu t)
+    const weightInKg = totalWeight / 1000;  // erst in kg umrechnen
+    const formattedWeight = weightInKg > 1000 
+        ? (weightInKg / 1000).toFixed(2) + " t" 
+        : weightInKg.toFixed(2) + " kg";
+
     // Dropdown mit gefilterten Herstellern befüllen
     Object.entries(filteredVendors).forEach(([id, name]) => {
         const option = document.createElement("option");
@@ -102,8 +111,8 @@ function populateVendorDropdown(data, selectedSmId = null) {
     document.getElementById("totalVendors").textContent = Object.keys(allVendors).length;
     
     // Neue Statistiken hinzufügen
-    document.getElementById("totalWeight").textContent = (totalWeight / 1000).toFixed(2);
-    document.getElementById("totalLength").textContent = (totalLength / 1000).toFixed(2);
+    document.getElementById("totalWeight").textContent = formattedWeight;
+    document.getElementById("totalLength").textContent = formattedLength;
 
     // Material-Statistiken zum DOM hinzufügen
     const materialsList = document.getElementById("materialsList");
@@ -112,7 +121,7 @@ function populateVendorDropdown(data, selectedSmId = null) {
         .sort(([,a], [,b]) => b - a) // Sortiere nach Anzahl absteigend
         .forEach(([material, count]) => {
             const li = document.createElement("li");
-            li.textContent = `${material}: ${count} ${count === 1 ? 'Spule' : 'Spulen'}`;
+            li.textContent = `${material}: ${count} ${count === 1 ? 'Spool' : 'Spools'}`;
             materialsList.appendChild(li);
         });
 

html/style.css

@@ -133,6 +133,15 @@ body {
     background-color: #dc2626;
 }
 
+.status-dot.offline {
+    cursor: pointer;
+}
+
+.status-dot.offline:hover {
+    opacity: 0.8;
+    transform: scale(1.1);
+}
+
 .ram-status { 
     color: var(--inner-text-color);
     font-size: 0.9em;
@@ -471,11 +480,15 @@ a:hover {
 
 .info-message {
     padding: 10px;
-    background-color: #fff3f3;
+    background-color: var(--header-bg);
     border-radius: 4px;
     border-left: 4px solid #39d82e;
 }
 
+.info-message-inner {
+    background-color: var(--header-bg) !important;
+}
+
 .nfc-header {
     display: grid;
     grid-template-columns: 40px 1fr 40px;
@@ -489,3 +502,594 @@ a:hover {
     text-align: center;
     color: var(--accent-color);
 }
+
+.nfc-header .status-circle {
+    grid-column: 3;
+    justify-self: end;
+}
+
+.content-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+}
+
+.connection-status {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    background-color: #fff3f3;
+    border: 1px solid #dc3545;
+    border-radius: 4px;
+    padding: 10px 15px;
+    margin: 15px auto;
+    color: #dc3545;
+    position: fixed;
+    top: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 1000;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    max-width: 90%;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.connection-status.visible {
+    opacity: 1;
+}
+
+.spinner {
+    flex-shrink: 0;
+    width: 16px;
+    height: 16px;
+    border: 2px solid rgba(220, 53, 69, 0.2);
+    border-top-color: #dc3545;
+    border-radius: 50%;
+}
+
+.connection-status.visible .spinner {
+    animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+    to { transform: rotate(360deg); }
+}
+
+.connection-status.hidden {
+    display: none;
+}
+
+.nfc-actions {
+    display: flex;
+    gap: 10px;
+    justify-content: center; /* Zentriert das div */
+}
+
+.btn {
+    padding: 8px 16px;
+    border-radius: 4px;
+    border: none;
+    cursor: pointer;
+    font-weight: bold;
+}
+
+.btn-primary {
+    background-color: #007bff;
+    color: white;
+}
+
+.btn-primary:hover {
+    background-color: #0056b3;
+}
+
+.btn-danger {
+    background-color: #dc3545;
+    color: white;
+}
+
+.btn-danger:hover {
+    background-color: #c82333;
+}
+
+/* Filament Select Styling */
+#filamentSelect {
+    width: 100%;
+    padding: 12px 15px;
+    font-size: 16px;
+    border: 2px solid #e0e0e0;
+    border-radius: 8px;
+    background-color: #fff;
+    cursor: pointer;
+    appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23007bff' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+    background-repeat: no-repeat;
+    background-position: right 15px center;
+    background-size: 15px;
+    transition: all 0.3s ease;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+#filamentSelect:hover {
+    border-color: #007bff;
+    box-shadow: 0 3px 6px rgba(0, 123, 255, 0.1);
+}
+
+#filamentSelect:focus {
+    border-color: #007bff;
+    outline: none;
+    box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.25);
+}
+
+#filamentSelect option {
+    padding: 8px 15px;
+    font-size: 16px;
+    background-color: #fff;
+    color: #000; /* Standard Textfarbe für alles außer dem Farbblock */
+}
+
+#filamentSelect option::first-letter {
+    font-size: 16px;
+    margin-right: 5px;
+}
+
+#filamentSelect option::before {
+    content: '';
+    display: inline-block;
+    width: 12px;
+    margin-right: 8px;
+}
+
+/* Color Box im Select */
+.color-box {
+    display: inline-block;
+    width: 12px;
+    height: 12px;
+    border: 1px solid #333;
+    border-radius: 2px;
+    margin-right: 5px;
+    vertical-align: middle;
+}
+
+#filamentSelect option span {
+    display: inline-block;
+    pointer-events: none;
+}
+
+#filamentSelect option span:first-child {
+    margin-right: 5px;
+    font-size: 16px;
+}
+
+/* Filament Select Option Styling */
+#filamentSelect option span.color-circle {
+    display: inline-block;
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    margin-right: 8px;
+    border: 1px solid #333;
+    vertical-align: middle;
+}
+
+/* Custom Dropdown */
+.custom-dropdown {
+    position: relative;
+    width: 100%;
+    font-family: inherit;
+    cursor: default; /* Container selbst soll normalen Cursor haben */
+    color: black;
+}
+
+.dropdown-button {
+    padding: 12px 15px;
+    border: 2px solid #e0e0e0;
+    border-radius: 8px;
+    background-color: #fff;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    transition: all 0.3s ease;
+}
+
+.dropdown-button:hover {
+    border-color: #007bff;
+}
+
+.selected-color {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    border: 1px solid #333;
+    flex-shrink: 0;
+}
+
+.dropdown-arrow {
+    margin-left: auto;
+    color: #007bff;
+    font-size: 12px;
+}
+
+.dropdown-content {
+    display: none;
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    background-color: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 8px;
+    margin-top: 4px;
+    max-height: 300px;
+    overflow-y: auto;
+    z-index: 1000;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.dropdown-content.show {
+    display: block;
+}
+
+.dropdown-option {
+    padding: 10px 15px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.dropdown-option:hover {
+    background-color: #f8f9fa;
+}
+
+.option-color {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    border: 1px solid #333;
+    flex-shrink: 0;
+}
+
+.notification {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    padding: 15px 25px;
+    border-radius: 4px;
+    color: white;
+    z-index: 1000;
+    animation: slideIn 0.3s ease-out;
+}
+
+.notification.success {
+    background-color: #28a745;
+}
+
+.notification.error {
+    background-color: #dc3545;
+}
+
+.notification.fade-out {
+    opacity: 0;
+    transition: opacity 0.3s ease-out;
+}
+
+@keyframes slideIn {
+    from {
+        transform: translateX(100%);
+        opacity: 0;
+    }
+    to {
+        transform: translateX(0);
+        opacity: 1;
+    }
+}
+
+/* Neue Styles für die Statistiken */
+.statistics-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 1rem;
+    margin-top: 15px;
+}
+
+.statistics-column {
+    background: var(--inner-box-bg);
+    border: 1px solid rgba(99, 187, 103, 0.2);
+    border-radius: 0.5rem;
+}
+
+.statistics-column h3 {
+    color: var(--inner-text-color);
+    border-bottom: 1px solid rgba(99, 187, 103, 0.2);
+    font-size: 1.1rem;
+}
+
+.statistics-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+.statistics-list li {
+    display: flex;
+    justify-content: space-between;
+    padding: 0.5rem;
+    border-bottom: 1px solid rgba(99, 187, 103, 0.1);
+}
+
+.statistics-list li:last-child {
+    border-bottom: none;
+}
+
+.stat-label {
+    color: var(--inner-text-color);
+}
+
+.stat-value {
+    color: var(--stat-value-color);
+    font-weight: 500;
+}
+
+/* Responsive Design Anpassung */
+@media (max-width: 768px) {
+    .statistics-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
+.statistics-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    padding-bottom: 0;
+    border-bottom: 1px solid #e9ecef;
+}
+
+.refresh-button {
+    display: flex;
+    align-items: center;
+    padding: 8px 16px;
+    background-color: #007bff;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 14px;
+    transition: background-color 0.2s;
+}
+
+.refresh-button:hover {
+    background-color: #0056b3;
+}
+
+.refresh-button:active {
+    background-color: #004494;
+}
+
+.spools-info {
+    display: flex;
+    justify-content: flex-start;
+    gap: 20px;
+    margin-bottom: 15px;
+}
+
+.spool-stat {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    background: var(--inner-box-bg);
+    border: 1px solid rgba(99, 187, 103, 0.2);
+    border-radius: 0.5rem;
+}
+
+.spool-stat .stat-label {
+    color: var(--inner-text-color);
+}
+
+.spool-stat .stat-value {
+    color: var(--stat-value-color);
+    font-weight: 500;
+}
+
+/* Buttons und klickbare Elemente */
+button, 
+input[type="submit"],
+.dropdown-button,
+.dropdown-option,
+.refresh-button,
+.btn,
+.styled-select,
+select,
+a {
+    cursor: pointer !important;
+}
+
+/* Disabled Zustände */
+button:disabled,
+input[type="submit"]:disabled,
+.btn:disabled,
+.styled-select:disabled {
+    cursor: not-allowed !important;
+    opacity: 0.7;
+}
+
+/* Schreib-Button */
+#writeNfcButton {
+    background-color: #007bff;
+    color: white;
+    transition: background-color 0.3s, color 0.3s;
+    width: 160px;
+}
+
+#writeNfcButton.writing {
+    background-color: #ffc107;
+    color: black;
+    width: 160px;
+}
+
+#writeNfcButton.success {
+    background-color: #28a745;
+    color: white;
+    width: 160px;
+}
+
+#writeNfcButton.error {
+    background-color: #dc3545;
+    color: white;
+    width: 160px;
+}
+
+@keyframes dots {
+    0% { content: ""; }
+    33% { content: "."; }
+    66% { content: ".."; }
+    100% { content: "..."; }
+}
+
+#writeNfcButton.writing::after {
+    content: "...";
+    animation: dots 1s steps(3, end) infinite;
+}
+
+/* Bambu Settings Erweiterung */
+.bambu-settings {
+    background: white;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    max-width: 400px;
+    margin: 20px auto;
+}
+
+.bambu-settings .input-group {
+    margin-bottom: 15px;
+    text-align: left;
+}
+
+.bambu-settings .input-group label {
+    display: block;
+    margin-bottom: 5px;
+}
+
+.bambu-settings .input-group input {
+    width: 95%;
+}
+
+#bambuStatusMessage {
+    margin-top: 15px;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    justify-content: center;
+}
+
+.amsData {
+    border-color: black !important;
+    border-width: 1px !important;
+}
+
+.tray {
+    position: relative;
+}
+
+.tray-head {
+    color: var(--stat-value-color) !important;
+    text-align: center !important;
+    font-weight: bold !important;
+}
+
+.spool-button:hover {
+    opacity: 0.8;
+}
+
+.version {
+    font-size: 0.4em;
+    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/style2.css

@@ -1,505 +0,0 @@
-
-.nfc-header .status-circle {
-    grid-column: 3;
-    justify-self: end;
-}
-
-.content-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-}
-
-.connection-status {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    background-color: #fff3f3;
-    border: 1px solid #dc3545;
-    border-radius: 4px;
-    padding: 10px 15px;
-    margin: 15px auto;
-    color: #dc3545;
-    position: fixed;
-    top: 20px;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 1000;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    max-width: 90%;
-    opacity: 0;
-    transition: opacity 0.3s ease;
-}
-
-.connection-status.visible {
-    opacity: 1;
-}
-
-.spinner {
-    flex-shrink: 0;
-    width: 16px;
-    height: 16px;
-    border: 2px solid rgba(220, 53, 69, 0.2);
-    border-top-color: #dc3545;
-    border-radius: 50%;
-}
-
-.connection-status.visible .spinner {
-    animation: spin 0.8s linear infinite;
-}
-
-@keyframes spin {
-    to { transform: rotate(360deg); }
-}
-
-.connection-status.hidden {
-    display: none;
-}
-
-.nfc-actions {
-    display: flex;
-    gap: 10px;
-    justify-content: center; /* Zentriert das div */
-}
-
-.btn {
-    padding: 8px 16px;
-    border-radius: 4px;
-    border: none;
-    cursor: pointer;
-    font-weight: bold;
-}
-
-.btn-primary {
-    background-color: #007bff;
-    color: white;
-}
-
-.btn-primary:hover {
-    background-color: #0056b3;
-}
-
-.btn-danger {
-    background-color: #dc3545;
-    color: white;
-}
-
-.btn-danger:hover {
-    background-color: #c82333;
-}
-
-/* Filament Select Styling */
-#filamentSelect {
-    width: 100%;
-    padding: 12px 15px;
-    font-size: 16px;
-    border: 2px solid #e0e0e0;
-    border-radius: 8px;
-    background-color: #fff;
-    cursor: pointer;
-    appearance: none;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23007bff' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
-    background-repeat: no-repeat;
-    background-position: right 15px center;
-    background-size: 15px;
-    transition: all 0.3s ease;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-}
-
-#filamentSelect:hover {
-    border-color: #007bff;
-    box-shadow: 0 3px 6px rgba(0, 123, 255, 0.1);
-}
-
-#filamentSelect:focus {
-    border-color: #007bff;
-    outline: none;
-    box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.25);
-}
-
-#filamentSelect option {
-    padding: 8px 15px;
-    font-size: 16px;
-    background-color: #fff;
-    color: #000; /* Standard Textfarbe für alles außer dem Farbblock */
-}
-
-#filamentSelect option::first-letter {
-    font-size: 16px;
-    margin-right: 5px;
-}
-
-#filamentSelect option::before {
-    content: '';
-    display: inline-block;
-    width: 12px;
-    margin-right: 8px;
-}
-
-/* Color Box im Select */
-.color-box {
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    border: 1px solid #333;
-    border-radius: 2px;
-    margin-right: 5px;
-    vertical-align: middle;
-}
-
-#filamentSelect option span {
-    display: inline-block;
-    pointer-events: none;
-}
-
-#filamentSelect option span:first-child {
-    margin-right: 5px;
-    font-size: 16px;
-}
-
-/* Filament Select Option Styling */
-#filamentSelect option span.color-circle {
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    border-radius: 50%;
-    margin-right: 8px;
-    border: 1px solid #333;
-    vertical-align: middle;
-}
-
-/* Custom Dropdown */
-.custom-dropdown {
-    position: relative;
-    width: 100%;
-    font-family: inherit;
-    cursor: default; /* Container selbst soll normalen Cursor haben */
-    color: black;
-}
-
-.dropdown-button {
-    padding: 12px 15px;
-    border: 2px solid #e0e0e0;
-    border-radius: 8px;
-    background-color: #fff;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    transition: all 0.3s ease;
-}
-
-.dropdown-button:hover {
-    border-color: #007bff;
-}
-
-.selected-color {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    border: 1px solid #333;
-    flex-shrink: 0;
-}
-
-.dropdown-arrow {
-    margin-left: auto;
-    color: #007bff;
-    font-size: 12px;
-}
-
-.dropdown-content {
-    display: none;
-    position: absolute;
-    top: 100%;
-    left: 0;
-    right: 0;
-    background-color: #fff;
-    border: 1px solid #e0e0e0;
-    border-radius: 8px;
-    margin-top: 4px;
-    max-height: 300px;
-    overflow-y: auto;
-    z-index: 1000;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-}
-
-.dropdown-content.show {
-    display: block;
-}
-
-.dropdown-option {
-    padding: 10px 15px;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.dropdown-option:hover {
-    background-color: #f8f9fa;
-}
-
-.option-color {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    border: 1px solid #333;
-    flex-shrink: 0;
-}
-
-.notification {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    padding: 15px 25px;
-    border-radius: 4px;
-    color: white;
-    z-index: 1000;
-    animation: slideIn 0.3s ease-out;
-}
-
-.notification.success {
-    background-color: #28a745;
-}
-
-.notification.error {
-    background-color: #dc3545;
-}
-
-.notification.fade-out {
-    opacity: 0;
-    transition: opacity 0.3s ease-out;
-}
-
-@keyframes slideIn {
-    from {
-        transform: translateX(100%);
-        opacity: 0;
-    }
-    to {
-        transform: translateX(0);
-        opacity: 1;
-    }
-}
-
-/* Neue Styles für die Statistiken */
-.statistics-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-    gap: 1rem;
-    margin-top: 15px;
-}
-
-.statistics-column {
-    background: var(--inner-box-bg);
-    border: 1px solid rgba(99, 187, 103, 0.2);
-    border-radius: 0.5rem;
-}
-
-.statistics-column h3 {
-    color: var(--inner-text-color);
-    border-bottom: 1px solid rgba(99, 187, 103, 0.2);
-    font-size: 1.1rem;
-}
-
-.statistics-list {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-}
-
-.statistics-list li {
-    display: flex;
-    justify-content: space-between;
-    padding: 0.5rem;
-    border-bottom: 1px solid rgba(99, 187, 103, 0.1);
-}
-
-.statistics-list li:last-child {
-    border-bottom: none;
-}
-
-.stat-label {
-    color: var(--inner-text-color);
-}
-
-.stat-value {
-    color: var(--stat-value-color);
-    font-weight: 500;
-}
-
-/* Responsive Design Anpassung */
-@media (max-width: 768px) {
-    .statistics-grid {
-        grid-template-columns: 1fr;
-    }
-}
-
-.statistics-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 15px;
-    padding-bottom: 0;
-    border-bottom: 1px solid #e9ecef;
-}
-
-.refresh-button {
-    display: flex;
-    align-items: center;
-    padding: 8px 16px;
-    background-color: #007bff;
-    color: white;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-    font-size: 14px;
-    transition: background-color 0.2s;
-}
-
-.refresh-button:hover {
-    background-color: #0056b3;
-}
-
-.refresh-button:active {
-    background-color: #004494;
-}
-
-.spools-info {
-    display: flex;
-    justify-content: flex-start;
-    gap: 20px;
-    margin-bottom: 15px;
-}
-
-.spool-stat {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    background: var(--inner-box-bg);
-    border: 1px solid rgba(99, 187, 103, 0.2);
-    border-radius: 0.5rem;
-}
-
-.spool-stat .stat-label {
-    color: var(--inner-text-color);
-}
-
-.spool-stat .stat-value {
-    color: var(--stat-value-color);
-    font-weight: 500;
-}
-
-/* Buttons und klickbare Elemente */
-button, 
-input[type="submit"],
-.dropdown-button,
-.dropdown-option,
-.refresh-button,
-.btn,
-.styled-select,
-select,
-a {
-    cursor: pointer !important;
-}
-
-/* Disabled Zustände */
-button:disabled,
-input[type="submit"]:disabled,
-.btn:disabled,
-.styled-select:disabled {
-    cursor: not-allowed !important;
-    opacity: 0.7;
-}
-
-/* Schreib-Button */
-#writeNfcButton {
-    background-color: #007bff;
-    color: white;
-    transition: background-color 0.3s, color 0.3s;
-    width: 160px;
-}
-
-#writeNfcButton.writing {
-    background-color: #ffc107;
-    color: black;
-    width: 160px;
-}
-
-#writeNfcButton.success {
-    background-color: #28a745;
-    color: white;
-    width: 160px;
-}
-
-#writeNfcButton.error {
-    background-color: #dc3545;
-    color: white;
-    width: 160px;
-}
-
-@keyframes dots {
-    0% { content: ""; }
-    33% { content: "."; }
-    66% { content: ".."; }
-    100% { content: "..."; }
-}
-
-#writeNfcButton.writing::after {
-    content: "...";
-    animation: dots 1s steps(3, end) infinite;
-}
-
-/* Bambu Settings Erweiterung */
-.bambu-settings {
-    background: white;
-    padding: 20px;
-    border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    max-width: 400px;
-    margin: 20px auto;
-}
-
-.bambu-settings .input-group {
-    margin-bottom: 15px;
-    text-align: left;
-}
-
-.bambu-settings .input-group label {
-    display: block;
-    margin-bottom: 5px;
-}
-
-.bambu-settings .input-group input {
-    width: 95%;
-}
-
-#bambuStatusMessage {
-    margin-top: 15px;
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    justify-content: center;
-}
-
-.amsData {
-    border-color: black !important;
-    border-width: 1px !important;
-}
-
-.tray {
-    position: relative;
-}
-
-.tray-head {
-    color: var(--stat-value-color) !important;
-    text-align: center !important;
-    font-weight: bold !important;
-}
-
-.spool-button:hover {
-    opacity: 0.8;
-}

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,41 @@
-{{header}}
+<!-- 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>Scale Configuration Page</h1>
         

html/wifi.html

@@ -1,4 +1,41 @@
-{{header}}
+<!-- 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>WiFi Configuration Page</h1>
         <form action="/setToken" method="post">

partitions.csv

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

platformio.ini

@@ -0,0 +1,76 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[common]
+version = "1.2.40"
+
+[env:esp32dev]
+platform = espressif32
+board = esp32dev
+framework = arduino
+monitor_speed = 115200
+
+lib_deps =
+    tzapu/WiFiManager @ ^2.0.17
+    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    me-no-dev/AsyncTCP @ ^1.1.1
+    bogde/HX711 @ ^0.7.5
+    adafruit/Adafruit SSD1306 @ ^2.5.13
+    adafruit/Adafruit GFX Library @ ^1.11.11
+    adafruit/Adafruit PN532 @ ^1.3.3
+    bblanchon/ArduinoJson @ ^7.3.0
+    knolleary/PubSubClient @ ^2.8
+    digitaldragon/SSLClient @ ^1.3.2
+    
+; Enable SPIFFS upload
+board_build.filesystem = spiffs
+; 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
+    -ffunction-sections
+    -fdata-sections
+    -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 = 
+    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

@@ -0,0 +1,34 @@
+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")
+    
+    # Read header content
+    with open(header_file, 'r') as f:
+        header_content = f.read()
+    
+    # Process all HTML files except header.html
+    for filename in os.listdir(html_dir):
+        if filename.endswith('.html') and filename != 'header.html':
+            file_path = os.path.join(html_dir, filename)
+            
+            # Read content
+            with open(file_path, 'r') as f:
+                content = f.read()
+            
+            # 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,8 +13,11 @@ 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'))
+    return file.endswith(('.js', '.png', '.css', '.html'))
 
 def main(source_dir, target_dir):
     for root, dirs, files in os.walk(source_dir):

scripts/pre_build.py

@@ -0,0 +1,25 @@
+Import("env")
+import os
+
+def replace_version(source, target, env):
+    # Get version from common section
+    version = env.GetProjectConfig().get("common", "version").strip('"')
+    header_file = "./html/header.html"
+    
+    with open(header_file, 'r') as file:
+        content = file.read()
+    
+    # Replace version in header.html using string manipulation instead of regex
+    search = '<h1>FilaMan<span class="version">v'
+    end = '</span>'
+    start_pos = content.find(search)
+    if start_pos != -1:
+        start_pos += len(search)
+        end_pos = content.find(end, start_pos)
+        if end_pos != -1:
+            content = content[:start_pos] + version + content[end_pos:]
+    
+    with open(header_file, 'w') as file:
+        file.write(content)
+
+env.AddPreAction("buildfs", replace_version)

scripts/pre_spiffs.py

@@ -0,0 +1,7 @@
+Import("env")
+
+# Wiederverwendung der replace_version Funktion
+exec(open("./scripts/pre_build.py").read())
+
+# Bind to SPIFFS build
+env.AddPreAction("buildfs", replace_version)

scripts/update_changelog.py

@@ -0,0 +1,128 @@
+import os
+import re
+import subprocess
+from datetime import datetime
+
+def get_version():
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    project_dir = os.path.dirname(script_dir)
+    platformio_path = os.path.join(project_dir, 'platformio.ini')
+    
+    with open(platformio_path, 'r') as f:
+        content = f.read()
+        version_match = re.search(r'version\s*=\s*"([^"]+)"', content)
+        return version_match.group(1) if version_match else None
+
+def get_last_tag():
+    try:
+        result = subprocess.run(['git', 'describe', '--tags', '--abbrev=0'], 
+                              capture_output=True, text=True)
+        return result.stdout.strip()
+    except subprocess.CalledProcessError:
+        return None
+
+def categorize_commit(commit_msg):
+    """Categorize commit messages based on conventional commits"""
+    lower_msg = commit_msg.lower()
+    if any(x in lower_msg for x in ['feat', 'add', 'new']):
+        return 'Added'
+    elif any(x in lower_msg for x in ['fix', 'bug']):
+        return 'Fixed'
+    else:
+        return 'Changed'
+
+def get_changes_from_git():
+    """Get changes from git commits since last tag"""
+    changes = {
+        'Added': [],
+        'Changed': [],
+        'Fixed': []
+    }
+    
+    last_tag = get_last_tag()
+    
+    # Get commits since last tag
+    git_log_command = ['git', 'log', '--pretty=format:%s']
+    if last_tag:
+        git_log_command.append(f'{last_tag}..HEAD')
+    
+    try:
+        result = subprocess.run(git_log_command, capture_output=True, text=True)
+        commits = result.stdout.strip().split('\n')
+        
+        # Filter out empty commits and categorize
+        for commit in commits:
+            if commit:
+                category = categorize_commit(commit)
+                # Clean up commit message
+                clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?:', '', commit).strip()
+                changes[category].append(clean_msg)
+                
+    except subprocess.CalledProcessError:
+        print("Error: Failed to get git commits")
+        return None
+    
+    return changes
+
+def push_changes(version):
+    """Push changes to upstream"""
+    try:
+        # Stage the CHANGELOG.md
+        subprocess.run(['git', 'add', 'CHANGELOG.md'], check=True)
+        
+        # Commit the changelog
+        commit_msg = f"docs: update changelog for version {version}"
+        subprocess.run(['git', 'commit', '-m', commit_msg], check=True)
+        
+        # Push to origin (local)
+        subprocess.run(['git', 'push', 'origin'], check=True)
+        print("Successfully pushed to origin")
+        
+    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__))
+    project_dir = os.path.dirname(script_dir)
+    changelog_path = os.path.join(project_dir, 'CHANGELOG.md')
+    
+    # Get changes from git
+    changes = get_changes_from_git()
+    if not changes:
+        print("No changes found or error occurred")
+        return
+    
+    # Create changelog entry
+    changelog_entry = f"## [{version}] - {today}\n"
+    for section, entries in changes.items():
+        if entries:  # Only add sections that have entries
+            changelog_entry += f"### {section}\n"
+            for entry in entries:
+                changelog_entry += f"- {entry}\n"
+            changelog_entry += "\n"
+    
+    if not os.path.exists(changelog_path):
+        with open(changelog_path, 'w') as f:
+            f.write(f"# Changelog\n\n{changelog_entry}")
+        push_changes(version)
+    else:
+        with open(changelog_path, 'r') as f:
+            content = f.read()
+        
+        if f"[{version}]" not in content:
+            updated_content = content.replace("# Changelog\n", f"# Changelog\n\n{changelog_entry}")
+            with open(changelog_path, 'w') as f:
+                f.write(updated_content)
+            push_changes(version)
+        else:
+            print(f"Version {version} already exists in changelog")
+
+if __name__ == "__main__":
+    update_changelog()

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) {
@@ -279,7 +279,11 @@ bool checkSpoolmanExtraFields() {
         "price_meter",
         "price_gramm",
         "bambu_setting_id",
-        "bambu_idx"
+        "bambu_cali_id",
+        "bambu_idx",
+        "bambu_k",
+        "bambu_flow_ratio",
+        "bambu_max_volspeed"
     };
 
     String spoolExtraFields[] = {
@@ -309,9 +313,27 @@ bool checkSpoolmanExtraFields() {
         "\"field_type\": \"text\","
         "\"key\": \"bambu_setting_id\"}",
 
-        "{\"name\": \"Bambu IDX\","
+        "{\"name\": \"Bambu Cali ID\","
         "\"field_type\": \"text\","
-        "\"key\": \"bambu_idx\"}"
+        "\"key\": \"bambu_cali_id\"}",
+
+        "{\"name\": \"Bambu Filament IDX\","
+        "\"field_type\": \"text\","
+        "\"key\": \"bambu_idx\"}",
+
+        "{\"name\": \"Bambu k\","
+        "\"field_type\": \"float\","
+        "\"key\": \"bambu_k\"}",
+
+        "{\"name\": \"Bambu Flow Ratio\","
+        "\"field_type\": \"float\","
+        "\"key\": \"bambu_flow_ratio\"}",
+
+        "{\"name\": \"Bambu Max Vol. Speed\","
+        "\"unit\": \"mm3/s\","
+        "\"field_type\": \"integer\","
+        "\"default_value\": \"12\","
+        "\"key\": \"bambu_max_volspeed\"}"
     };
 
     Serial.println("Überprüfe Extrafelder...");
@@ -374,8 +396,10 @@ bool checkSpoolmanExtraFields() {
                             Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
                             return false;
                         }
-                        http.end();
+                        //http.end();
                     }
+                    yield();
+                    vTaskDelay(100 / portTICK_PERIOD_MS);
                 }
             }
         }

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

@@ -137,43 +137,8 @@ bool sendMqttMessage(String payload) {
 }
 
 bool setBambuSpool(String payload) {
-    /* payload
-    //// set Spool
-    {
-        "print": {
-            "sequence_id": 0,
-            "command": "ams_filament_setting",
-            "ams_id": 0, // AMS ID 0-3 oder externe Spule 255
-            "tray_id": 0, // Tray ID 0-3 oder externe Spule 254
-            "tray_color": "000000FF",
-            "nozzle_temp_min": 170,
-            "nozzle_temp_max": 200,
-            "tray_type": "PETG",
-            "setting_id": "",
-            "tray_info_idx": "GFG99"
-        }
-    }
-
-
-
-    //// Remove Spool
-    {
-        "print":{
-            "ams_id":255,
-            "command":"ams_filament_setting",
-            "nozzle_temp_max": 0,
-            "nozzle_temp_min": 0,
-            "sequence_id": 0,
-            "setting_id": "",
-            "tray_color": "FFFFFFFF",
-            "tray_id": 254,
-            "tray_info_idx": "",
-            "tray_type": "",
-        }
-    }
-    */
-
-    Serial.println("Setting spool");
+    Serial.println("Spool settings in");
+    Serial.println(payload);
 
     // Parse the JSON
     JsonDocument doc;
@@ -192,25 +157,29 @@ bool setBambuSpool(String payload) {
     int maxTemp = doc["nozzle_temp_max"];
     String type = doc["type"].as<String>();
     String brand = doc["brand"].as<String>();
-    String tray_info_idx = findFilamentIdx(brand, type);
+    String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
+    if (tray_info_idx == "") tray_info_idx = (brand != "" && type != "") ? findFilamentIdx(brand, type) : "";
+    String setting_id = doc["bambu_setting_id"].as<String>();
+    String cali_idx = doc["cali_idx"].as<String>();
 
     doc.clear();
 
     doc["print"]["sequence_id"] = 0;
     doc["print"]["command"] = "ams_filament_setting";
-    doc["print"]["ams_id"] = amsId < 200 ? amsId-1 : 255;
-    doc["print"]["tray_id"] = trayId < 200 ? trayId-1 : 254;
+    doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
+    doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
     doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
     doc["print"]["nozzle_temp_min"] = minTemp;
     doc["print"]["nozzle_temp_max"] = maxTemp;
     doc["print"]["tray_type"] = type;
-    doc["print"]["setting_id"] = "";
+    doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
     doc["print"]["tray_info_idx"] = tray_info_idx;
+    doc["print"]["setting_id"] = setting_id;
 
     // Serialize the JSON
     String output;
     serializeJson(doc, output);
-    
+
     if (sendMqttMessage(output)) {
         Serial.println("Spool successfully set");
     }
@@ -220,6 +189,67 @@ bool setBambuSpool(String payload) {
         return false;
     }
     
+    doc.clear();
+    yield();
+
+    if (cali_idx != "") {
+        yield();
+        doc["print"]["sequence_id"] = 0;
+        doc["print"]["command"] = "extrusion_cali_sel";
+        doc["print"]["filament_id"] = tray_info_idx;
+        doc["print"]["nozzle_diameter"] = "0.4";
+        doc["print"]["cali_idx"] = cali_idx.toInt();
+        doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
+        doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
+
+        // Serialize the JSON
+        String output;
+        serializeJson(doc, output);
+
+        if (sendMqttMessage(output)) {
+            Serial.println("Extrusion calibration successfully set");
+        }
+        else
+        {
+            Serial.println("Failed to set extrusion calibration");
+            return false;
+        }
+
+        doc.clear();
+        yield();
+    }
+/*
+    if (setting_id != "") {
+        yield();
+        doc["print"]["sequence_id"] = 0;
+        doc["print"]["command"] = "ams_filament_setting";
+        doc["print"]["nozzle_temp_min"] = minTemp;
+        doc["print"]["nozzle_temp_max"] = maxTemp;
+        doc["print"]["setting_id"] = setting_id;
+        doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
+        doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
+        doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
+        doc["print"]["tray_info_idx"] = tray_info_idx;
+        doc["print"]["tray_type"] = type;
+
+        // Serialize the JSON
+        String output;
+        serializeJson(doc, output);
+
+        if (sendMqttMessage(output)) {
+            Serial.println("Filament Setting successfully set");
+        }
+        else
+        {
+            Serial.println("Failed to set Filament setting");
+            return false;
+        }
+
+        doc.clear();
+        yield();
+    }
+*/
+
     return true;
 }
 
@@ -276,7 +306,8 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 JsonObject trayObj = trayArray[j];
                 if (trayObj["tray_info_idx"].as<String>() != ams_data[storedIndex].trays[j].tray_info_idx ||
                     trayObj["tray_type"].as<String>() != ams_data[storedIndex].trays[j].tray_type ||
-                    trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color) {
+                    trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color ||
+                    trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) {
                     hasChanges = true;
                     break;
                 }
@@ -293,7 +324,8 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                     foundExternal = true;
                     if (vtTray["tray_info_idx"].as<String>() != ams_data[i].trays[0].tray_info_idx ||
                         vtTray["tray_type"].as<String>() != ams_data[i].trays[0].tray_type ||
-                        vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color) {
+                        vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color ||
+                        vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx) {
                         hasChanges = true;
                     }
                     break;
@@ -307,7 +339,6 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
         // Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden
         ams_count = amsArray.size();
         
-        // Restlicher bestehender Code...
         for (int i = 0; i < ams_count && i < 16; i++) {
             JsonObject amsObj = amsArray[i];
             JsonArray trayArray = amsObj["tray"].as<JsonArray>();
@@ -324,25 +355,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>();
                 ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>();
                 ams_data[i].trays[j].setting_id = trayObj["setting_id"].as<String>();
-            }
-        }
-        //Serial.println("----------------");
-        //Serial.println();
-
-        // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
-        sendAmsData(nullptr);
-
-        // Verarbeite erst die normalen AMS-Daten
-        for (int i = 0; i < amsArray.size() && i < 16; i++) {
-            JsonObject amsObj = amsArray[i];
-            JsonArray trayArray = amsObj["tray"].as<JsonArray>();
-
-            ams_data[i].ams_id = amsObj["id"].as<uint8_t>();
-            for (int j = 0; j < trayArray.size() && j < 4; j++) {
-                JsonObject trayObj = trayArray[j];
-                ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>();
-                ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>();
-                // ... weitere Tray-Daten ...
+                ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>();
             }
         }
         
@@ -362,11 +375,12 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
             ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>();
             ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>();
             ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
+            ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
             ams_count++;  // Erhöhe ams_count für die externe Spule
         }
 
         // Sende die aktualisierten AMS-Daten
-        sendAmsData(nullptr);
+        //sendAmsData(nullptr);
 
         // Erstelle JSON für WebSocket-Clients
         JsonDocument wsDoc;
@@ -389,18 +403,68 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min;
                 trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max;
                 trayObj["setting_id"] = ams_data[i].trays[j].setting_id;
+                trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx;
             }
         }
 
         serializeJson(wsArray, amsJsonData);
         sendAmsData(nullptr);
     }
+    // Neue Bedingung für ams_filament_setting
+    else if (doc["print"]["command"] == "ams_filament_setting") {
+        int amsId = doc["print"]["ams_id"].as<int>();
+        int trayId = doc["print"]["tray_id"].as<int>();
+        String settingId = doc["print"]["setting_id"].as<String>();
+        
+        // Finde das entsprechende AMS und Tray
+        for (int i = 0; i < ams_count; i++) {
+            if (ams_data[i].ams_id == amsId) {
+                // Update setting_id im entsprechenden Tray
+                ams_data[i].trays[trayId].setting_id = settingId;
+                
+                // Erstelle neues JSON für WebSocket-Clients
+                JsonDocument wsDoc;
+                JsonArray wsArray = wsDoc.to<JsonArray>();
+
+                for (int j = 0; j < ams_count; j++) {
+                    JsonObject amsObj = wsArray.createNestedObject();
+                    amsObj["ams_id"] = ams_data[j].ams_id;
+
+                    JsonArray trays = amsObj.createNestedArray("tray");
+                    int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4;
+                    
+                    for (int k = 0; k < maxTrays; k++) {
+                        JsonObject trayObj = trays.createNestedObject();
+                        trayObj["id"] = ams_data[j].trays[k].id;
+                        trayObj["tray_info_idx"] = ams_data[j].trays[k].tray_info_idx;
+                        trayObj["tray_type"] = ams_data[j].trays[k].tray_type;
+                        trayObj["tray_sub_brands"] = ams_data[j].trays[k].tray_sub_brands;
+                        trayObj["tray_color"] = ams_data[j].trays[k].tray_color;
+                        trayObj["nozzle_temp_min"] = ams_data[j].trays[k].nozzle_temp_min;
+                        trayObj["nozzle_temp_max"] = ams_data[j].trays[k].nozzle_temp_max;
+                        trayObj["setting_id"] = ams_data[j].trays[k].setting_id;
+                        trayObj["cali_idx"] = ams_data[j].trays[k].cali_idx;
+                    }
+                }
+
+                // Aktualisiere das globale amsJsonData
+                amsJsonData = "";
+                serializeJson(wsArray, amsJsonData);
+                
+                // Sende an WebSocket Clients
+                sendAmsData(nullptr);
+                break;
+            }
+        }
+    }
 }
 
 void reconnect() {
     // Loop until we're reconnected
     while (!client.connected()) {
         Serial.print("Attempting MQTT connection...");
+        bambu_connected = false;
+        oledShowTopRow();
 
         // Attempt to connect
         if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) {
@@ -416,7 +480,8 @@ void reconnect() {
             bambu_connected = false;
             oledShowTopRow();
             // Wait 5 seconds before retrying
-            delay(5000);
+            yield();
+            vTaskDelay(5000 / portTICK_PERIOD_MS);
         }
     }
 }
@@ -434,6 +499,8 @@ void mqtt_loop(void * parameter) {
             vTaskDelay(100);
         }
         client.loop();
+        yield();
+        vTaskDelay(100);
     }
 }
 
@@ -466,28 +533,28 @@ bool setupMqtt() {
             //client.subscribe(request_topic.c_str());
             Serial.println("MQTT-Client initialisiert");
 
-            oledShowTopRow();
             oledShowMessage("Bambu Connected");
             bambu_connected = true;
+            oledShowTopRow();
+
+            xTaskCreatePinnedToCore(
+                mqtt_loop, /* Function to implement the task */
+                "BambuMqtt", /* Name of the task */
+                10000,  /* Stack size in words */
+                NULL,  /* Task input parameter */
+                mqttTaskPrio,  /* Priority of the task */
+                &BambuMqttTask,  /* Task handle. */
+                mqttTaskCore); /* Core where the task should run */
         } 
         else 
         {
             Serial.println("Fehler: Konnte sich nicht beim MQTT-Server anmelden");
             oledShowMessage("Bambu Connection Failed");
-            oledShowTopRow();
             vTaskDelay(2000 / portTICK_PERIOD_MS);
             connected = false;
+            oledShowTopRow();
         }
 
-        xTaskCreatePinnedToCore(
-            mqtt_loop, /* Function to implement the task */
-            "BambuMqtt", /* Name of the task */
-            10000,  /* Stack size in words */
-            NULL,  /* Task input parameter */
-            mqttTaskPrio,  /* Priority of the task */
-            &BambuMqttTask,  /* Task handle. */
-            mqttTaskCore); /* Core where the task should run */
-
         if (!connected) return false;
     } 
     else 
@@ -499,4 +566,11 @@ bool setupMqtt() {
         return false;
     }
     return true;
+}
+
+void bambu_restart() {
+    if (BambuMqttTask) {
+        vTaskDelete(BambuMqttTask);
+    }
+    setupMqtt();
 }

src/bambu.h

@@ -13,6 +13,7 @@ struct TrayData {
     int nozzle_temp_min;
     int nozzle_temp_max;
     String setting_id;
+    String cali_idx;
 };
 
 #define MAX_AMS 17  // 16 normale AMS + 1 externe Spule
@@ -33,5 +34,6 @@ bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr,
 bool setupMqtt();
 void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
+void bambu_restart();
 
 #endif

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);
@@ -74,6 +68,10 @@ void setup() {
 
 unsigned long lastWeightReadTime = 0;
 const unsigned long weightReadInterval = 1000; // 1 second
+
+unsigned long lastAmsSendTime = 0;
+const unsigned long amsSendInterval = 60000; // 1 minute
+
 uint8_t weightSend = 0;
 int16_t lastWeight = 0;
 uint8_t wifiErrorCounter = 0;
@@ -92,8 +90,11 @@ 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;
+    sendAmsData(nullptr);
+  }
 
   // Ausgabe der Waage auf Display
   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
@@ -127,6 +128,7 @@ void loop() {
       weightSend = 0;
     }
   }
+
   // reset weight counter after writing tag
   if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag > 1)
   {
@@ -136,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)) 
     {
@@ -154,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
@@ -69,6 +69,16 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
             }
         }
 
+        else if (doc["type"] == "reconnect") {
+            if (doc["payload"] == "bambu") {
+                bambu_restart();
+            }
+
+            if (doc["payload"] == "spoolman") {
+                initSpoolman();
+            }
+        }
+
         else if (doc["type"] == "setBambuSpool") {
             Serial.println(doc["payload"].as<String>());
             setBambuSpool(doc["payload"]);
@@ -82,24 +92,16 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
 
 // Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei
 String loadHtmlWithHeader(const char* filename) {
-    if (!SPIFFS.exists(filename) || !SPIFFS.exists("/header.html")) {
+    Serial.println("Lade HTML-Datei: " + String(filename));
+    if (!SPIFFS.exists(filename)) {
         Serial.println("Fehler: Datei nicht gefunden!");
         return "Fehler: Datei nicht gefunden!";
     }
 
-    // Lade den Header
-    File headerFile = SPIFFS.open("/header.html", "r");
-    String header = headerFile.readString();
-    headerFile.close();
-
-    // Lade die Hauptdatei
     File file = SPIFFS.open(filename, "r");
     String html = file.readString();
     file.close();
 
-    // Ersetze den Platzhalter mit dem Header
-    html.replace("{{header}}", header);
-
     return html;
 }
 
@@ -159,25 +161,31 @@ void setupWebserver(AsyncWebServer &server) {
     Serial.print("Geladene Spoolman-URL: ");
     Serial.println(spoolmanUrl);
 
-    // Route für die Startseite
+    // Route für about
     server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
-        Serial.println("Anfrage für / erhalten");
-        String html = loadHtmlWithHeader("/index.html");
-        request->send(200, "text/html", html);
+        Serial.println("Anfrage für /about erhalten");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.html.gz", "text/html");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für Waage
     server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /waage erhalten");
-        String html = loadHtmlWithHeader("/waage.html");
-        request->send(200, "text/html", html);
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/waage.html.gz", "text/html");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für RFID
     server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /rfid erhalten");
-        String html = loadHtmlWithHeader("/rfid.html");
-        request->send(200, "text/html", html);
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/rfid.html.gz", "text/html");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
         Serial.println("RFID-Seite gesendet");
     });
 
@@ -201,8 +209,10 @@ void setupWebserver(AsyncWebServer &server) {
     // Route für WiFi
     server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /wifi erhalten");
-        String html = loadHtmlWithHeader("/wifi.html");
-        request->send(200, "text/html", html);
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/wifi.html.gz", "text/html");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für Spoolman Setting
@@ -283,15 +293,6 @@ void setupWebserver(AsyncWebServer &server) {
         Serial.println("style.css gesendet");
     });
 
-    server.on("/style2.css", HTTP_GET, [](AsyncWebServerRequest *request){
-        Serial.println("Lade style2.css");
-        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/style2.css.gz", "text/css");
-        response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Cache-Control", CACHE_CONTROL);
-        request->send(response);
-        Serial.println("style2.css gesendet");
-    });
-
     // Route für das Logo
     server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){
         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/logo.png.gz", "image/png");
@@ -336,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