docs: update changelog for version 1.2.98

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

@@ -3,9 +3,6 @@ name: Gitea Release
 on:
   workflow_call:
     inputs:
-      gitea_ref_name:
-        required: true
-        type: string
       gitea_server_url:
         required: true
         type: string
@@ -37,54 +34,109 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
+    - 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: 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: Get version from platformio.ini
+      id: get_version
+      run: |
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+
     - name: Build Firmware
       run: |
-        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run -e esp32dev_ota            # Build firmware
-        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
-        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
+        VERSION=${{ steps.get_version.outputs.VERSION }}
         
-    - name: Prepare binaries
-      run: |
-        cd .pio/build/esp32dev_ota
+        # Always build firmware and SPIFFS
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
         
-        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.bin
+        # Copy firmware binary
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
         
-        # Create a magic byte prepended binary for the bootloader
-        echo -ne '\xE9' > bootloader_with_magic.bin
-        cat bootloader.bin >> bootloader_with_magic.bin
-        
-        echo "Creating full binary with magic byte..."
+        # Create full binary (always)
+        (cd .pio/build/esp32dev && \
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o filaman_full.bin \
-          0x0000 bootloader_with_magic.bin \
+          -o filaman_full_${VERSION}.bin \
+          0x0000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin)
         
-        # Verify magic bytes
-        echo "Checking magic bytes:"
-        echo "OTA binary first bytes:"
-        xxd -l 16 filaman_ota.bin
-        echo "Full binary first bytes:"
-        xxd -l 16 filaman_full.bin
+        # Only copy SPIFFS binary if data changed
+        if [[ "${{ steps.check_data.outputs.DATA_CHANGED }}" == "true" ]]; then
+          echo "Data changes detected, copying SPIFFS binary..."
+          cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        fi
         
         # Verify file sizes
         echo "File sizes:"
-        ls -lh *.bin
+        (cd .pio/build/esp32dev && ls -lh *.bin)
+        
+    - name: Prepare binaries
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        
+        # Create full binary only if SPIFFS changed
+        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
+          echo "Creating full binary..."
+          cd .pio/build/esp32dev && \
+          esptool.py --chip esp32 merge_bin \
+            --fill-flash-size 4MB \
+            --flash_mode dio \
+            --flash_freq 40m \
+            --flash_size 4MB \
+            -o filaman_full_${VERSION}.bin \
+            0x0000 bootloader.bin \
+            0x8000 partitions.bin \
+            0x10000 firmware.bin \
+            0x390000 spiffs.bin
+        fi
+        
+        # Verify file sizes
+        echo "File sizes:"
+        cd .pio/build/esp32dev && ls -lh *.bin
+
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
         
     - name: Create Release
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
       run: |
-        TAG="${{ inputs.gitea_ref_name }}"
         API_URL="${{ inputs.gitea_server_url }}/api/v1"
         REPO="${{ inputs.gitea_repository }}"
+        VERSION=${{ steps.get_version.outputs.VERSION }}
         
         # Create release
         RESPONSE=$(curl -k -s \
@@ -92,8 +144,8 @@ jobs:
           -H "Authorization: token ${TOKEN}" \
           -H "Content-Type: application/json" \
           -d "{
-            \"tag_name\":\"${TAG}\",
-            \"name\":\"Release ${TAG}\",
+            \"tag_name\":\"v${VERSION}\",
+            \"name\":\"Release ${VERSION}\",
             \"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
           }" \
           "${API_URL}/repos/${REPO}/releases")
@@ -103,17 +155,29 @@ jobs:
         if [ -n "$RELEASE_ID" ]; then
           echo "Release created with ID: $RELEASE_ID"
           
-          # Upload binaries
-          cd .pio/build/esp32dev_ota
-          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
-            echo "Uploading $file..."
+          # Always upload firmware and full binary
+          for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do
+            if [ -f ".pio/build/esp32dev/$file" ]; then
+              echo "Uploading $file..."
+              curl -k -s \
+                -X POST \
+                -H "Authorization: token ${TOKEN}" \
+                -H "Content-Type: application/octet-stream" \
+                --data-binary "@.pio/build/esp32dev/$file" \
+                "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+            fi
+          done
+          
+          # Upload SPIFFS binary only if it exists (data changes)
+          if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
+            echo "Uploading webpage binary..."
             curl -k -s \
               -X POST \
               -H "Authorization: token ${TOKEN}" \
               -H "Content-Type: application/octet-stream" \
