fix: enhance weight display logic for negative values

.github/workflows/gitea-release.yml

@@ -7,11 +7,20 @@ on:
         description: 'Token für Gitea API-Zugriff'
         required: true
 
+    outputs:
+      version:
+        description: 'The version that was released'
+        value: ${{ jobs.create-release.outputs.version }}
+
 jobs:
   create-release:
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.VERSION }}
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -40,7 +49,7 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary (without header)
+        # Create SPIFFS binary - direct copy without header
         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary
@@ -66,14 +75,48 @@ jobs:
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       
-    - name: Read CHANGELOG.md
-      id: changelog
+    - name: Generate Release Notes
+      id: release_notes
       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
+        # Get the latest tag
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
+        
+        if [ -n "$LATEST_TAG" ]; then
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Get all commits since last release with commit hash and author
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        else
+          # First release
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Initial Release" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Add all commits for initial release
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
 
     - name: Determine Gitea URL
       id: gitea_url
@@ -122,7 +165,7 @@ jobs:
         
         # Erstelle zuerst den Release ohne Dateien
         echo "Debug: Creating release..."
-        RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}"
+        RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.release_notes.outputs.CHANGES }}\"}"
         
         RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \
           -X POST \
@@ -162,4 +205,4 @@ jobs:
               echo "Successfully uploaded $file"
             fi
           fi
-        done
+        done

.github/workflows/github-release.yml

@@ -47,7 +47,7 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary (without header)
+        # Create SPIFFS binary - direct copy without header
         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary (always)
@@ -73,14 +73,48 @@ jobs:
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       
-    - name: Read CHANGELOG.md
-      id: changelog
+    - name: Generate Release Notes
+      id: release_notes
       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
+        # Get the latest tag
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
+        
+        if [ -n "$LATEST_TAG" ]; then
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Get all commits since last release with commit hash and author
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        else
+          # First release
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Initial Release" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Add all commits for initial release
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
 
     - name: Create GitHub Release
       env:
@@ -110,9 +144,42 @@ jobs:
         if [ -n "$FILES_TO_UPLOAD" ]; then
           gh release create "v${VERSION}" \
             --title "Release ${VERSION}" \
-            --notes "${{ steps.changelog.outputs.CHANGES }}" \
+            --notes "${{ steps.release_notes.outputs.CHANGES }}" \
             $FILES_TO_UPLOAD
         else
           echo "Error: No files found to upload"
           exit 1
+        fi
+
+    - name: Install lftp
+      run: sudo apt-get install -y lftp
+        
+    - name: Upload Firmware via FTP
+      if: success()
+      env:
+        FTP_PASSWORD: ${{ vars.FTP_PASSWORD }}
+        FTP_USER: ${{ vars.FTP_USER }}
+        FTP_HOST: ${{ vars.FTP_HOST }}
+        VERSION: ${{ steps.get_version.outputs.VERSION }}
+      run: |
+        echo "Environment variables:"
+        env | grep -E '^FTP_' | while read -r line; do
+          var_name=$(echo "$line" | cut -d= -f1)
+          var_value=$(echo "$line" | cut -d= -f2-)
+          echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
+        done
+        
+        cd .pio/build/esp32dev
+        if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
+          echo "All FTP credentials are present, attempting upload..."
+          lftp -c "set ssl:verify-certificate no; \
+                    set ftp:ssl-protect-data true; \
+                    set ftp:ssl-force true; \
+                    set ssl:check-hostname false; \
+                    set ftp:ssl-auth TLS; \
+                    open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
+                    put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
+        else
+          echo "Error: Some FTP credentials are missing"
+          exit 1
         fi

CHANGELOG.md

@@ -1,5 +1,374 @@
 # Changelog
 
