docs: update changelog and header for version v1.3.91

.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
@@ -66,14 +75,48 @@ jobs:
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       
-    - name: Read CHANGELOG.md
+    - name: Generate Release Notes
-      id: changelog
+      id: release_notes
       run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
+        # Get the latest tag
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
-        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        
-        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        if [ -n "$LATEST_TAG" ]; then
-        echo "EOF" >> $GITHUB_OUTPUT
+          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

@@ -73,14 +73,48 @@ jobs:
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       
-    - name: Read CHANGELOG.md
+    - name: Generate Release Notes
-      id: changelog
+      id: release_notes
       run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
+        # Get the latest tag
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
-        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        
-        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        if [ -n "$LATEST_TAG" ]; then
-        echo "EOF" >> $GITHUB_OUTPUT
+          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,267 @@
 # Changelog
 
+## [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

README.de.md

@@ -76,6 +76,10 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 | PN532 MISO        | 12        |
 | PN532 CS/SS       | 15        |
 
+Ich nutze die HSPI default PINs + IRQ und RESET am PN532
+
+![ESP32](./img/ESP32-SPI-Pins.png)
+
 ## Software-Abhängigkeiten
 
 ### ESP32-Bibliotheken
@@ -102,6 +106,20 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
   - Verbindungskabel
 
 ### Schritt-für-Schritt Installation
+## Einfache Installation
+1. **Gehe auf 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

@@ -80,6 +80,10 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 | PN532 MISO       	| 12        |
 | PN532 CS/SS       | 15        |
 
+I use the HSPI default PINs + IRQ and RESET at the PN532
+
+![ESP32](./img/ESP32-SPI-Pins.png)
+
 ## Software Dependencies
 
 ### ESP32 Libraries
@@ -106,6 +110,19 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
   - Connecting wires
 
 ### Step-by-Step Installation
+## Easy Installation
+1. **Go to 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 +141,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/header.html

@@ -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, 
+            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.
         </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="card">
-        <div class="bambu-settings">
+            <div class="card-body">
-            <div class="input-group">
+                <h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5>
-                <label for="bambuIp">Bambu Drucker IP-Adresse:</label>
+                <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
-                <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}">
+                <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
+                <p id="statusMessage"></p>
             </div>
-            <div class="input-group">
+        </div>
-                <label for="bambuSerial">Drucker Seriennummer:</label>
+
-                <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}">
+        <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');

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.58"
+version = "1.3.91"
-
+##
-#test
-
 [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/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);
   }
 
+
   // 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,7 +51,7 @@ void scale_loop(void * parameter) {
   }
 }
 
-void start_scale() {
+uint8_t start_scale() {
   Serial.println("Prüfe Calibration Value");
   long calibrationValue;
 
@@ -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

@@ -384,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>();
@@ -395,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);
     });