-              --data-binary "@$file" \
-              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
-          done
+              --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \
+              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin"
+          fi
         else
           echo "Failed to create release. Response:"
           echo "$RESPONSE"

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

@@ -26,51 +26,57 @@ 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: Build Firmware
       run: |
-        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run -e esp32dev_ota            # Build firmware
-        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
-        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         
-    - name: Prepare binaries
-      run: |
-        cd .pio/build/esp32dev_ota
+        # Always build firmware and SPIFFS
+        echo "Building firmware and SPIFFS..."
+        pio run -e esp32dev
+        pio run -t buildfs
         
-        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.bin
+        # Copy firmware binary
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
         
-        # Create a magic byte prepended binary for the bootloader
-        echo -ne '\xE9' > bootloader_with_magic.bin
-        cat bootloader.bin >> bootloader_with_magic.bin
-        
-        echo "Creating full binary with magic byte..."
+        # Create full binary (always)
+        (cd .pio/build/esp32dev && \
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o filaman_full.bin \
-          0x0000 bootloader_with_magic.bin \
+          -o filaman_full_${VERSION}.bin \
+          0x0000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin)
         
-        # Verify magic bytes
-        echo "Checking magic bytes:"
-        echo "OTA binary first bytes:"
-        xxd -l 16 filaman_ota.bin
-        echo "Full binary first bytes:"
-        xxd -l 16 filaman_full.bin
+        # Only copy SPIFFS binary if data changed
+        if [[ "${{ steps.check_data.outputs.DATA_CHANGED }}" == "true" ]]; then
+          echo "Data changes detected, copying SPIFFS binary..."
+          cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        fi
         
         # Verify file sizes
         echo "File sizes:"
-        ls -lh *.bin
+        (cd .pio/build/esp32dev && ls -lh *.bin)
     
-    - name: Get version from tag
+    - name: Get version from platformio.ini
       id: get_version
       run: |
-        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       
     - name: Read CHANGELOG.md
       id: changelog