+## [1.3.92] - 2025-02-24
+### Changed
+- update webpages for version v1.3.92
+- remove commented-out code in setBambuSpool function
+- update installation instructions and formatting in README files
+
+### Fixed
+- configure CPU frequency settings in setup function only for testing
+- update comment to clarify NVS reading process
+- adjust weight display logic to handle cases for weight less than 2
+- update weight display logic to handle negative and specific weight cases
+
+
+## [1.3.91] - 2025-02-23
+### Added
+- update GitHub Actions workflow for FTP firmware upload with improved credential checks
+
+### Changed
+- update webpages for version v1.3.91
+
+
+## [1.3.90] - 2025-02-23
+### Added
+- update index.html for improved content structure and additional links
+- improve UI for Spoolman and Bambu Lab printer credentials, enhancing layout and styling
+- update README files with HSPI default PINs and add ESP32 pin diagram
+- implement scale calibration checks and update start_scale function to return calibration status
+- add FTP upload functionality to GitHub release workflow and update installation instructions in README
+
+### Changed
+- update webpages for version v1.3.90
+
+### Fixed
+- remove debug secrets check from Gitea release workflow
+
+
+## [1.3.89] - 2025-02-23
+### Changed
+- update webpages for version v1.3.89
+
+### Fixed
+- update Gitea release workflow to use vars for FTP credentials
+
+
+## [1.3.88] - 2025-02-23
+### Changed
+- update webpages for version v1.3.88
+
+### Fixed
+- update Gitea release workflow to use secrets for FTP credentials
+
+
+## [1.3.87] - 2025-02-23
+### Changed
+- update webpages for version v1.3.87
+
+### Fixed
+- enhance FTP upload workflow with credential checks and version output
+
+
+## [1.3.86] - 2025-02-23
+### Changed
+- update webpages for version v1.3.86
+
+### Fixed
+- streamline FTP credentials usage in Gitea release workflow
+
+
+## [1.3.85] - 2025-02-23
+### Added
+- add FTP_USER variable for Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.85
+
+
+## [1.3.84] - 2025-02-23
+### Added
+- add FTP_HOST variable for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.84
+
+
+## [1.3.83] - 2025-02-23
+### Changed
+- update webpages for version v1.3.83
+
+### Fixed
+- correct variable interpolation for FTP credentials in Gitea release workflow
+
+
+## [1.3.82] - 2025-02-23
+### Added
+- update Gitea release workflow to use variable interpolation for FTP credentials
+
+### Changed
+- update webpages for version v1.3.82
+
+
+## [1.3.81] - 2025-02-23
+### Added
+- update Gitea release workflow to use environment variables for FTP credentials and version
+
+### Changed
+- update webpages for version v1.3.81
+
+
+## [1.3.80] - 2025-02-23
+### Added
+- add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.80
+
+
+## [1.3.79] - 2025-02-23
+### Added
+- add FTP_USER input for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.79
+
+
+## [1.3.78] - 2025-02-23
+### Changed
+- update webpages for version v1.3.78
+
+### Fixed
+- change FTP protocol from FTPS to FTP for file upload in workflow
+
+
+## [1.3.77] - 2025-02-23
+### Changed
+- update webpages for version v1.3.77
+
+### Fixed
+- replace ncftp with lftp for secure firmware upload
+
+
+## [1.3.76] - 2025-02-23
+### Changed
+- update webpages for version v1.3.76
+
+### Fixed
+- replace FTP action with curl for secure firmware upload and install ncftp
+
+
+## [1.3.75] - 2025-02-23
+### Changed
+- update webpages for version v1.3.75
+
+### Fixed
+- update FTP user and enhance SSL options in gitea-release workflow
+
+
+## [1.3.74] - 2025-02-23
+### Changed
+- update webpages for version v1.3.74
+
+### Fixed
+- update password syntax in gitea-release workflow
+
+
+## [1.3.73] - 2025-02-23
+### Changed
+- update webpages for version v1.3.73
+- update version to 1.3.72 in platformio.ini
+
+
+## [1.3.72] - 2025-02-23
+### Changed
+- update webpages for version v1.3.72
+
+### Fixed
+- update FTP options for Gitea release workflow
+
+
+## [1.3.71] - 2025-02-23
+### Added
+- add FTP upload step for firmware in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.71
+
+
+## [1.3.70] - 2025-02-23
+### Changed
+- update webpages for version v1.3.70
+
+
+## [1.3.69] - 2025-02-23
+### Changed
+- update webpages for version v1.3.69
+
+### Fixed
+- update release note generation to use the second latest tag
+
+
+## [1.3.68] - 2025-02-23
+### Changed
+- update webpages for version v1.3.68
+
+### Fixed
+- update release note generation to include commit hash and author
+- remove commented test line from platformio.ini
+
+
+## [1.3.67] - 2025-02-23
+### Changed
+- update webpages for version v1.3.67
+- ci: update release note generation to use the latest tag
+
+
+## [1.3.66] - 2025-02-23
+### Changed
+- update webpages for version v1.3.66
+- ci: remove redundant git fetch for tags in release note generation
+
+
+## [1.3.65] - 2025-02-22
+### Changed
+- update webpages for version v1.3.65
+- ci: improve release note generation by fetching tags and sorting unique commits
+
+
+## [1.3.64] - 2025-02-22
+### Changed
+- update webpages for version v1.3.64
+- remove unnecessary closing tags from header.html
+
+
+## [1.3.63] - 2025-02-22
+### Added
+- update update-form background and add glass border effect
+
+### Changed
+- update webpages for version v1.3.63
+- update release note generation for initial release handling
+
+
+## [1.3.62] - 2025-02-22
+### Changed
+- update webpages for version v1.3.62
+- update background colors and improve layout for update sections
+
+
+## [1.3.61] - 2025-02-22
+### Added
+- update release notes generation to use previous tag for changes
+
+### Changed
+- update webpages for version v1.3.61
+
+
+## [1.3.60] - 2025-02-22
+### Added
+- remove automatic git push from changelog update script
+- implement release notes generation with categorized changes since last tag
+
+### Changed
+- update webpages for version v1.3.60
+
+
+## [1.3.59] - 2025-02-22
+### Added
+- implement enhanced update progress handling and WebSocket notifications
+- improve update progress reporting and enhance WebSocket notifications
+- enhance update progress handling and add WebSocket closure notification
+- implement WebSocket for update progress and enhance update response handling
+
+### Changed
+- update webpages for version v1.3.59
+
+
+## [1.3.58] - 2025-02-22
+### Added
+- implement backup and restore functionality for Bambu credentials and Spoolman URL
+
+### Changed
+- update webpages for version v1.3.58
+- update upgrade page message and improve progress display logic
+
+
+## [1.3.57] - 2025-02-22
+### Changed
+- update webpages for version v1.3.57
+- update header title to 'Filament Management Tool' in multiple HTML files
+
+
+## [1.3.56] - 2025-02-22
+### Changed
+- update webpages for version v1.3.56
+- update header title and improve SPIFFS update error handling
+- clarify comments in Gitea and GitHub release workflows
+
+
+## [1.3.55] - 2025-02-22
+### Changed
+- update webpages for version v1.3.55
+- update component descriptions in README files
+
+
+## [1.3.54] - 2025-02-22
+### Changed
+- update webpages for version v1.3.54
+- workflow: update SPIFFS binary creation to exclude header
+
+
+## [1.3.53] - 2025-02-22
+### Changed
+- version: update to version 1.3.53
+- update changelog for version 1.3.51
+- update changelog for version 1.3.51
+- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
+
+
+## [1.3.52] - 2025-02-22
+### Changed
+- update webpages for version v1.3.52
+- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
+
+
+## [1.3.51] - 2025-02-22
+### Changed
+- update changelog for version 1.3.51
+- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
+
+## [1.3.50] - 2025-02-22
+### Changed
+- update webpages for version v1.3.50
+
+
+## [1.3.49] - 2025-02-22
+### Changed
+- update webpages for version v1.3.49
+- workflow: update SPIFFS binary header to use correct chip revision
+
+
+## [1.3.48] - 2025-02-22
+### Changed
+- update webpages for version v1.3.48
+- workflow: update SPIFFS binary header for firmware release
+
+
+## [1.3.47] - 2025-02-22
+### Changed
+- update webpages for version v1.3.47
+- workflow: optimize firmware and SPIFFS update process, improve progress handling and logging
+
+
+## [1.3.46] - 2025-02-22
+### Changed
+- update webpages for version v1.3.46
+
+
+## [1.3.45] - 2025-02-22
+### Changed
+- update webpages for version v1.3.45
+- workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic
+
+
+## [1.3.44] - 2025-02-22
+### Changed
+- update webpages for version v1.3.44
+- update header title to 'Hollo Lollo Trollo'
+- update header title to 'Filament Management Tool' and improve update response messages
+
+
 ## [1.3.43] - 2025-02-22
 ### Changed
 - update webpages for version v1.3.43

README.de.md

@@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 ### 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)
+- **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
+[Amazon Link](https://amzn.eu/d/06A0DLb)
+- **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
+- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
+- **NFC Tags Ntag215:** RFID Tag
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 ### Pin-Konfiguration
 | Komponente        | ESP32 Pin |
@@ -71,10 +71,15 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 | OLED SCL          | 22        |
 | PN532 IRQ         | 32        |
 | PN532 RESET       | 33        |
-| PN532 SCK         | 14        |
-| PN532 MOSI        | 13        |
-| PN532 MISO        | 12        |
-| PN532 CS/SS       | 15        |
+| PN532 SDA         | 21        |
+| PN532 SCL         | 22        |
+
+**Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind**
+
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)
 
 ## Software-Abhängigkeiten
 
@@ -101,7 +106,20 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
   - PN532 NFC Modul
   - Verbindungskabel
 
