docs: update changelog and header for version v1.3.61

.github/workflows/gitea-release.yml

@@ -2,6 +2,10 @@ name: Gitea Release
 
 on:
   workflow_call:
+    secrets:
+      GITEA_TOKEN:
+        description: 'Token für Gitea API-Zugriff'
+        required: true
 
 jobs:
   create-release:
@@ -36,7 +40,7 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary
+        # 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
@@ -50,7 +54,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x3D0000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"
@@ -62,14 +66,34 @@ 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 }}
+        CURRENT_TAG=$(git describe --tags --abbrev=0)
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
-        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        
-        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        if [ -n "$PREVIOUS_TAG" ]; then
-        echo "EOF" >> $GITHUB_OUTPUT
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Get commits between previous and current tag
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        else
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Initial Release" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
 
     - name: Determine Gitea URL
       id: gitea_url
@@ -116,48 +140,46 @@ jobs:
         echo "Debug: API URL: ${GITEA_API_URL}"
         echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}"
         
-        # Prepare files for upload
+        # Erstelle zuerst den Release ohne Dateien
-        FILES=""
-        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
-          if [ -f "$file" ]; then
-            FILES="$FILES -a $file"
-            echo "Debug: Found file: $file"
-          fi
-        done
-
-        # Test API connection with explicit token header
-        echo "Debug: Testing API connection..."
-        TEST_RESPONSE=$(curl -s -w "\n%{http_code}" \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          "${GITEA_API_URL}/api/v1/version")
-        TEST_STATUS=$(echo "$TEST_RESPONSE" | tail -n1)
-        if [ "$TEST_STATUS" != "200" ]; then
-          echo "Error: Cannot connect to Gitea API"
-          echo "Response: $TEST_RESPONSE"
-          exit 1
-        fi
-
-        # Create release using API
         echo "Debug: Creating release..."
-        RELEASE_DATA="{
+        RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.release_notes.outputs.CHANGES }}\"}"
-          \"tag_name\": \"v${VERSION}\",
-          \"name\": \"v${VERSION}\",
-          \"body\": \"${{ steps.changelog.outputs.CHANGES }}\"
-        }"
         
-        # Create release with explicit token header
+        RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \
-        RESPONSE=$(curl -s -w "\n%{http_code}" \
           -X POST \
           -H "Authorization: token ${GITEA_TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "$RELEASE_DATA" \
+          -d "${RELEASE_DATA}" \
           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases")
         
-        HTTP_STATUS=$(echo "$RESPONSE" | tail -n1)
+        RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1)
-        RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1)
+        RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1)
         
-        echo "Debug: HTTP Status: $HTTP_STATUS"
+        if [ "$RELEASE_STATUS" != "201" ]; then
-        if [ "$HTTP_STATUS" != "201" ]; then
           echo "Error: Failed to create release"
-          echo "Response: $RESPONSE_BODY"
+          echo "Response: $RELEASE_BODY"
           exit 1
+        fi
+        
+        # Extrahiere die Release-ID aus der Antwort
+        RELEASE_ID=$(echo "$RELEASE_BODY" | grep -o '"id":[0-9]*' | cut -d':' -f2)
+        
+        # Lade die Dateien einzeln hoch
+        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
+          if [ -f "$file" ]; then
+            echo "Debug: Uploading $file..."
+            UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
+              -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"$file" \
+              "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${RELEASE_ID}/assets?name=${file}")
+            
+            UPLOAD_STATUS=$(echo "$UPLOAD_RESPONSE" | tail -n1)
+            if [ "$UPLOAD_STATUS" != "201" ]; then
+              echo "Warning: Failed to upload $file"
+              echo "Response: $(echo "$UPLOAD_RESPONSE" | head -n -1)"
+            else
+              echo "Successfully uploaded $file"
+            fi
+          fi
+        done

.github/workflows/github-release.yml

@@ -35,28 +35,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
-    - name: Check for Data changes
-      id: check_data
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/"; then
-          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Check for SPIFFS changes
-      id: check_spiffs
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
-          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-    
     - name: Build Firmware
       run: |
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
@@ -69,7 +47,7 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Always create SPIFFS binary
+        # 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)
@@ -83,7 +61,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x3D0000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"
@@ -95,14 +73,34 @@ 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 }}
+        CURRENT_TAG=$(git describe --tags --abbrev=0)
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
-        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        
-        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        if [ -n "$PREVIOUS_TAG" ]; then
-        echo "EOF" >> $GITHUB_OUTPUT
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          
+          # Get commits between previous and current tag
+          echo "### Added" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Fixed" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          echo "" >> $GITHUB_OUTPUT
+          
+          echo "### Changed" >> $GITHUB_OUTPUT
+          git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          echo "EOF" >> $GITHUB_OUTPUT
+        else
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "Initial Release" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
 
     - name: Create GitHub Release
       env:
@@ -132,7 +130,7 @@ 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"

.github/workflows/release.yml

@@ -37,3 +37,5 @@ jobs:
     needs: detect-provider
     if: needs.detect-provider.outputs.provider == 'gitea'
     uses: ./.github/workflows/gitea-release.yml
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,240 @@
 # Changelog
 
+## [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
+- update header title to 'Hollo Lollo Trollo'
+
+
+## [1.3.42] - 2025-02-22
+### Changed
+- update webpages for version v1.3.42
+
+### Fixed
+- correct path for SPIFFS binary creation in Gitea release workflow
+
+
+## [1.3.41] - 2025-02-22
+### Changed
+- update webpages for version v1.3.41
+
+### Fixed
+- remove redundant buffer size setting in NFC initialization
+- update SPIFFS binary creation and enhance NFC buffer size
+
+
+## [1.3.40] - 2025-02-22
+### Changed
+- update webpages for version v1.3.40
+
+### Fixed
+- update SPIFFS binary header and enhance WebSocket error handling
+
+
+## [1.3.39] - 2025-02-22
+### Changed
+- update webpages for version v1.3.39
+- workflow: update SPIFFS binary creation to set chip version to max supported
+
+
+## [1.3.38] - 2025-02-22
+### Changed
+- update webpages for version v1.3.38
+- workflow: update SPIFFS binary creation with minimal ESP32 image header
+
+
+## [1.3.37] - 2025-02-22
+### Changed
+- update webpages for version v1.3.37
+- workflow: update ESP32-WROOM image header for SPIFFS binary creation
+
+
+## [1.3.36] - 2025-02-22
+### Changed
+- update webpages for version v1.3.36
+- partition: update SPIFFS binary header and offsets in workflow files
+
+
+## [1.3.35] - 2025-02-22
+### Changed
+- update webpages for version v1.3.35
+- partition: update SPIFFS binary header and offsets in workflow files
+
+
+## [1.3.34] - 2025-02-22
+### Changed
+- update webpages for version v1.3.34
+- partition: update SPIFFS binary creation and offsets in workflow files
+
+
+## [1.3.33] - 2025-02-22
+### Changed
+- update webpages for version v1.3.33
+- partition: update spiffs offset and app sizes in partition files
+- partition: update spiffs offset in partition files
+- partition: update app sizes and offsets in partitions.csv
+
+
+## [1.3.32] - 2025-02-22
+### Changed
+- update webpages for version v1.3.32
+- workflow: update magic byte for SPIFFS binary creation
+
+
+## [1.3.31] - 2025-02-22
+### Changed
+- update webpages for version v1.3.31
+- workflow: remove unnecessary data and SPIFFS change checks from release workflows
+
+
+## [1.3.30] - 2025-02-22
+### Changed
+- update webpages for version v1.3.30
+- workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte
+
+
+## [1.3.29] - 2025-02-21
+### Changed
+- update webpages for version v1.3.29
+- workflow: update Gitea release workflow to create release before file uploads
+
+
+## [1.3.28] - 2025-02-21
+### Changed
+- update webpages for version v1.3.28
+- workflow: update Gitea release workflow to use file uploads with curl
+
+
+## [1.3.27] - 2025-02-21
+### Added
+- workflow: add GITEA_TOKEN secret for Gitea API access in release workflows
+
+### Changed
+- update webpages for version v1.3.27
+
+
 ## [1.3.26] - 2025-02-21
 ### Changed
 - update webpages for version v1.3.26

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.
+- **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
-[Amazon Link](https://amzn.eu/d/1wZ4v0x)
+[Amazon Link](https://amzn.eu/d/06A0DLb)
-- **OLED Display:** 128x64 SSD1306.
+- **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
-[Amazon Link](https://amzn.eu/d/dozAYDU)
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
-- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
+- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
-[Amazon Link](https://amzn.eu/d/8205DDh)
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
-- **NFC-Tag:** NTAG215
+- **NFC Tags Ntag215:** RFID Tag
-[Amazon Link](https://amzn.eu/d/fywy4c4)
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 ### Pin-Konfiguration
 | Komponente        | ESP32 Pin |

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.
+- **HX711 5kg Load Cell Amplifier:** For weight measurement.
-[Amazon Link](https://amzn.eu/d/1wZ4v0x)
+[Amazon Link](https://amzn.eu/d/06A0DLb)
-- **OLED Display:** 128x64 SSD1306.
+- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
-[Amazon Link](https://amzn.eu/d/dozAYDU)
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
-- **PN532 NFC Module:** For NFC tag operations.
+- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
-[Amazon Link](https://amzn.eu/d/8205DDh)
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
-- **NFC-Tag:** NTAG215
+- **NFC Tags Ntag215:** RFID Tag
-[Amazon Link](https://amzn.eu/d/fywy4c4)
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 
 ### Pin Configuration

html/upgrade.html

@@ -154,6 +154,96 @@
         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();
@@ -167,85 +257,48 @@
             }
             
             // Validate file name pattern
-            if (updateType === 'firmware' && !file.name.startsWith('filaman_')) {
+            if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) {
-                alert('Please select a valid firmware file (filaman_*.bin)');
+                alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)');
                 return;
             }
-            if (updateType === 'webpage' && !file.name.startsWith('webpage_')) {
+            if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) {
-                alert('Please select a valid webpage file (webpage_*.bin)');
+                alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)');
                 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 {
+                if (xhr.status !== 200 && !progress.textContent.startsWith('100')) {
-                    let response = this.responseText;
+                    status.textContent = "Update failed: " + (xhr.responseText || "Unknown error");
-                    try {
+                    status.className = 'status error';
-                        const jsonResponse = JSON.parse(response);
-                        response = jsonResponse.message;
-                        
-                        if (jsonResponse.restart) {
-                            status.textContent = response + " Redirecting in 20 seconds...";
-                            let countdown = 20;
-                            const timer = setInterval(() => {
-                                countdown--;
-                                if (countdown <= 0) {
-                                    clearInterval(timer);
-                                    window.location.href = '/';
-                                } else {
-                                    status.textContent = response + ` Redirecting in ${countdown} seconds...`;
-                                }
-                            }, 1000);
-                        }
-                    } catch (e) {
-                        if (!isNaN(response)) {
-                            const percent = parseInt(response);
-                            progress.style.width = percent + '%';
-                            progress.textContent = percent + '%';
-                            return;
-                        }
-                    }
-                    
-                    status.textContent = response;
-                    status.classList.add(xhr.status === 200 ? 'success' : 'error');
-                    status.style.display = 'block';
-                    
-                    if (xhr.status !== 200) {
-                        document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
-                    }
-                } catch (error) {
-                    status.textContent = 'Error: ' + error.message;
-                    status.classList.add('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';
+                if (!progress.textContent.startsWith('100')) {
-                status.classList.add('error');
+                    status.textContent = "Network error during update";
-                status.style.display = 'block';
+                    status.className = 'status error';
-                document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                    status.style.display = 'block';
+                    updateInProgress = false;
+                    document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                }
             };
 
             const formData = new FormData();

partitions.csv

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

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.26"
+version = "1.3.61"
 
 #test
 
@@ -54,12 +54,8 @@ build_flags =
     -DCONFIG_ARDUHAL_LOG_COLORS=1
     -DOTA_DEBUG=1
     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
-    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
     -DBOOT_APP_PARTITION_OTA_0=1
-    -DCONFIG_LOG_DEFAULT_LEVEL=3
     -DCONFIG_LWIP_TCP_MSL=60000
-    -DCONFIG_LWIP_TCP_WND_DEFAULT=8192
-    -DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096
     -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
     -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
     

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

@@ -19,6 +19,12 @@
 void setup() {
   Serial.begin(115200);
 
+  uint64_t chipid;
+
+  chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes).
+  Serial.printf("ESP32 Chip ID = %04X", (uint16_t)(chipid >> 32)); //print High 2 bytes
+  Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.
+
   // Initialize SPIFFS
   initializeSPIFFS();
 

src/website.cpp

@@ -8,6 +8,7 @@
 #include "scale.h"
 #include "esp_task_wdt.h"
 #include <Update.h>
+#include "display.h"
 
 #ifndef VERSION
   #define VERSION "1.1.0"
@@ -22,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!");
@@ -32,6 +76,10 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
         sendWriteResult(client, 3);
     } else if (type == WS_EVT_DISCONNECT) {
         Serial.println("Client getrennt.");
+    } else if (type == WS_EVT_ERROR) {
+        Serial.printf("WebSocket Client #%u error(%u): %s\n", client->id(), *((uint16_t*)arg), (char*)data);
+    } else if (type == WS_EVT_PONG) {
+        Serial.printf("WebSocket Client #%u pong\n", client->id());
     } else if (type == WS_EVT_DATA) {
         String message = String((char*)data);
         JsonDocument doc;
@@ -159,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);
@@ -358,66 +508,8 @@ void setupWebserver(AsyncWebServer &server) {
         request->send(response);
     });
 
-    // Update-Handler mit verbesserter Fehlerbehandlung
+    // Update-Handler registrieren
-    server.on("/update", HTTP_POST, 
+    handleUpdate(server);
-        [](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) {
-                delay(500);
-                ESP.restart();
-            }
-        },
-        [](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;
-
-            if (!index) {
-                updateSize = request->contentLength();
-                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
-                Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
-
-                if (!Update.begin(updateSize, command)) {
-                    Serial.printf("Update Begin Error: ");
-                    Update.printError(Serial);
-                    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) {
-                    Serial.printf("Update Write Error: ");
-                    Update.printError(Serial);
-                    String errorMsg = String("Write failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-                Serial.printf("Progress: %u/%u\r", index + len, updateSize);
-            }
-
-            if (final) {
-                if (!Update.end(true)) {
-                    Serial.printf("Update End Error: ");
-                    Update.printError(Serial);
-                    String errorMsg = String("Update end failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
-                }
-                Serial.printf("\nUpdate Success: %uB\n", index+len);
-            }
-        }
-    );
 
     server.on("/api/version", HTTP_GET, [](AsyncWebServerRequest *request){
         String fm_version = VERSION;
@@ -442,79 +534,49 @@ void setupWebserver(AsyncWebServer &server) {
     Serial.println("Webserver gestartet");
 }
 
-void handleOTAUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static bool isSpiffsUpdate = false;
-    if (!index) {
-        // Start eines neuen Uploads
-        Serial.println("Update Start: " + filename);
-        
-        // Überprüfe den Dateityp basierend auf dem Dateinamen
-        bool isFirmware = filename.startsWith("filaman_");
-        isSpiffsUpdate = filename.startsWith("webpage_");
-        
-        if (!isFirmware && !isSpiffsUpdate) {
-            request->send(400, "application/json", "{\"message\":\"Invalid file type. File must start with 'filaman_' or 'webpage_'\"}");
-            return;
-        }
-
-        // Wähle den Update-Typ basierend auf dem Dateinamen
-        if (isSpiffsUpdate) {
-            if (!Update.begin(SPIFFS.totalBytes(), U_SPIFFS)) {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"message\":\"SPIFFS Update failed: " + String(Update.errorString()) + "\"}");
-                return;
-            }
-            // Backup JSON configs before SPIFFS update
-            backupJsonConfigs();
-        } else {
-            if (!Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH)) {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"message\":\"Firmware Update failed: " + String(Update.errorString()) + "\"}");
-                return;
-            }
-        }
-    }
-
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"message\":\"Write failed: " + String(Update.errorString()) + "\"}");
-        return;
-    }
-
-    if (final) {
-        if (!Update.end(true)) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"message\":\"Update failed: " + String(Update.errorString()) + "\"}");
-            return;
-        }
-        if (isSpiffsUpdate) {
-            // Restore JSON configs after SPIFFS update
-            restoreJsonConfigs();
-        }
-        request->send(200, "application/json", "{\"message\":\"Update successful!\", \"restart\": true}");
-        delay(500);
-        ESP.restart();
-    }
-}
 
 void backupJsonConfigs() {
-    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
+    // Bambu Credentials backup
-    for (const char* config : configs) {
+    if (SPIFFS.exists("/bambu_credentials.json")) {
-        if (SPIFFS.exists(config)) {
+        File file = SPIFFS.open("/bambu_credentials.json", "r");
-            String backupPath = String(config) + ".bak";
+        if (file) {
-            SPIFFS.remove(backupPath);
+            bambuCredentialsBackup = file.readString();
-            SPIFFS.rename(config, backupPath);
+            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"};
+    // Restore Bambu credentials
-    for (const char* config : configs) {
+    if (bambuCredentialsBackup.length() > 0) {
-        String backupPath = String(config) + ".bak";
+        File file = SPIFFS.open("/bambu_credentials.json", "w");
-        if (SPIFFS.exists(backupPath)) {
+        if (file) {
-            SPIFFS.remove(config);
+            file.print(bambuCredentialsBackup);
-            SPIFFS.rename(backupPath, config);
+            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
     }
 }