@@ -85,10 +91,33 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
-          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .pio/build/esp32dev_ota/filaman_full.bin \
-          .pio/build/esp32dev_ota/filaman_ota.bin \
-          .pio/build/esp32dev_ota/filaman.bin \
-          .pio/build/esp32dev_ota/filaman_spiffs.bin
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        
+        # Create release with available files
+        cd .pio/build/esp32dev
+        FILES_TO_UPLOAD=""
+        
+        # Always add firmware
+        if [ -f "filaman_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
+        fi
+        
+        # Add SPIFFS and full binary only if they exist
+        if [ -f "webpage_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
+        fi
+        
+        if [ -f "filaman_full_${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
+        fi
+        
+        # Create release with available files
+        if [ -n "$FILES_TO_UPLOAD" ]; then
+          gh release create "v${VERSION}" \
+            --title "Release ${VERSION}" \
+            --notes "${{ steps.changelog.outputs.CHANGES }}" \
+            $FILES_TO_UPLOAD
+        else
+          echo "Error: No files found to upload"
+          exit 1
+        fi

CHANGELOG.md

@@ -1,5 +1,86 @@
 # Changelog
 
+## [1.2.98] - 2025-02-21
+### Changed
+- update webpages for version v1.2.98
+
+
+## [1.2.97] - 2025-02-21
+### Changed
+- update webpages for version v1.2.97
+- streamline Gitea and GitHub release workflows to check for data changes and update binary handling
+
+
+## [1.2.96] - 2025-02-21
+### Added
+- add SPIFFS build step to Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.2.96
+
+
+## [1.2.95] - 2025-02-21
+### Added
+- enhance update process with separate forms for firmware and webpage uploads, including validation and improved UI
+- add API endpoint for version retrieval and update HTML to display dynamic version
+
+### Changed
+- update webpages for version v1.2.95
+- bump version to 1.2.94 in platformio.ini
+
+
+## [1.2.91] - 2025-02-20
+### Added
+- add file existence checks before uploading binaries in release workflows
+
+### Changed
+- update webpages for version v1.2.91
+
+
+## [1.2.90] - 2025-02-20
+### Changed
+- update webpages for version v1.2.90
+- update Gitea and GitHub release workflows to include SPIFFS directory creation and firmware copying
+
+
+## [1.2.89] - 2025-02-20
+### Changed
+- update webpages for version v1.2.89
+- enhance OTA update process with SPIFFS support and improved error handling
+
+
+## [1.2.88] - 2025-02-20
+### Changed
+- update webpages for version v1.2.88
+
+### Fixed
+- improve OTA update handling and logging for better error reporting
+
+
+## [1.2.87] - 2025-02-20
+### Changed
+- update webpages for version v1.2.87
+
+### Fixed
+- update firmware build process and remove unused OTA environment
+
+
+## [1.2.86] - 2025-02-20
+### Changed
+- update webpages for version v1.2.86
+
+### Fixed
+- update SPIFFS offset and size in release workflows and partitions.csv
+
+
+## [1.2.85] - 2025-02-20
+### Added
+- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting
+
+### Changed
+- update webpages for version v1.2.85
+
+
 ## [1.2.84] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.84

html/header.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,4 +44,6 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 

html/index.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,6 +44,8 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
 

html/rfid.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,6 +44,8 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
 

html/spoolman.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,6 +44,8 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
 

html/upgrade.html

@@ -1,18 +1,28 @@
-<!-- head --><!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>FilaMan - Filament Management Tool</title>
-    <link rel="icon" type="image/png" href="/favicon.ico">
+    <title>FilaMan - Firmware Update</title>
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,30 +43,105 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
     
     <div class="content">
-        <h1>Firmware Upgrade</h1>
-
+        <h1>System Update</h1>
         <div class="warning">
-            <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
-            The device will restart automatically after the update.
+            <strong>Warning:</strong> Do not power off the device during update.
         </div>
 
-        <div class="update-form">
-            <form id="updateForm" enctype='multipart/form-data'>
-                <input type='file' name='update' accept='.bin' required>
-                <input type='submit' value='Start Firmware Update'>
-            </form>
+        <div class="update-options">
+            <div class="update-section">
+                <h2>Firmware Update</h2>
+                <p>Upload a new firmware file (filaman_*.bin)</p>
+                <div class="update-form">
+                    <form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
+                        <input type='file' name='update' accept='.bin' required>
+                        <input type='submit' value='Start Firmware Update'>
+                    </form>
+                </div>
+            </div>
+
+            <div class="update-section">
+                <h2>Webpage Update</h2>
+                <p>Upload a new webpage file (webpage_*.bin)</p>
+                <div class="update-form">
+                    <form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
+                        <input type='file' name='update' accept='.bin' required>
+                        <input type='submit' value='Start Webpage Update'>
+                    </form>
+                </div>
+            </div>
         </div>
 
-        <div class="progress-container">
+        <div class="progress-container" style="display: none;">
             <div class="progress-bar">0%</div>
         </div>
         <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');
@@ -64,30 +149,44 @@
             statusContainer.style.display = 'none';
         }
 
-        document.getElementById('updateForm').addEventListener('submit', async (e) => {
+        const progress = document.querySelector('.progress-bar');
+        const progressContainer = document.querySelector('.progress-container');
+        const status = document.querySelector('.status');
+
+        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 firmware file.');
+                alert('Please select a file.');
                 return;
             }
 
-            const formData = new FormData();
-            formData.append('update', file);
-
-            const progress = document.querySelector('.progress-bar');
-            const progressContainer = document.querySelector('.progress-container');
-            const status = document.querySelector('.status');
+            // Validate file name pattern
+            if (updateType === 'firmware' && !file.name.startsWith('filaman_')) {
+                alert('Please select a valid firmware file (filaman_*.bin)');
+                return;
+            }
+            if (updateType === 'webpage' && !file.name.startsWith('webpage_')) {
+                alert('Please select a valid webpage file (webpage_*.bin)');
+                return;
+            }
             
             progressContainer.style.display = 'block';
             status.style.display = 'none';
             status.className = 'status';
-            form.querySelector('input[type=submit]').disabled = true;
+
+            // Reset progress bar
+            progress.style.width = '0%';
+            progress.textContent = '0%';
+
+            // Disable both forms during update
+            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = true);
 
             const xhr = new XMLHttpRequest();
             xhr.open('POST', '/update', true);
-
             xhr.upload.onprogress = (e) => {
                 if (e.lengthComputable) {
                     const percentComplete = (e.loaded / e.total) * 100;
@@ -130,13 +229,13 @@
                     status.style.display = 'block';
                     
                     if (xhr.status !== 200) {
-                        form.querySelector('input[type=submit]').disabled = false;
+                        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';
-                    form.querySelector('input[type=submit]').disabled = false;
+                    document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                 }
             };
 
@@ -144,11 +243,16 @@
                 status.textContent = 'Update failed: Network error';
                 status.classList.add('error');
                 status.style.display = 'block';
-                form.querySelector('input[type=submit]').disabled = false;
+                document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
             };
 
+            const formData = new FormData();
+            formData.append('update', file);
             xhr.send(formData);
-        });
+        }
+
+        document.getElementById('firmwareForm').addEventListener('submit', handleUpdate);
+        document.getElementById('webpageForm').addEventListener('submit', handleUpdate);
     </script>
 </body>
 </html>