-### Schritt-für-Schritt Installation
+## Schritt-für-Schritt Installation
+### Einfache Installation
+1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**
+
+2. **Stecke dein ESP an den Rechner und klicke Connect**
+
+3. **Wähle dein Device Port und klicke Intall**
+
+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.
+
+### Compile by yourself
 1. **Repository klonen:**
     ```bash
     git clone https://github.com/ManuelW77/Filaman.git

README.md

@@ -56,14 +56,14 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 ### Components
 - **ESP32 Development Board:** Any ESP32 variant.
 [Amazon Link](https://amzn.eu/d/aXThslf)
-- **HX711 Load Cell Amplifier:** For weight measurement.
-[Amazon Link](https://amzn.eu/d/1wZ4v0x)
-- **OLED Display:** 128x64 SSD1306.
-[Amazon Link](https://amzn.eu/d/dozAYDU)
-- **PN532 NFC Module:** For NFC tag operations.
-[Amazon Link](https://amzn.eu/d/8205DDh)
-- **NFC-Tag:** NTAG215
-[Amazon Link](https://amzn.eu/d/fywy4c4)
+- **HX711 5kg Load Cell Amplifier:** For weight measurement.
+[Amazon Link](https://amzn.eu/d/06A0DLb)
+- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
+- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
+- **NFC Tags Ntag215:** RFID Tag
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 
 ### Pin Configuration
@@ -75,10 +75,15 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 | OLED SCL          | 22        |
 | PN532 IRQ         | 32        |
 | PN532 RESET       | 33        |
-| PN532 SCK  	    | 14        |
-| PN532 MOSI    	| 13        |
-| PN532 MISO       	| 12        |
-| PN532 CS/SS       | 15        |
+| PN532 SDA         | 21        |
+| PN532 SCL         | 22        |
+
+**Make sure that the DIP switches on the PN532 are set to I2C**
+
+![Wiring](./img/Schaltplan.png)
+
+![myWiring](./img/IMG_2589.jpeg)
+![myWiring](./img/IMG_2590.jpeg)
 
 ## Software Dependencies
 
@@ -91,9 +96,9 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 - `Adafruit_SSD1306`: OLED display control
 - `HX711`: Load cell communication
 
-## Installation
+### Installation
 
-### Prerequisites
+## Prerequisites
 - **Software:**
   - [PlatformIO](https://platformio.org/) in VS Code
   - [Spoolman](https://github.com/Donkie/Spoolman) instance
@@ -105,7 +110,20 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
   - PN532 NFC Module
   - Connecting wires
 
-### Step-by-Step Installation
+## Step-by-Step Installation
+### Easy Installation
+1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
+
+2. **Plug you device in and push Connect button**
+
+3. **Select your Device Port and push Intall**
+
+4. **Initial Setup:**
+    - Connect to the "FilaMan" WiFi access point.
+    - Configure WiFi settings through the captive portal.
+    - Access the web interface at `http://filaman.local` or the IP address.
+
+### Compile by yourself
 1. **Clone the Repository:**
     ```bash
     git clone https://github.com/ManuelW77/Filaman.git
@@ -124,25 +142,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
     - Configure WiFi settings through the captive portal.
     - Access the web interface at `http://filaman.local` or the IP address.
 
-## GitHub Actions Configuration
-
-### Required Secrets for Gitea Releases
-
-When using Gitea as your repository host, you need to configure the following secrets in your repository:
-
-- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
-- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
-- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
-
-Example values:
-```
-GITEA_API_URL=https://git.example.com
-GITEA_TOKEN=abcdef1234567890
-GITEA_REPOSITORY=username/filaman
-```
-
-Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.
-
 ## Documentation
 
 ### Relevant Links

html/bambu_filaments.json

@@ -1,7 +1,31 @@
 {
-    "GFU99": "Generic TPU",
-    "GFN99": "Generic PA",
-    "GFN98": "Generic PA-CF",
+    "GFU99": "TPU",
+    "GFN99": "PA",
+    "GFN98": "PA-CF",
+    "GFL99": "PLA",
+    "GFL96": "PLA Silk",
+    "GFL98": "PLA-CF",
+    "GFL95": "PLA High Speed",
+    "GFG99": "PETG",
+    "GFG98": "PETG-CF",
+    "GFG97": "PCTG",
+    "GFB99": "ABS",
+    "GFC99": "PC",
+    "GFB98": "ASA",
+    "GFS99": "PVA",
+    "GFS98": "HIPS",
+    "GFT98": "PPS-CF",
+    "GFT97": "PPS",
+    "GFN97": "PPA-CF",
+    "GFN96": "PPA-GF",
+    "GFP99": "PE",
+    "GFP98": "PE-CF",
+    "GFP97": "PP",
+    "GFP96": "PP-CF",
+    "GFP95": "PP-GF",
+    "GFR99": "EVA",
+    "GFR98": "PHA",
+    "GFS97": "BVOH",
     "GFA01": "Bambu PLA Matte",
     "GFA00": "Bambu PLA Basic",
     "GFA09": "Bambu PLA Tough",
@@ -13,15 +37,11 @@
     "GFL03": "eSUN PLA+",
     "GFL01": "PolyTerra PLA",
     "GFL00": "PolyLite PLA",
-    "GFL99": "Generic PLA",
-    "GFL96": "Generic PLA Silk",
-    "GFL98": "Generic PLA-CF",
     "GFA50": "Bambu PLA-CF",
     "GFS02": "Bambu Support For PLA",
     "GFA11": "Bambu PLA Aero",
     "GFL04": "Overture PLA",
     "GFL05": "Overture Matte PLA",
-    "GFL95": "Generic PLA High Speed",
     "GFA12": "Bambu PLA Glow",
     "GFA13": "Bambu PLA Dynamic",
     "GFA15": "Bambu PLA Galaxy",
@@ -30,41 +50,21 @@
     "GFU00": "Bambu TPU 95A HF",
     "GFG00": "Bambu PETG Basic",
     "GFT01": "Bambu PET-CF",
-    "GFG99": "Generic PETG",
-    "GFG98": "Generic PETG-CF",
     "GFG50": "Bambu PETG-CF",
     "GFG60": "PolyLite PETG",
     "GFG01": "Bambu PETG Translucent",
-    "GFG97": "Generic PCTG",
     "GFB00": "Bambu ABS",
-    "GFB99": "Generic ABS",
     "GFB60": "PolyLite ABS",
     "GFB50": "Bambu ABS-GF",
     "GFC00": "Bambu PC",
-    "GFC99": "Generic PC",
-    "GFB98": "Generic ASA",
     "GFB01": "Bambu ASA",
     "GFB61": "PolyLite ASA",
     "GFB02": "Bambu ASA-Aero",
-    "GFS99": "Generic PVA",
     "GFS04": "Bambu PVA",
     "GFS01": "Bambu Support G",
     "GFN03": "Bambu PA-CF",
     "GFN04": "Bambu PAHT-CF",
     "GFS03": "Bambu Support For PA/PET",
     "GFN05": "Bambu PA6-CF",
-    "GFN08": "Bambu PA6-GF",
-    "GFS98": "Generic HIPS",
-    "GFT98": "Generic PPS-CF",
-    "GFT97": "Generic PPS",
-    "GFN97": "Generic PPA-CF",
-    "GFN96": "Generic PPA-GF",
-    "GFP99": "Generic PE",
-    "GFP98": "Generic PE-CF",
-    "GFP97": "Generic PP",
-    "GFP96": "Generic PP-CF",
-    "GFP95": "Generic PP-GF",
-    "GFR99": "Generic EVA",
-    "GFR98": "Generic PHA",
-    "GFS97": "Generic BVOH"
+    "GFN08": "Bambu PA6-GF"
 }

html/header.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Hollo Lollo Trollo</h4>
+                <h4>Filament Management Tool</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">
@@ -44,6 +44,4 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 

html/index.html

@@ -44,12 +44,10 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
 
-    <div class="container">
+    <div class="content">
         <h1>FilaMan</h1>
         <p>Filament Management Tool</p>
         <p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p>
@@ -57,10 +55,11 @@
         <h2>About FilaMan</h2>
         <p>
             FilaMan is a tool designed to simplify filament spool management. It allows you to identify and weigh filament spools, 
-            automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform, 
-            and ensure compatibility with <a href="https://github.com/spuder/OpenSpool" target="_blank">OpenSpool</a> for Bambu printers.
+            automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform.
         </p>
 
+        <p>Get more information at <a href="https://www.filaman.app" target="_blank">https://www.filaman.app</a> and <a href="https://github.com/ManuelW77/Filaman" target="_blank">https://github.com/ManuelW77/Filaman</a>.</p>
+
         <div class="features">
             <div class="feature">
                 <h3>Spool Identification</h3>
@@ -75,12 +74,6 @@
                 <p>Works with OpenSpool to recognize and activate spools on Bambu printers.</p>
             </div>
         </div>
-
-        <h2>Future Plans</h2>
-        <p>
-            We are working on expanding compatibility to support smaller NFC tags like NTag213 
-            and developing custom software to enhance the OpenSpool experience.
-        </p>
     </div>
 </body>
 </html>

html/rfid.html

@@ -44,8 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
 

html/spoolman.html

@@ -44,8 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
 
@@ -97,27 +95,36 @@
     
     <div class="content">
         <h1>Spoolman API URL / Bambu Credentials</h1>
-        <label for="spoolmanUrl">Set URL/IP to your Spoolman-Instanz:</label>
-        <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
-        <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
-        <p id="statusMessage"></p>
 
-        <h2>Bambu Lab Printer Credentials</h2>
-        <div class="bambu-settings">
-            <div class="input-group">
-                <label for="bambuIp">Bambu Drucker IP-Adresse:</label>
-                <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}">
+        <div class="card">
+            <div class="card-body">
+                <h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5>
+                <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
+                <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
+                <p id="statusMessage"></p>
             </div>
-            <div class="input-group">
-                <label for="bambuSerial">Drucker Seriennummer:</label>
-                <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}">
+        </div>
+
+        <div class="card">
+            <div class="card-body">
+                <h5 class="card-title">Bambu Lab Printer Credentials</h5>
+                <div class="bambu-settings">
+                    <div class="input-group">
+                        <label for="bambuIp">Bambu Drucker IP-Adresse:</label>
+                        <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}">
+                    </div>
+                    <div class="input-group">
+                        <label for="bambuSerial">Drucker Seriennummer:</label>
+                        <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}">
+                    </div>
+                    <div class="input-group">
+                        <label for="bambuCode">Access Code:</label>
+                        <input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}">
+                    </div>
+                    <button onclick="saveBambuCredentials()">Save Bambu Credentials</button>
+                    <p id="bambuStatusMessage"></p>
+                </div>
             </div>
-            <div class="input-group">
-                <label for="bambuCode">Access Code:</label>
-                <input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}">
-            </div>
-            <button onclick="saveBambuCredentials()">Save Bambu Credentials</button>
-            <p id="bambuStatusMessage"></p>
         </div>
     </div>
 </body>

html/style.css