html/waage.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,6 +44,8 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
 

html/wifi.html

@@ -6,13 +6,24 @@
     <title>FilaMan - Filament Management Tool</title>
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="stylesheet" href="style.css">
+    <script>
+        fetch('/api/version')
+            .then(response => response.json())
+            .then(data => {
+                const versionSpan = document.querySelector('.version');
+                if (versionSpan) {
+                    versionSpan.textContent = 'v' + data.version;
+                }
+            })
+            .catch(error => console.error('Error fetching version:', error));
+    </script>
 </head>
 <body>
     <div class="navbar">
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.84</span></h1>
+                <h1>FilaMan<span class="version"></span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -33,6 +44,8 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+</body>
+</html>
 
 <!-- head -->
 

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,  0x1E0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+app0,     app,  ota_0,     0x10000,  0x180000,
+app1,     app,  ota_1,     0x190000, 0x180000,
+spiffs,   data, spiffs,    0x310000, 0xE0000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.84"
+version = "1.2.98"
 
 [env:esp32dev]
 platform = espressif32
@@ -19,8 +19,10 @@ monitor_speed = 115200
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
-    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
-    me-no-dev/AsyncTCP @ ^1.1.1
+    #https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    #me-no-dev/AsyncTCP @ ^1.1.1
+    mathieucarbou/ESPAsyncWebServer @ ^3.6.0
+    esp32async/AsyncTCP @ ^3.3.5
     bogde/HX711 @ ^0.7.5
     adafruit/Adafruit SSD1306 @ ^2.5.13
     adafruit/Adafruit GFX Library @ ^1.11.11
@@ -45,106 +47,23 @@ build_flags =
     -mtext-section-literals
     '-D VERSION="${common.version}"'
     -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=1
+    -DCORE_DEBUG_LEVEL=3
     -DCONFIG_ARDUHAL_LOG_COLORS=1
     -DOTA_DEBUG=1
-    -DARDUINO_RUNNING_CORE=1
-    -DARDUINO_EVENT_RUNNING_CORE=1
     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
     -DCONFIG_ESP32_PANIC_PRINT_REBOOT
-    -DCONFIG_ARDUINO_OTA_READSIZE=1024
-    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
-    -DCONFIG_ASYNC_TCP_USE_WDT=0
-    -DCONFIG_LWIP_TCP_MSS=1460
-    -DOTA_PARTITION_SUBTYPE=0x10
-    -DPARTITION_TABLE_OFFSET=0x8000
-    -DPARTITION_TABLE_SIZE=0x1000
-    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
-    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
-    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
-    -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
-    -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
-    -DCONFIG_PARTITION_TABLE_MD5=y
     -DBOOT_APP_PARTITION_OTA_0=1
+    -DCONFIG_LOG_DEFAULT_LEVEL=3
     
 extra_scripts = 
     scripts/extra_script.py
-    pre:scripts/pre_build.py     ; wird zuerst ausgeführt
-    pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
-    pre:scripts/combine_html.py  ; wird als drittes ausgeführt
-    scripts/gzip_files.py
+    ${env:buildfs.extra_scripts}
 
-; Remove or comment out the targets line
-;targets = buildfs, build
+[env:buildfs]
+extra_scripts =
+    pre:scripts/combine_html.py  ; Combine header with HTML files
+    scripts/gzip_files.py       ; Compress files for SPIFFS
 