@@ -279,9 +279,10 @@ a:hover {
 
 /* Karten-Stil für optische Trennung */
 .card {
-    background: #f9f9f9;
+    background: var(--primary-color);
+    width: 500px;
     padding: 15px;
-    margin: 20px 0;
+    margin: 20px auto;
     border-radius: 8px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
@@ -959,7 +960,6 @@ input[type="submit"]:disabled,
 
 /* Bambu Settings Erweiterung */
 .bambu-settings {
-    background: white;
     padding: 20px;
     border-radius: 8px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
@@ -1051,9 +1051,10 @@ input[type="submit"]:disabled,
 }
 .update-form {
     background: var(--primary-color);
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
+    border: var(--glass-border);
     padding: 20px;
     border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
     margin: 0 auto;
     width: 400px;
     text-align: center;
@@ -1064,7 +1065,7 @@ input[type="submit"]:disabled,
     padding: 8px;
     border: 1px solid #ddd;
     border-radius: 4px;
-    background: white;
+    background-color: #4CAF50;
 }
 .update-form input[type="submit"] {
     background-color: #4CAF50;
@@ -1086,10 +1087,66 @@ input[type="submit"]:disabled,
 .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;
+    color: #e65100;
+    padding: 15px;
+}
+
+.update-options {
+    display: flex;
+    gap: 2rem;
+    margin: 2rem 0;
+}
+.update-section {
+    flex: 1;
+    background: var(--background-green);
+    padding: 1.5rem;
+    border-radius: 8px;
+}
+.update-section h2 {
+    margin-top: 0;
+    color: #333;
+}
+.update-section p {
+    color: #666;
+    margin-bottom: 1rem;
+}
+.progress-container {
+    margin: 20px 0;
+    background: #f0f0f0;
+    border-radius: 4px;
+    overflow: hidden;
+}
+.progress-bar {
+    width: 0;
+    height: 20px;
+    background: #4CAF50;
+    transition: width 0.3s ease-in-out;
+    text-align: center;
+    line-height: 20px;
+    color: white;
+}
+.status {
+    margin-top: 20px;
+    padding: 10px;
+    border-radius: 4px;
+    display: none;
+}
+.status.success {
+    background: #e8f5e9;
+    color: #2e7d32;
+}
+.status.error {
+    background: #ffebee;
+    color: #c62828;
+}
+.warning {
+    background: #fff3e0;
+    color: #e65100;
+    padding: 15px;
+    border-radius: 4px;
+    margin-bottom: 20px;
 }

html/upgrade.html

@@ -44,8 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
     
@@ -86,64 +84,6 @@
         <div class="status"></div>
     </div>
 
-    <style>
-        .update-options {
-            display: flex;
-            gap: 2rem;
-            margin: 2rem 0;
-        }
-        .update-section {
-            flex: 1;
-            background: #f5f5f5;
-            padding: 1.5rem;
-            border-radius: 8px;
-        }
-        .update-section h2 {
-            margin-top: 0;
-            color: #333;
-        }
-        .update-section p {
-            color: #666;
-            margin-bottom: 1rem;
-        }
-        .progress-container {
-            margin: 20px 0;
-            background: #f0f0f0;
-            border-radius: 4px;
-            overflow: hidden;
-        }
-        .progress-bar {
-            width: 0;
-            height: 20px;
-            background: #4CAF50;
-            transition: width 0.3s ease-in-out;
-            text-align: center;
-            line-height: 20px;
-            color: white;
-        }
-        .status {
-            margin-top: 20px;
-            padding: 10px;
-            border-radius: 4px;
-            display: none;
-        }
-        .status.success {
-            background: #e8f5e9;
-            color: #2e7d32;
-        }
-        .status.error {
-            background: #ffebee;
-            color: #c62828;
-        }
-        .warning {
-            background: #fff3e0;
-            color: #e65100;
-            padding: 15px;
-            border-radius: 4px;
-            margin-bottom: 20px;
-        }
-    </style>
-
     <script>
         // Hide status indicators during update
         const statusContainer = document.querySelector('.status-container');
@@ -154,18 +94,108 @@
         const progress = document.querySelector('.progress-bar');
         const progressContainer = document.querySelector('.progress-container');
         const status = document.querySelector('.status');
+        let updateInProgress = false;
+        let lastReceivedProgress = 0;
+
+        // WebSocket Handling
+        let ws = null;
+        let wsReconnectTimer = null;
+
+        function connectWebSocket() {
+            ws = new WebSocket('ws://' + window.location.host + '/ws');
+            
+            ws.onmessage = function(event) {
+                try {
+                    const data = JSON.parse(event.data);
+                    if (data.type === "updateProgress" && updateInProgress) {
+                        // Zeige Fortschrittsbalken
+                        progressContainer.style.display = 'block';
+                        
+                        // Aktualisiere den Fortschritt nur wenn er größer ist
+                        const newProgress = parseInt(data.progress);
+                        if (!isNaN(newProgress) && newProgress >= lastReceivedProgress) {
+                            progress.style.width = newProgress + '%';
+                            progress.textContent = newProgress + '%';
+                            lastReceivedProgress = newProgress;
+                        }
+                        
+                        // Zeige Status-Nachricht
+                        if (data.message || data.status) {
+                            status.textContent = data.message || getStatusMessage(data.status);
+                            status.className = 'status success';
+                            status.style.display = 'block';
+                            
+                            // Starte Reload wenn Update erfolgreich
+                            if (data.status === 'success' || lastReceivedProgress >= 98) {
+                                clearTimeout(wsReconnectTimer);
+                                setTimeout(() => {
+                                    window.location.href = '/';
+                                }, 30000);
+                            }
+                        }
+                    }
+                } catch (e) {
+                    console.error('WebSocket message error:', e);
+                }
+            };
+
+            ws.onclose = function() {
+                if (updateInProgress) {
+                    // Wenn der Fortschritt hoch genug ist, gehen wir von einem erfolgreichen Update aus
+                    if (lastReceivedProgress >= 85) {
+                        status.textContent = "Update appears successful! Device is restarting... Page will reload in 30 seconds.";
+                        status.className = 'status success';
+                        status.style.display = 'block';
+                        clearTimeout(wsReconnectTimer);
+                        setTimeout(() => {
+                            window.location.href = '/';
+                        }, 30000);
+                    } else {
+                        // Versuche Reconnect bei niedrigem Fortschritt
+                        wsReconnectTimer = setTimeout(connectWebSocket, 1000);
+                    }
+                }
+            };
+
+            ws.onerror = function(err) {
+                console.error('WebSocket error:', err);
+                if (updateInProgress && lastReceivedProgress >= 85) {
+                    status.textContent = "Update appears successful! Device is restarting... Page will reload in 30 seconds.";
+                    status.className = 'status success';
+                    status.style.display = 'block';
+                    setTimeout(() => {
+                        window.location.href = '/';
+                    }, 30000);
+                }
+            };
+        }
+
+        // Initial WebSocket connection
+        connectWebSocket();
+
+        function getStatusMessage(status) {
+            switch(status) {
+                case 'starting': return 'Starting update...';
+                case 'uploading': return 'Uploading...';
+                case 'finalizing': return 'Finalizing update...';
+                case 'restoring': return 'Restoring configurations...';
+                case 'preparing': return 'Preparing for restart...';
+                case 'success': return 'Update successful! Device is restarting... Page will reload in 30 seconds.';
+                default: return 'Updating...';
+            }
+        }
 
         function handleUpdate(e) {
             e.preventDefault();
             const form = e.target;
             const file = form.update.files[0];
             const updateType = form.dataset.type;
-
+            
             if (!file) {
                 alert('Please select a file.');
                 return;
             }
-
+            
             // Validate file name pattern
             if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) {
                 alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)');
@@ -176,83 +206,39 @@
                 return;
             }
             
+            // Reset UI
+            updateInProgress = true;
             progressContainer.style.display = 'block';
             status.style.display = 'none';
             status.className = 'status';
-
-            // Reset progress bar
             progress.style.width = '0%';
             progress.textContent = '0%';
-
-            // Disable both forms during update
+            
+            // Disable submit buttons
             document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = true);
 
+            // Send update
             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);
-                        
-                        // Handle progress updates
-                        if (jsonResponse.progress !== undefined) {
-                            const percent = jsonResponse.progress;
-                            progress.style.width = percent + '%';
-                            progress.textContent = Math.round(percent) + '%';
-                            return;
-                        }
-                        
-                        // Handle success/error messages
-                        response = jsonResponse.message;
-                        
-                        if (jsonResponse.restart) {
-                            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) {
-                        console.error('JSON parse error:', e);
-                        status.textContent = 'Update failed: Invalid response from server';
-                        status.classList.add('error');
-                    }
-                    
-                    status.textContent = response;
-                    status.classList.add(xhr.status === 200 ? 'success' : 'error');
-                    status.style.display = 'block';
-                    
-                    if (xhr.status !== 200) {
-                        document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
-                    }
-                } catch (error) {
-                    status.textContent = 'Error: ' + error.message;
-                    status.classList.add('error');
+                if (xhr.status !== 200 && !progress.textContent.startsWith('100')) {
+                    status.textContent = "Update failed: " + (xhr.responseText || "Unknown error");
+                    status.className = 'status error';
                     status.style.display = 'block';
+                    updateInProgress = false;
                     document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                 }
             };
-
+            
             xhr.onerror = function() {
-                status.textContent = 'Update failed: Network error';
-                status.classList.add('error');
-                status.style.display = 'block';
-                document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                if (!progress.textContent.startsWith('100')) {
+                    status.textContent = "Network error during update";
+                    status.className = 'status error';
+                    status.style.display = 'block';
+                    updateInProgress = false;
+                    document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                }
             };
 
             const formData = new FormData();

html/waage.html

@@ -44,8 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
 

html/wifi.html

@@ -44,8 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
-</body>
-</html>
 
 <!-- head -->
 

platformio.ini

@@ -9,10 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.43"
-
-#test
-
+version = "1.3.92"
+##
 [env:esp32dev]
 platform = espressif32
 board = esp32dev

scripts/update_changelog.py

@@ -64,29 +64,10 @@ def get_changes_from_git():
     
     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
+    print("Starting changelog update...")
     version = get_version()
-    print(f"Current version: {version}")   # Add this line
+    print(f"Current version: {version}")
     today = datetime.now().strftime('%Y-%m-%d')
     
     script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -111,7 +92,7 @@ def update_changelog():
     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)
+        print(f"Created new changelog file with version {version}")
     else:
         with open(changelog_path, 'r') as f:
             content = f.read()
@@ -120,7 +101,7 @@ def update_changelog():
             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)
+            print(f"Added new version {version} to changelog")
         else:
             # Version existiert bereits, aktualisiere die bestehenden Einträge
             version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
@@ -143,7 +124,6 @@ def update_changelog():
                 
                 with open(changelog_path, 'w') as f:
                     f.write(updated_content)
-                push_changes(version)
                 print(f"Updated entries for version {version}")
 
 if __name__ == "__main__":

src/bambu.cpp

@@ -81,19 +81,23 @@ bool loadBambuCredentials() {
     return false;
 }
 
-String findFilamentIdx(String brand, String type) {
+struct FilamentResult {
+    String key;
+    String type;
+};
+
+FilamentResult findFilamentIdx(String brand, String type) {
     // JSON-Dokument für die Filament-Daten erstellen
     JsonDocument doc;
     
     // Laden der bambu_filaments.json
     if (!loadJsonValue("/bambu_filaments.json", doc)) {
         Serial.println("Fehler beim Laden der Filament-Daten");
-        return "GFL99"; // Fallback auf Generic PLA
+        return {"GFL99", "PLA"}; // Fallback auf Generic PLA
     }
 
+    // 1. Erst versuchen wir die exakte Brand + Type Kombination zu finden
     String searchKey;
-    
-    // 1. Suche nach Brand + Type Kombination
     if (brand == "Bambu" || brand == "Bambulab") {
         searchKey = "Bambu " + type;
     } else if (brand == "PolyLite") {
@@ -109,20 +113,43 @@ String findFilamentIdx(String brand, String type) {
     // Durchsuche alle Einträge nach der Brand + Type Kombination
     for (JsonPair kv : doc.as<JsonObject>()) {
         if (kv.value().as<String>() == searchKey) {
-            return kv.key().c_str();
+            return {kv.key().c_str(), kv.value().as<String>()};
         }
     }
 
-    // 2. Wenn nicht gefunden, suche nach Generic + Type
-    searchKey = "Generic " + type;
+    // 2. Wenn nicht gefunden, zerlege den type String in Wörter und suche nach jedem Wort
+    // Sammle alle vorhandenen Filamenttypen aus der JSON
+    std::vector<String> knownTypes;
     for (JsonPair kv : doc.as<JsonObject>()) {
-        if (kv.value().as<String>() == searchKey) {
-            return kv.key().c_str();
+        String value = kv.value().as<String>();
+        // Extrahiere den Typ ohne Markennamen
+        if (value.indexOf(" ") != -1) {
+            value = value.substring(value.indexOf(" ") + 1);
+        }
+        if (!value.isEmpty()) {
+            knownTypes.push_back(value);
+        }
+    }
+
+    // Zerlege den Input-Type in Wörter
+    String typeStr = type;
+    typeStr.trim();
+    
+    // Durchsuche für jedes bekannte Filament, ob es im Input vorkommt
+    for (const String& knownType : knownTypes) {
+        if (typeStr.indexOf(knownType) != -1) {
+            // Suche nach diesem Typ in der Original-JSON
+            for (JsonPair kv : doc.as<JsonObject>()) {
+                String value = kv.value().as<String>();
+                if (value.indexOf(knownType) != -1) {
+                    return {kv.key().c_str(), knownType};
+                }
+            }
         }
     }
 
     // 3. Wenn immer noch nichts gefunden, gebe GFL99 zurück (Generic PLA)
-    return "GFL99";
+    return {"GFL99", "PLA"};
 }
 
 bool sendMqttMessage(String payload) {
@@ -156,15 +183,22 @@ bool setBambuSpool(String payload) {
     int minTemp = doc["nozzle_temp_min"];
     int maxTemp = doc["nozzle_temp_max"];
     String type = doc["type"].as<String>();
+    (type == "PLA+") ? type = "PLA" : type;
     String brand = doc["brand"].as<String>();
     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) : "";
+    if (tray_info_idx == "") {
+        if (brand != "" && type != "") {
+            FilamentResult result = findFilamentIdx(brand, type);
+            tray_info_idx = result.key;
+            type = result.type;  // Aktualisiere den type mit dem gefundenen Basistyp
+        }
+    }
     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"]["sequence_id"] = "0";
     doc["print"]["command"] = "ams_filament_setting";
     doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
     doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
@@ -172,10 +206,10 @@ bool setBambuSpool(String payload) {
     doc["print"]["nozzle_temp_min"] = minTemp;
     doc["print"]["nozzle_temp_max"] = maxTemp;
     doc["print"]["tray_type"] = type;
-    doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
+    //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);
@@ -194,13 +228,13 @@ bool setBambuSpool(String payload) {
 
     if (cali_idx != "") {
         yield();
-        doc["print"]["sequence_id"] = 0;
+        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;
+        //doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
 
         // Serialize the JSON
         String output;
@@ -218,37 +252,6 @@ bool setBambuSpool(String payload) {
         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;
 }
@@ -256,6 +259,7 @@ bool setBambuSpool(String payload) {
 // init
 void mqtt_callback(char* topic, byte* payload, unsigned int length) {
     String message;
+
     for (int i = 0; i < length; i++) {
         message += (char)payload[i];
     }
@@ -270,9 +274,9 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
     }
 
     // Prüfen, ob "print->upgrade_state" und "print.ams.ams" existieren
-    if (doc["print"]["upgrade_state"].is<String>()) {
+    if (doc["print"]["upgrade_state"].is<JsonObject>()) {
         // Prüfen ob AMS-Daten vorhanden sind
-        if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) {
+        if (!doc["print"]["ams"].is<JsonObject>() || !doc["print"]["ams"]["ams"].is<JsonArray>()) {
             return;
         }
 
@@ -315,7 +319,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
         }
 
         // Prüfe die externe Spule
-        if (!hasChanges && doc["print"]["vt_tray"].is<String>()) {
+        if (!hasChanges && doc["print"]["vt_tray"].is<JsonObject>()) {
             JsonObject vtTray = doc["print"]["vt_tray"];
             bool foundExternal = false;
             
@@ -363,7 +367,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
         ams_count = amsArray.size();
 
         // Wenn externe Spule vorhanden, füge sie hinzu
-        if (doc["print"]["vt_tray"].is<String>()) {
+        if (doc["print"]["vt_tray"].is<JsonObject>()) {
             JsonObject vtTray = doc["print"]["vt_tray"];
             int extIdx = ams_count;  // Index für externe Spule
             ams_data[extIdx].ams_id = 255;  // Spezielle ID für externe Spule
@@ -374,8 +378,12 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
             ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>();
             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>();
+
+            if (doc["print"]["vt_tray"]["tray_type"].as<String>() != "")
+            {
+                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
         }
 
@@ -415,7 +423,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
         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) {

src/main.cpp

@@ -58,7 +58,22 @@ void setup() {
   
   startNfc();
 
-  start_scale();
+  uint8_t scaleCalibrated = start_scale();
+  if (scaleCalibrated == 3) {
+    oledShowMessage("Scale not calibrated!");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  } else if (scaleCalibrated == 0) {
+    oledShowMessage("HX711 not found");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  }
   
   // WDT initialisieren mit 10 Sekunden Timeout
   bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
@@ -84,33 +99,33 @@ uint8_t wifiErrorCounter = 0;
 
 // ##### PROGRAM START #####
 void loop() {
-
-  /*
-  // Überprüfe den WLAN-Status
-  if (WiFi.status() != WL_CONNECTED) {
-    wifiErrorCounter++;
-    wifiOn = false;
-  } else {
-    wifiErrorCounter = 0;
-    wifiOn = true;
-  }
-  if (wifiErrorCounter > 20) ESP.restart();
-  */
- 
   unsigned long currentMillis = millis();
 
   // Send AMS Data min every Minute
-  if (currentMillis - lastAmsSendTime >= amsSendInterval) {
+  if (currentMillis - lastAmsSendTime >= amsSendInterval) 
+  {
     lastAmsSendTime = currentMillis;
     sendAmsData(nullptr);
   }
 
+  // Wenn Waage nicht Kalibriert
+  if (scaleCalibrated == 3) 
+  {
+    oledShowMessage("Scale not calibrated!");
+    vTaskDelay(5000 / portTICK_PERIOD_MS);
+    yield();
+    esp_task_wdt_reset();
+    
+    return;
+  } 
+
   // Ausgabe der Waage auf Display
   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
   {
-    (weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight);
+    (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
   }
 
+
   // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
   if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag < 3)
   {

src/scale.cpp

@@ -16,6 +16,7 @@ int16_t weight = 0;
 uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 uint8_t pauseMainTask = 0;
+uint8_t scaleCalibrated = 1;
 
 Preferences preferences;
 const char* NVS_NAMESPACE = "scale";
@@ -50,11 +51,11 @@ void scale_loop(void * parameter) {
   }
 }
 
-void start_scale() {
+uint8_t start_scale() {
   Serial.println("Prüfe Calibration Value");
   long calibrationValue;
 
-  // NVS
+  // NVS lesen
   preferences.begin(NVS_NAMESPACE, true); // true = readonly
   calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
   preferences.end();
@@ -64,7 +65,10 @@ void start_scale() {
 
   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
 
-  if (isnan(calibrationValue) || calibrationValue < 1) calibrationValue = defaultScaleCalibrationValue;
+  if (isnan(calibrationValue) || calibrationValue < 1) {
+    calibrationValue = defaultScaleCalibrationValue;
+    scaleCalibrated = 0;
+  }
 
   oledShowMessage("Scale Tare Please remove all");
   for (uint16_t i = 0; i < 2000; i++) {
@@ -97,6 +101,8 @@ void start_scale() {
   } else {
       Serial.println("ScaleLoop-Task erfolgreich erstellt");
   }
+
+  return (scaleCalibrated == 1) ? 1 : 3;
 }
 
 uint8_t calibrate_scale() {

src/scale.h

@@ -5,7 +5,7 @@
 #include "HX711.h"
 
 
-void start_scale();
+uint8_t start_scale();
 uint8_t calibrate_scale();
 uint8_t tareScale();
 
@@ -14,6 +14,7 @@ extern int16_t weight;
 extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;
+extern uint8_t scaleCalibrated;
 
 extern TaskHandle_t ScaleTask;
 

src/website.cpp

@@ -23,6 +23,49 @@ AsyncWebSocket ws("/ws");
 uint8_t lastSuccess = 0;
 uint8_t lastHasReadRfidTag = 0;
 
+// Globale Variablen für Config Backups hinzufügen
+String bambuCredentialsBackup;
+String spoolmanUrlBackup;
+
+// Globale Variable für den Update-Typ
+static int currentUpdateCommand = 0;
+
+// Globale Update-Variablen
+static size_t updateTotalSize = 0;
+static size_t updateWritten = 0;
+static bool isSpiffsUpdate = false;
+
+void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
+    static int lastSentProgress = -1;
+    
+    // Verhindere zu häufige Updates
+    if (progress == lastSentProgress && !status && !message) {
+        return;
+    }
+    
+    String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
+    if (status) {
+        progressMsg += ",\"status\":\"" + String(status) + "\"";
+    }
+    if (message) {
+        progressMsg += ",\"message\":\"" + String(message) + "\"";
+    }
+    progressMsg += "}";
+    
+    // Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates
+    if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
+        for (int i = 0; i < 2; i++) {
+            ws.textAll(progressMsg);
+            delay(100);  // Längerer Delay zwischen Nachrichten
+        }
+    } else {
+        ws.textAll(progressMsg);
+        delay(50);
+    }
+    
+    lastSentProgress = progress;
+}
+
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
     if (type == WS_EVT_CONNECT) {
         Serial.println("Neuer Client verbunden!");
@@ -164,7 +207,109 @@ void sendAmsData(AsyncWebSocketClient *client) {
     }
 }
 
+void handleUpdate(AsyncWebServer &server) {
+    AsyncCallbackWebHandler* updateHandler = new AsyncCallbackWebHandler();
+    updateHandler->setUri("/update");
+    updateHandler->setMethod(HTTP_POST);
+    
+    updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
+                             size_t index, uint8_t *data, size_t len, bool final) {
+        if (!index) {
+            updateTotalSize = request->contentLength();
+            updateWritten = 0;
+            isSpiffsUpdate = (filename.indexOf("website") > -1);
+            
+            if (isSpiffsUpdate) {
+                // Backup vor dem Update
+                sendUpdateProgress(0, "backup", "Backing up configurations...");
+                delay(200);
+                backupJsonConfigs();
+                delay(200);
+                
+                const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
+                if (!partition || !Update.begin(partition->size, U_SPIFFS)) {
+                    request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
+                    return;
+                }
+                sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
+                delay(200);
+            } else {
+                if (!Update.begin(updateTotalSize)) {
+                    request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
+                    return;
+                }
+                sendUpdateProgress(0, "starting", "Starting firmware update...");
+                delay(200);
+            }
+        }
+
+        if (len) {
+            if (Update.write(data, len) != len) {
+                request->send(400, "application/json", "{\"success\":false,\"message\":\"Write failed\"}");
+                return;
+            }
+            
+            updateWritten += len;
+            int currentProgress;
+            
+            // Berechne den Fortschritt basierend auf dem Update-Typ
+            if (isSpiffsUpdate) {
+                // SPIFFS: 5-75% für Upload
+                currentProgress = 5 + (updateWritten * 100) / updateTotalSize;
+            } else {
+                // Firmware: 0-100% für Upload
+                currentProgress = 1 + (updateWritten * 100) / updateTotalSize;
+            }
+            
+            static int lastProgress = -1;
+            if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
+                sendUpdateProgress(currentProgress, "uploading");
+                oledShowMessage("Update: " + String(currentProgress) + "%");
+                delay(50);
+                lastProgress = currentProgress;
+            }
+        }
+
+        if (final) {
+            if (Update.end(true)) {
+                if (isSpiffsUpdate) {
+                    restoreJsonConfigs();
+                }
+            } else {
+                request->send(400, "application/json", "{\"success\":false,\"message\":\"Update finalization failed\"}");
+            }
+        }
+    });
+
+    updateHandler->onRequest([](AsyncWebServerRequest *request) {
+        if (Update.hasError()) {
+            request->send(400, "application/json", "{\"success\":false,\"message\":\"Update failed\"}");
+            return;
+        }
+
+        // Erste 100% Nachricht
+        ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
+        delay(2000);  // Längerer Delay für die erste Nachricht
+        
+        AsyncWebServerResponse *response = request->beginResponse(200, "application/json", 
+            "{\"success\":true,\"message\":\"Update successful! Restarting device...\"}");
+        response->addHeader("Connection", "close");
+        request->send(response);
+        
+        // Zweite 100% Nachricht zur Sicherheit
+        ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
+        delay(3000);  // Noch längerer Delay vor dem Neustart
+        
+        ESP.restart();
+    });
+
+    server.addHandler(updateHandler);
+}
+
 void setupWebserver(AsyncWebServer &server) {
+    // Deaktiviere alle Debug-Ausgaben
+    Serial.setDebugOutput(false);
+    
     // WebSocket-Optimierungen
     ws.onEvent(onWsEvent);
     ws.enable(true);
@@ -239,7 +384,8 @@ void setupWebserver(AsyncWebServer &server) {
         html.replace("{{spoolmanUrl}}", spoolmanUrl);
 
         JsonDocument doc;
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
+        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) 
+        {
             String bambuIp = doc["bambu_ip"].as<String>();
             String bambuSerial = doc["bambu_serialnr"].as<String>();
             String bambuCode = doc["bambu_accesscode"].as<String>();
@@ -250,7 +396,13 @@ void setupWebserver(AsyncWebServer &server) {
             html.replace("{{bambuIp}}", bambuIp ? bambuIp : "");            
             html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
             html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
-        }   
+        }
+        else
+        {
+            html.replace("{{bambuIp}}", "");
+            html.replace("{{bambuSerial}}", "");
+            html.replace("{{bambuCode}}", "");
+        }
 
         request->send(200, "text/html", html);
     });
@@ -363,87 +515,8 @@ void setupWebserver(AsyncWebServer &server) {
         request->send(response);
     });
 
-    // Update-Handler mit verbesserter Fehlerbehandlung
-    server.on("/update", HTTP_POST, 
-        [](AsyncWebServerRequest *request) {
-            // Nach Update-Abschluss
-            bool success = !Update.hasError();
-            AsyncWebServerResponse *response = request->beginResponse(
-                success ? 200 : 400,
-                "application/json",
-                success ? "{\"success\":true,\"message\":\"Update successful\"}" 
-                       : "{\"success\":false,\"message\":\"Update failed\"}"
-            );
-            response->addHeader("Connection", "close");
-            request->send(response);
-            
-            if (success) {
-                oledShowMessage("Upgrade successful Rebooting");
-                delay(500);
-                ESP.restart();
-            }
-            else {
-                oledShowMessage("Upgrade failed");
-            }
-        },
-        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
-            static size_t updateSize = 0;
-            static int command = 0;
-
-            oledShowMessage("Upgrade please wait");
-
-            // TODO: Backup
-
-            if (!index) {
-                updateSize = request->contentLength();
-                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
-                
-                if (command == U_SPIFFS) {
-                    // Backup JSON config files before SPIFFS update
-                    backupJsonConfigs();
-                }
-                
-                // Setze spezifische Update-Flags für SPIFFS-Updates
-                if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) {
-                    if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at start
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Update begin failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-            }
-
-            if (len) {
-                if (Update.write(data, len) != len) {
-                    if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails during write
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Write failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-                
-                // Sende den Fortschritt als JSON, um unerwünschte Zeilenumbrüche zu vermeiden
-                String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
-                request->send(200, "application/json", progress);
-            }
-
-            if (final) {
-                if (!Update.end(true)) {
-                    if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at end
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Update end failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-            }
-        }
-    );
+    // Update-Handler registrieren
+    handleUpdate(server);
 
     server.on("/api/version", HTTP_GET, [](AsyncWebServerRequest *request){
         String fm_version = VERSION;
@@ -470,23 +543,47 @@ void setupWebserver(AsyncWebServer &server) {
 
 
 void backupJsonConfigs() {
-    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
-    for (const char* config : configs) {
-        if (SPIFFS.exists(config)) {
-            String backupPath = String(config) + ".bak";
-            SPIFFS.remove(backupPath);
-            SPIFFS.rename(config, backupPath);
+    // Bambu Credentials backup
+    if (SPIFFS.exists("/bambu_credentials.json")) {
+        File file = SPIFFS.open("/bambu_credentials.json", "r");
+        if (file) {
+            bambuCredentialsBackup = file.readString();
+            file.close();
+            Serial.println("Bambu credentials backed up");
+        }
+    }
+
+    // Spoolman URL backup
+    if (SPIFFS.exists("/spoolman_url.json")) {
+        File file = SPIFFS.open("/spoolman_url.json", "r");
+        if (file) {
+            spoolmanUrlBackup = file.readString();
+            file.close();
+            Serial.println("Spoolman URL backed up");
         }
     }
 }
 
 void restoreJsonConfigs() {
-    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
-    for (const char* config : configs) {
-        String backupPath = String(config) + ".bak";
-        if (SPIFFS.exists(backupPath)) {
-            SPIFFS.remove(config);
-            SPIFFS.rename(backupPath, config);
+    // Restore Bambu credentials
+    if (bambuCredentialsBackup.length() > 0) {
+        File file = SPIFFS.open("/bambu_credentials.json", "w");
+        if (file) {
+            file.print(bambuCredentialsBackup);
+            file.close();
+            Serial.println("Bambu credentials restored");
         }
+        bambuCredentialsBackup = ""; // Clear backup
+    }
+
+    // Restore Spoolman URL
+    if (spoolmanUrlBackup.length() > 0) {
+        File file = SPIFFS.open("/spoolman_url.json", "w");
+        if (file) {
+            file.print(spoolmanUrlBackup);
+            file.close();
+            Serial.println("Spoolman URL restored");
+        }
+        spoolmanUrlBackup = ""; // Clear backup
     }
 }