-; Add a custom target to build both
-[env:esp32dev_ota]
-platform = espressif32
-board = esp32dev
-framework = arduino
-monitor_speed = 115200
-
-lib_deps =
-    tzapu/WiFiManager @ ^2.0.17
-    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
-    me-no-dev/AsyncTCP @ ^1.1.1
-    bogde/HX711 @ ^0.7.5
-    adafruit/Adafruit SSD1306 @ ^2.5.13
-    adafruit/Adafruit GFX Library @ ^1.11.11
-    adafruit/Adafruit PN532 @ ^1.3.3
-    bblanchon/ArduinoJson @ ^7.3.0
-    knolleary/PubSubClient @ ^2.8
-    digitaldragon/SSLClient @ ^1.3.2
-    
-; Enable SPIFFS upload
-board_build.filesystem = spiffs
-; Update partition settings
-board_build.partitions = partitions.csv
-board_upload.flash_size = 4MB
-board_build.flash_mode = dio
-board_upload.flash_freq = "40m"
-
-build_flags = 
-    -Os
-    -ffunction-sections
-    -fdata-sections
-    -DNDEBUG
-    -mtext-section-literals
-    '-D VERSION="${common.version}"'
-    -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=1
-    -DCONFIG_ARDUHAL_LOG_COLORS=1
-    -DOTA_DEBUG=1
-    -DARDUINO_RUNNING_CORE=1
-    -DARDUINO_EVENT_RUNNING_CORE=1
-    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
-    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
-    -DCONFIG_ARDUINO_OTA_READSIZE=1024
-    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
-    -DCONFIG_ASYNC_TCP_USE_WDT=0
-    -DCONFIG_LWIP_TCP_MSS=1460
-    -DOTA_PARTITION_SUBTYPE=0x10
-    -DPARTITION_TABLE_OFFSET=0x8000
-    -DPARTITION_TABLE_SIZE=0x1000
-    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
-    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
-    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
-    -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
-    -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
-    -DCONFIG_PARTITION_TABLE_MD5=y
-    -DBOOT_APP_PARTITION_OTA_0=1
-    
-extra_scripts = 
-    scripts/extra_script.py
-    pre:scripts/pre_build.py     ; wird zuerst ausgeführt
-    pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
-    pre:scripts/combine_html.py  ; wird als drittes ausgeführt
-    scripts/gzip_files.py
-
-; Remove or comment out the targets line
-;targets = buildfs, build
-
-; Add a custom target to build both
 [platformio]
-default_envs = esp32dev, esp32dev_ota
+default_envs = esp32dev
 

scripts/pre_spiffs.py

@@ -1,7 +1,39 @@
 Import("env")
 
+board_config = env.BoardConfig()
+
+# Calculate SPIFFS size based on partition table
+SPIFFS_START = 0x310000  # From partitions.csv
+SPIFFS_SIZE = 0xE0000   # From partitions.csv
+SPIFFS_PAGE = 256
+SPIFFS_BLOCK = 4096
+
+env.Replace(
+    MKSPIFFSTOOL="mkspiffs",
+    SPIFFSBLOCKSZ=SPIFFS_BLOCK,
+    SPIFFSBLOCKSIZE=SPIFFS_BLOCK,
+    SPIFFSSTART=SPIFFS_START,
+    SPIFFSEND=SPIFFS_START + SPIFFS_SIZE,
+    SPIFFSPAGESZ=SPIFFS_PAGE,
+    SPIFFSSIZE=SPIFFS_SIZE
+)
+
 # Wiederverwendung der replace_version Funktion
 exec(open("./scripts/pre_build.py").read())
 
 # Bind to SPIFFS build
-env.AddPreAction("buildfs", replace_version)
+env.AddPreAction("buildfs", replace_version)
+
+import os
+import shutil
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+
+# Format SPIFFS partition before uploading new files
+spiffs_dir = os.path.join(env.subst("$BUILD_DIR"), "spiffs")
+if os.path.exists(spiffs_dir):
+    shutil.rmtree(spiffs_dir)
+os.makedirs(spiffs_dir)
+
+print("SPIFFS partition formatted.")

src/commonFS.cpp

@@ -1,4 +1,5 @@
 #include "commonFS.h"
+#include <SPIFFS.h>
 
 bool saveJsonValue(const char* filename, const JsonDocument& doc) {
     File file = SPIFFS.open(filename, "w");
@@ -35,23 +36,12 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
     return true;
 }
 
-bool initializeSPIFFS() {
-    // Erster Versuch
-    if (SPIFFS.begin(true)) {
-        Serial.println("SPIFFS mounted successfully.");
-        return true;
+void initializeSPIFFS() {
+    if (!SPIFFS.begin(true, "/spiffs", 10, "spiffs")) {
+        Serial.println("SPIFFS Mount Failed");
+        return;
     }
-    
-    // Formatierung versuchen
-    Serial.println("Failed to mount SPIFFS. Formatting...");
-    SPIFFS.format();
-    
-    // Zweiter Versuch nach Formatierung
-    if (SPIFFS.begin(true)) {
-        Serial.println("SPIFFS formatted and mounted successfully.");
-        return true;
-    }
-    
-    Serial.println("SPIFFS initialization failed completely.");
-    return false;
+    Serial.printf("SPIFFS Total: %u bytes\n", SPIFFS.totalBytes());
+    Serial.printf("SPIFFS Used: %u bytes\n", SPIFFS.usedBytes());
+    Serial.printf("SPIFFS Free: %u bytes\n", SPIFFS.totalBytes() - SPIFFS.usedBytes());
 }

src/commonFS.h

@@ -7,6 +7,6 @@
 
 bool saveJsonValue(const char* filename, const JsonDocument& doc);
 bool loadJsonValue(const char* filename, JsonDocument& doc);
-bool initializeSPIFFS();
+void initializeSPIFFS();
 
 #endif

src/main.cpp

@@ -78,6 +78,8 @@ uint8_t wifiErrorCounter = 0;
 
 // ##### PROGRAM START #####
 void loop() {
+
+  /*
   // Überprüfe den WLAN-Status
   if (WiFi.status() != WL_CONNECTED) {
     wifiErrorCounter++;
@@ -87,7 +89,8 @@ void loop() {
     wifiOn = true;
   }
   if (wifiErrorCounter > 20) ESP.restart();
-
+  */
+ 
   unsigned long currentMillis = millis();
 
   // Send AMS Data min every Minute

src/ota.cpp

@@ -7,7 +7,16 @@
 #include "scale.h"
 #include "nfc.h"
 
+#define UPLOAD_TIMEOUT_MS 60000  // 60 Sekunden Timeout für den gesamten Upload
+#define CHUNK_RESPONSE_TIMEOUT_MS 10000  // 10 Sekunden Timeout pro Chunk
+#define MAX_FAILED_CHUNKS 3  // Maximale Anzahl fehlgeschlagener Chunks bevor Abbruch
+#define MAX_FILE_SIZE 4194304    // 4MB Limit
+
 static bool tasksAreStopped = false;
+static uint32_t lastChunkTime = 0;
+static size_t failedChunks = 0;
+static size_t expectedOffset = 0;
+static size_t totalSize = 0;
 
 void stopAllTasks() {
     Serial.println("Stopping RFID Reader");
@@ -20,58 +29,212 @@ void stopAllTasks() {
     Serial.println("All tasks stopped");
 }
 
+void performStageTwo() {
+    if (!SPIFFS.begin(true)) {
+        Serial.println("Error: Could not mount SPIFFS for stage 2");
+        return;
+    }
+
+    File firmwareFile = SPIFFS.open("/firmware.bin", "r");
+    if (!firmwareFile) {
+        Serial.println("Error: Could not open firmware.bin from SPIFFS");
+        return;
+    }
+
+    size_t firmwareSize = firmwareFile.size();
+    size_t maxAppSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+
+    Serial.printf("Stage 2 - Firmware size: %u bytes\n", firmwareSize);
+    Serial.printf("Available space: %u bytes\n", maxAppSpace);
+
+    if (firmwareSize > maxAppSpace) {
+        Serial.printf("Error: Not enough space for firmware. Need %u bytes but only have %u bytes\n", 
+                    firmwareSize, maxAppSpace);
+        return;
+    }
+
+    if (!Update.begin(firmwareSize)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    size_t written = Update.writeStream(firmwareFile);
+    if (written != firmwareSize) {
+        Update.printError(Serial);
+        return;
+    }
+
+    if (!Update.end(true)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    firmwareFile.close();
+    SPIFFS.remove("/firmware.bin"); // Cleanup
+    Serial.println("Stage 2 update successful, restarting...");
+    delay(500);
+    ESP.restart();
+}
+
+void checkForStagedUpdate() {
+    if (!SPIFFS.begin(true)) {
+        return;
+    }
+
+    if (SPIFFS.exists("/firmware.bin")) {
+        Serial.println("Found staged firmware update, initiating stage 2...");
+        performStageTwo();
+    }
+}
+
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+    static File stagingFile;
+    static uint32_t uploadStartTime = 0;
+    
     if (!index) {
-        bool isFullImage = filename.endsWith("full.bin");
-        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
+        // Überprüfe Gesamtgröße im Header
+        if (request->hasHeader("X-Total-Size")) {
+            totalSize = request->header("X-Total-Size").toInt();
+            if (totalSize > MAX_FILE_SIZE) {
+                request->send(413, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"File too large\"}");
+                return;
+            }
+        }
+
+        uploadStartTime = millis();
+        lastChunkTime = millis();
+        expectedOffset = 0;
+        failedChunks = 0;
         
+        bool isSpiffsUpdate = filename.endsWith("_spiffs.bin");
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isSpiffsUpdate ? "SPIFFS" : "OTA");
+        Serial.printf("Total size: %u bytes\n", totalSize);
+        
+        // Überprüfe Header für Chunk-Informationen
+        if (request->hasHeader("X-Chunk-Offset")) {
+            String offsetStr = request->header("X-Chunk-Offset");
+            expectedOffset = offsetStr.toInt();
+        }
+
         if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
+        if (!tasksAreStopped) {
             stopAllTasks();
             tasksAreStopped = true;
         }
 
-        bool success;
-        if (isFullImage) {
-            // Full image update ohne Magic Byte Check, aber mit U_FLASH
-            success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
-        } else {
-            // Normales OTA update mit Magic Byte Check
-            if (data[0] != 0xE9) {
-                Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
+        if (isSpiffsUpdate) {
+            if (!SPIFFS.begin(true)) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not mount SPIFFS\"}");
+                return;
+            }
+            
+            if (!Update.begin(totalSize > 0 ? totalSize : request->contentLength(), U_SPIFFS)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
+                return;
+            }
+        } else {
+            stagingFile = SPIFFS.open("/firmware.bin", "w");
+            if (!stagingFile) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not create staging file\"}");
                 return;
             }
-            success = Update.begin(request->contentLength());
         }
+    }
 
-        if (!success) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
+    // Chunk Validierung
+    if (request->hasHeader("X-Chunk-Offset")) {
+        size_t chunkOffset = request->header("X-Chunk-Offset").toInt();
+        if (chunkOffset != expectedOffset) {
+            failedChunks++;
+            if (failedChunks >= MAX_FAILED_CHUNKS) {
+                if (stagingFile) {
+                    stagingFile.close();
+                    SPIFFS.remove("/firmware.bin");
+                }
+                Update.abort();
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Too many failed chunks\"}");
+                return;
+            }
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Invalid chunk offset\"}");
             return;
         }
     }
 
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
+    // Timeout Überprüfungen
+    uint32_t currentTime = millis();
+    if (currentTime - uploadStartTime > UPLOAD_TIMEOUT_MS) {
+        if (stagingFile) {
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+        }
+        Update.abort();
+        request->send(408, "application/json", "{\"status\":\"error\",\"message\":\"Upload timeout\"}");
         return;
     }
 
-    if (final) {
-        if (!Update.end(true)) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
+    if (currentTime - lastChunkTime > CHUNK_RESPONSE_TIMEOUT_MS) {
+        if (stagingFile) {
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+        }
+        Update.abort();
+        request->send(408, "application/json", "{\"status\":\"error\",\"message\":\"Chunk timeout\"}");
+        return;
+    }
+    lastChunkTime = currentTime;
+
+    if (stagingFile) {
+        size_t written = stagingFile.write(data, len);
+        if (written != len) {
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write to SPIFFS failed\"}");
             return;
         }
-        Serial.println("Update successful, restarting...");
-        request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-        delay(500);
-        ESP.restart();
+    } else {
+        if (Update.write(data, len) != len) {
+            Update.printError(Serial);
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write failed\"}");
+            return;
+        }
+    }
+
+    expectedOffset += len;
+
+    if (final) {
+        if (stagingFile) {
+            stagingFile.close();
+            Serial.println("Stage 1 complete - firmware staged in SPIFFS");
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"Update staged successfully! Starting stage 2...\"}");
+            delay(100);
+            performStageTwo();
+        } else {
+            if (!Update.end(true)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Update failed\"}");
+                return;
+            }
+            Serial.println("SPIFFS update successful, restarting...");
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"SPIFFS update successful! Device will restart...\",\"restart\":true}");
+            delay(500);
+            ESP.restart();
+        }
     }
 }
 

src/ota.h

@@ -10,5 +10,6 @@
 
 void stopAllTasks();
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
+void checkForStagedUpdate();
 
 #endif

src/website.cpp

@@ -8,9 +8,11 @@
 #include "scale.h"
 #include "esp_task_wdt.h"
 #include "ota.h"
+#include <Update.h>
 
 // Cache-Control Header definieren
 #define CACHE_CONTROL "max-age=31536000" // Cache für 1 Jahr
+#define VERSION "1.0.0"
 
 AsyncWebServer server(webserverPort);
 AsyncWebSocket ws("/ws");
@@ -156,6 +158,10 @@ void sendAmsData(AsyncWebSocketClient *client) {
 }
 
 void setupWebserver(AsyncWebServer &server) {
+    // Konfiguriere Server für große Uploads
+    server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){});
+    server.onFileUpload([](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final){});
+
     // Lade die Spoolman-URL beim Booten
     spoolmanUrl = loadSpoolmanUrl();
     Serial.print("Geladene Spoolman-URL: ");
@@ -338,31 +344,80 @@ void setupWebserver(AsyncWebServer &server) {
         Serial.println("RFID.js gesendet");
     });
 
-    // Route for Firmware Update
+    // Vereinfachter Update-Handler
     server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
-        // During OTA, reduce memory usage
-        ws.enable(false);  // Temporarily disable WebSocket
-        ws.cleanupClients();
-        
-        Serial.println("Request for /upgrade received");
         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/upgrade.html.gz", "text/html");
         response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Cache-Control", CACHE_CONTROL);
+        response->addHeader("Cache-Control", "no-store");
         request->send(response);
     });
 
+    // Update-Handler mit verbesserter Fehlerbehandlung
     server.on("/update", HTTP_POST, 
         [](AsyncWebServerRequest *request) {
-            // The response will be sent from handleOTAUpload when the upload is complete
+            // 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) {
-            // Free memory before handling update
-            ws.enable(false);
-            ws.cleanupClients();
-            handleOTAUpload(request, filename, index, data, len, 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 jsonResponse = "{\"version\": \"" VERSION "\"}";
+        request->send(200, "application/json", jsonResponse);
+    });
+
     // Fehlerbehandlung für nicht gefundene Seiten
     server.onNotFound([](AsyncWebServerRequest *request){
         Serial.print("404 - Nicht gefunden: ");
@@ -379,3 +434,51 @@ void setupWebserver(AsyncWebServer &server) {
     server.begin();
     Serial.println("Webserver gestartet");
 }
+
+void handleOTAUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
+    if (!index) {
+        // Start eines neuen Uploads
+        Serial.println("Update Start: " + filename);
+        
+        // Überprüfe den Dateityp basierend auf dem Dateinamen
+        bool isFirmware = filename.startsWith("filaman_");
+        bool isWebpage = filename.startsWith("webpage_");
+        
+        if (!isFirmware && !isWebpage) {
+            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 (isWebpage) {
+            if (!Update.begin(SPIFFS.totalBytes(), U_SPIFFS)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", "{\"message\":\"SPIFFS Update failed: " + String(Update.errorString()) + "\"}");
+                return;
+            }
+        } 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;
+        }
+        request->send(200, "application/json", "{\"message\":\"Update successful!\", \"restart\": true}");
+        delay(500);
+        ESP.restart();
+    }
+}

src/website.h

@@ -6,8 +6,8 @@
 #include "commonFS.h"
 #include "api.h"
 #include <ArduinoJson.h>
-#include <ESPAsyncWebServer.h>
-#include <AsyncWebSocket.h>
+#include <Update.h>
+#include <AsyncTCP.h>
 #include "bambu.h"
 #include "nfc.h"
 #include "scale.h"
@@ -17,7 +17,13 @@ extern String spoolmanUrl;
 extern AsyncWebServer server;
 extern AsyncWebSocket ws;
 
+// Server-Initialisierung und Handler
+void initWebServer();
+void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
+void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total);
 void setupWebserver(AsyncWebServer &server);
+
+// WebSocket-Funktionen
 void sendAmsData(AsyncWebSocketClient *client);
 void sendNfcData(AsyncWebSocketClient *client);
 void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);

src/wlan.cpp

@@ -11,6 +11,8 @@ bool wm_nonblocking = false;
 
 void initWiFi() {
     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
+    WiFi.setSleep(false); // disable sleep mode
+    esp_wifi_set_ps(WIFI_PS_NONE);
   
     //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm