docs: update changelog for version 1.2.91

fix: correct version number in HTML files and platformio.ini to v1.2.76
enhance: streamline OTA update handling by removing unnecessary magic byte checks

.github/workflows/providers/build.yml

@@ -1,87 +0,0 @@
-name: Build Firmware
-
-on:
-  workflow_call:
-    outputs:
-      version:
-        description: "The version from the tag"
-        value: ${{ jobs.build.outputs.version }}
-      changelog:
-        description: "The changelog for the current version"
-        value: ${{ jobs.build.outputs.changelog }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.get_version.outputs.VERSION }}
-      changelog: ${{ steps.changelog.outputs.CHANGES }}
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
-    
-    - name: Build Firmware
-      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
-        
-    - name: Install esptool
-      run: |
-        pip install esptool
-        
-    - name: Merge firmware and SPIFFS
-      run: |
-        esptool.py --chip esp32 merge_bin \
-          --flash_mode dio \
-          --flash_freq 40m \
-          --flash_size 4MB \
-          -o .pio/build/esp32dev/filaman_full.bin \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
-
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-    
-    - name: Get version from tag
-      id: get_version
-      run: |
-        if [ -n "$GITEA_REF" ]; then
-          echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
-        else
-          echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-        fi
-      
-    - name: Read CHANGELOG.md
-      id: changelog
-      run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
-        if [ -n "$GITEA_OUTPUT" ]; then
-          echo "CHANGES<<EOF" >> $GITEA_OUTPUT
-          echo "$CHANGELOG" >> $GITEA_OUTPUT
-          echo "EOF" >> $GITEA_OUTPUT
-        else
-          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        fi
-    
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: firmware
-        path: |
-          .pio/build/esp32dev/filaman_full.bin
-          .pio/build/esp32dev/filaman_ota.bin

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

@@ -2,136 +2,128 @@ name: Gitea Release
 
 on:
   workflow_call:
+    inputs:
+      gitea_ref_name:
+        required: true
+        type: string
+      gitea_server_url:
+        required: true
+        type: string
+      gitea_repository:
+        required: true
+        type: string
+    secrets:
+      GITEA_TOKEN:
+        required: true
 
 jobs:
-  build:
-    uses: ./.github/workflows/providers/build.yml
-
   create-release:
-    needs: build
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-    - name: Download artifacts
+    - uses: actions/checkout@v4
-      uses: actions/download-artifact@v3
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
+        python-version: '3.x'
-        path: firmware
+    
-
+    - name: Install PlatformIO
-    - name: Create Gitea Release
-      env:
-        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
       run: |
-        # Debug: Print all environment variables (excluding the token)
+        python -m pip install --upgrade pip
-        env | grep -v "GITEA_TOKEN"
+        pip install --upgrade platformio esptool
+    
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
+    - name: Build Firmware
+      run: |
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
-        # Remove trailing slash from server URL if present
+    - name: Prepare binaries
-        SERVER_URL="${GITEA_SERVER_URL%/}"
+      run: |
-        REPO="${GITEA_REPOSITORY}"
+        # Ensure we're in the project root
-        TAG="${GITEA_REF_NAME}"
+        cd $GITHUB_WORKSPACE
-        VERSION="${TAG#v}"  # Remove v prefix if present
         
-        echo "Debug environment:"
+        # Create SPIFFS directory if it doesn't exist
-        echo "Server URL: $SERVER_URL"
+        mkdir -p .pio/build/esp32dev/spiffs
-        echo "Repository: $REPO"
-        echo "Tag: $TAG"
-        echo "Version: $VERSION"
         
-        # Test API connectivity
+        # Copy firmware to SPIFFS directory
-        echo "Testing API connectivity..."
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin
-        TEST_RESPONSE=$(curl -v -k -H "Authorization: token ${GITEA_TOKEN}" "${SERVER_URL}/api/v1/version" 2>&1)
-        echo "API Test Response:"
-        echo "$TEST_RESPONSE"
         
-        # Construct clean API URL
+        # Build new SPIFFS image with firmware included
-        API_URL="${SERVER_URL}/api/v1"
+        pio run -t buildfs
-        RELEASE_URL="${API_URL}/repos/${REPO}/releases"
         
-        echo "Using Release API URL: $RELEASE_URL"
+        cd .pio/build/esp32dev
         
-        # Common curl options
+        # Create release files
-        CURL_OPTS="-v -k"  # -v for verbose, -k to ignore SSL verification
+        cp spiffs.bin filaman_spiffs.bin
         
-        # Create release with minimal data first
+        # Create full binary
-        echo "Creating release..."
+        echo "Creating full binary..."
-        RELEASE_RESPONSE=$(curl $CURL_OPTS -X POST \
+        esptool.py --chip esp32 merge_bin \
-          -H "accept: application/json" \
+          --fill-flash-size 4MB \
-          -H "Authorization: token ${GITEA_TOKEN}" \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o filaman_full.bin \
+          0x0000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
+        
+    - 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 }}"
+        
+        # Create release
+        RESPONSE=$(curl -k -s \
+          -X POST \
+          -H "Authorization: token ${TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${VERSION}\",\"draft\":false,\"prerelease\":false}" \
+          -d "{
-          "${RELEASE_URL}" 2>&1)
+            \"tag_name\":\"${TAG}\",
+            \"name\":\"Release ${TAG}\",
+            \"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
+          }" \
+          "${API_URL}/repos/${REPO}/releases")
         
-        echo "Full release creation response (including headers):"
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
-        echo "$RELEASE_RESPONSE"
         
-        # Extract the JSON response (last line)
+        if [ -n "$RELEASE_ID" ]; then
-        RELEASE_JSON=$(echo "$RELEASE_RESPONSE" | tail -n 1)
+          echo "Release created with ID: $RELEASE_ID"
-        echo "Release JSON response:"
+          
-        echo "$RELEASE_JSON" | jq '.' || echo "Failed to parse JSON response"
+          # Upload binaries
-        
+          cd .pio/build/esp32dev
-        # Get release ID
+          
-        RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+          # Check if files exist before uploading
-        
+          for file in filaman_spiffs.bin filaman_full.bin; do
-        if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
+            if [ -f "$file" ]; then
-          echo "Failed to create release. Full response:"
+              echo "Uploading $file..."
-          echo "$RELEASE_RESPONSE"
+              curl -k -s \
-          # Try to get more detailed error information
+                -X POST \
-          ERROR_MSG=$(echo "$RELEASE_JSON" | jq -r '.message // .error // "Unknown error"')
+                -H "Authorization: token ${TOKEN}" \
-          echo "Error message: $ERROR_MSG"
+                -H "Content-Type: application/octet-stream" \
+                --data-binary "@$file" \
+                "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+            else
+              echo "Warning: $file not found"
+            fi
+          done
+        else
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
           exit 1
-        fi
+        fi
-        
-        echo "Successfully created release with ID: $RELEASE_ID"
-        
-        # Upload assets
-        for file in "filaman_full.bin" "filaman_ota.bin"; do
-          echo "Uploading $file..."
-          UPLOAD_URL="${RELEASE_URL}/${RELEASE_ID}/assets?name=${file}"
-          echo "Upload URL: $UPLOAD_URL"
-          
-          UPLOAD_RESPONSE=$(curl $CURL_OPTS -X POST \
-            -H "accept: application/json" \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/octet-stream" \
-            --data-binary "@firmware/${file}" \
-            "${UPLOAD_URL}" 2>&1)
-          
-          echo "Full upload response for $file (including headers):"
-          echo "$UPLOAD_RESPONSE"
-          
-          # Extract the JSON response (last line)
-          UPLOAD_JSON=$(echo "$UPLOAD_RESPONSE" | tail -n 1)
-          echo "Upload JSON response:"
-          echo "$UPLOAD_JSON" | jq '.' || echo "Failed to parse JSON response"
-          
-          if ! echo "$UPLOAD_JSON" | jq -e '.id' > /dev/null; then
-            echo "Failed to upload $file. Full response:"
-            echo "$UPLOAD_RESPONSE"
-            ERROR_MSG=$(echo "$UPLOAD_JSON" | jq -r '.message // .error // "Unknown error"')
-            echo "Error message: $ERROR_MSG"
-            exit 1
-          fi
-          
-          echo "Successfully uploaded $file"
-        done
-        
-        # Update release with full description after successful file upload
-        echo "Updating release description..."
-        CHANGELOG='${{ needs.build.outputs.changelog }}'
-        UPDATE_RESPONSE=$(curl $CURL_OPTS -X PATCH \
-          -H "accept: application/json" \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          -H "Content-Type: application/json" \
-          -d "{\"body\":$(echo "$CHANGELOG" | jq -R -s .)}" \
-          "${RELEASE_URL}/${RELEASE_ID}" 2>&1)
-        
-        echo "Full update response (including headers):"
-        echo "$UPDATE_RESPONSE"
-        
-        # Extract the JSON response (last line)
-        UPDATE_JSON=$(echo "$UPDATE_RESPONSE" | tail -n 1)
-        echo "Update JSON response:"
-        echo "$UPDATE_JSON" | jq '.' || echo "Failed to parse JSON response"
-        
-        echo "Release process completed"

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

@@ -4,27 +4,106 @@ on:
   workflow_call:
 
 jobs:
-  build:
-    uses: ./.github/workflows/providers/build.yml
-
   create-release:
-    needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-    - name: Download artifacts
+    - uses: actions/checkout@v4
-      uses: actions/download-artifact@v3
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
+        python-version: '3.x'
-        path: firmware
+    
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio esptool
+    
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
+    - name: Build Firmware
+      run: |
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
+        
+    - name: Prepare binaries
+      run: |
+        # Ensure we're in the project root
+        cd $GITHUB_WORKSPACE
+        
+        # Create SPIFFS directory if it doesn't exist
+        mkdir -p .pio/build/esp32dev/spiffs
+        
+        # Copy firmware to SPIFFS directory
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin
+        
+        # Build new SPIFFS image with firmware included
+        pio run -t buildfs
+        
+        cd .pio/build/esp32dev
+        
+        # Create release files
+        cp spiffs.bin filaman_spiffs.bin
+        
+        # Create full binary
+        echo "Creating full binary..."
+        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.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
+    
+    - name: Get version from tag
+      id: get_version
+      run: |
+        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+      
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
 
     - name: Create GitHub Release
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        gh release create "${{ github.ref_name }}" \
+        # Check which files exist and create a list for upload
-          --title "Release ${{ needs.build.outputs.version }}" \
+        cd .pio/build/esp32dev
-          --notes "${{ needs.build.outputs.changelog }}" \
+        FILES_TO_UPLOAD=""
-          firmware/filaman_full.bin \
+        for file in filaman_spiffs.bin filaman_full.bin; do
-          firmware/filaman_ota.bin
+          if [ -f "$file" ]; then
+            FILES_TO_UPLOAD="$FILES_TO_UPLOAD .pio/build/esp32dev/$file"
+          else
+            echo "Warning: $file not found"
+          fi
+        done
+        
+        # Create release with available files
+        if [ -n "$FILES_TO_UPLOAD" ]; then
+          gh release create "${{ github.ref_name }}" \
+            --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+            --notes "${{ steps.changelog.outputs.CHANGES }}" \
+            $FILES_TO_UPLOAD
+        else
+          echo "Error: No files found to upload"
+          exit 1

.github/workflows/release.yml

@@ -10,6 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       provider: ${{ steps.provider.outputs.provider }}
+      gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
+      gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -20,25 +23,23 @@ jobs:
           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
           echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
+          echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
           echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
 
       - name: Determine CI Provider
         id: provider
         shell: bash
         run: |
-          # Initialize provider as unknown
-          PROVIDER="unknown"
-          
-          # Check for Gitea specific environment first
           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
-            PROVIDER="gitea"
+            echo "provider=gitea" >> "$GITHUB_OUTPUT"
-          # Then check for GitHub
+            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
+            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
           elif [ "${GITHUB_ACTIONS}" = "true" ]; then
-            PROVIDER="github"
+            echo "provider=github" >> "$GITHUB_OUTPUT"
+          else
+            echo "provider=unknown" >> "$GITHUB_OUTPUT"
           fi
-          
-          echo "Detected provider: ${PROVIDER}"
-          echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
 
   verify-provider:
     needs: route
@@ -53,11 +54,17 @@ jobs:
           fi
 
   github-release:
-    needs: verify-provider
+    needs: [route, verify-provider]
     if: needs.route.outputs.provider == 'github'
     uses: ./.github/workflows/providers/github-release.yml
 
   gitea-release:
-    needs: verify-provider
+    needs: [route, verify-provider]
     if: needs.route.outputs.provider == 'gitea'
-    uses: ./.github/workflows/providers/gitea-release.yml
+    uses: ./.github/workflows/providers/gitea-release.yml
+    with:
+      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
+      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,379 @@
 # Changelog
 
+## [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
+- ci: update installation steps for xxd to include package list update
+
+
+## [1.2.83] - 2025-02-20
+### Changed
+- update webpages for version v1.2.83
+- replace hexdump with xxd for magic byte verification in release workflows
+
+
+## [1.2.82] - 2025-02-20
+### Changed
+- update webpages for version v1.2.82
+- enhance Gitea and GitHub release workflows to include magic byte handling and improve binary verification
+
+
+## [1.2.81] - 2025-02-20
+### Changed
+- update webpages for version v1.2.81
+- update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries
+
+
+## [1.2.80] - 2025-02-20
+### Added
+- update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78
+
+### Changed
+- update webpages for version v1.2.80
+- bump version to 1.2.79 in platformio.ini
+
+
+## [1.2.79] - 2025-02-20
+### Changed
+- update webpages for version v1.2.79
+- simplify Gitea release workflow by using esptool for binary creation
+
+
+## [1.2.78] - 2025-02-20
+### Changed
+- update webpages for version v1.2.78
+- streamline Gitea release workflow and update version to 1.2.77
+
+### Fixed
+- update Gitea and GitHub release workflows to improve binary preparation and verification fix: correct version number in HTML files and platformio.ini to v1.2.76 enhance: streamline OTA update handling by removing unnecessary magic byte checks
+
+
+## [1.2.77] - 2025-02-20
+### Changed
+- optimize Gitea release workflow by simplifying build steps and improving file handling
+- update webpages for version v1.2.77
+
+
+## [1.2.76] - 2025-02-20
+### Added
+- enhance OTA update process with improved file verification and new OTA data initialization
+
+### Changed
+- update webpages for version v1.2.76
+- streamline Gitea release workflow and remove obsolete OTA data initialization script
+
+
+## [1.2.75] - 2025-02-20
+### Changed
+- update webpages for version v1.2.75
+- simplify OTA update handling by removing unnecessary variables and improving error reporting
+
+
+## [1.2.74] - 2025-02-20
+### Changed
+- update webpages for version v1.2.74
+- enhance OTA update process with improved handling of full image updates and SPIFFS data
+
+
+## [1.2.73] - 2025-02-20
+### Changed
+- update webpages for version v1.2.73
+- improve OTA update process with enhanced size checks and progress logging
+
+### Fixed
+- enhance OTA update process with improved size checks and debugging output
+
+
+## [1.2.72] - 2025-02-20
+### Changed
+- update webpages for version v1.2.72
+- simplify OTA update process by removing unnecessary buffer and adjusting offsets
+
+
+## [1.2.71] - 2025-02-20
+### Added
+- update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary
+
+### Changed
+- update webpages for version v1.2.71
+
+
+## [1.2.70] - 2025-02-20
+### Added
+- add logging to stopAllTasks for better debugging
+
+### Changed
+- update webpages for version v1.2.70
+
+
+## [1.2.69] - 2025-02-20
+### Changed
+- update webpages for version v1.2.69
+
+
+## [1.2.68] - 2025-02-20
+### Added
+- add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks
+
+### Changed
+- update webpages for version v1.2.68
+
+### Fixed
+- update stopAllTasks to suspend RfidReaderTask instead of NfcTask
+
+
+## [1.2.67] - 2025-02-20
+### Added
+- improve OTA upload handling and add SPIFFS update support
+
+### Changed
+- update webpages for version v1.2.67
+
+
+## [1.2.66] - 2025-02-20
+### Added
+- enhance OTA upload to support SPIFFS updates
+
+### Changed
+- update webpages for version v1.2.66
+
+
+## [1.2.65] - 2025-02-20
+### Changed
+- update webpages for version v1.2.65
+
+
+## [1.2.64] - 2025-02-20
+### Changed
+- update webpages for version v1.2.64
+
+### Fixed
+- improve error handling in OTA upload process
+
+
+## [1.2.63] - 2025-02-20
+### Added
+- update version to 1.2.63
+
+### Changed
+- update webpages for version v1.2.63
+
+
+## [1.2.62] - 2025-02-20
+### Added
+- update version to 1.2.62
+
+### Changed
+- update webpages for version 1.2.62
+
+
+## [1.2.61] - 2025-02-20
+### Added
+- update version to 1.2.61 and enhance OTA update error handling
+
+### Changed
+- update webpages for version 1.2.61
+
+
+## [1.2.60] - 2025-02-20
+### Added
+- update version to 1.2.60 in platformio configuration
+
+### Changed
+- update webpages for version 1.2.60
+
+
+## [1.2.59] - 2025-02-20
+### Added
+- update version to 1.2.59 and enhance OTA upload handling
+
+### Changed
+- update webpages for version 1.2.59
+
+
+## [1.2.58] - 2025-02-20
+### Added
+- update version to 1.2.58 in HTML files and platformio configuration
+
+
+## [1.2.57] - 2025-02-20
+### Added
+- update version to 1.2.57 in platformio configuration
+
+### Fixed
+- update spiffs offset and sizes in firmware and partitions configuration
+
+
+## [1.2.56] - 2025-02-19
+### Added
+- update version to 1.2.56 and adjust firmware and partition settings
+
+### Changed
+- remove redundant comment from Gitea release workflow
+
+
+## [1.2.55] - 2025-02-19
+### Added
+- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version
+
+
+## [1.2.54] - 2025-02-19
+### Added
+- update version to 1.2.54 and add check for missing changelog in Gitea release workflow
+
+
+## [1.2.53] - 2025-02-19
+### Added
+- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
+
+
+## [1.2.52] - 2025-02-19
+### Added
+- update version to 1.2.52 and improve Gitea release workflow output handling
+
+
+## [1.2.51] - 2025-02-19
+### Added
+- update version to 1.2.51 and add debug output in Gitea release workflow
+
+
+## [1.2.50] - 2025-02-19
+### Added
+- update version to 1.2.50 and remove obsolete build workflow
+
+
+## [1.2.49] - 2025-02-19
+### Added
+- update version to 1.2.49 and modify changelog reading in Gitea release workflow
+
+
+## [1.2.48] - 2025-02-19
+### Added
+- update version to 1.2.48 and modify changelog reading in release workflows
+
+
+## [1.2.47] - 2025-02-19
+### Added
+- update version to 1.2.47 and modify changelog reading in GitHub release workflow
+
+
+## [1.2.46] - 2025-02-19
+### Added
+- update Gitea release workflow to include changelog and increment version to 1.2.46
+
+
+## [1.2.45] - 2025-02-19
+### Added
+- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
+
+
+## [1.2.44] - 2025-02-19
+### Added
+- update Gitea release workflow to include additional outputs and increment version to 1.2.44
+
+
+## [1.2.43] - 2025-02-19
+### Added
+- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
+
+
+## [1.2.42] - 2025-02-19
+### Added
+- update Gitea release workflow to include additional outputs and increment version to 1.2.42
+
+
+## [1.2.41] - 2025-02-19
+### Added
+- update Gitea release workflow debug output and increment version to 1.2.41
+
+
+## [1.2.40] - 2025-02-19
+### Added
+- add inputs for Gitea release workflow and increment version to 1.2.40
+
+
+## [1.2.39] - 2025-02-19
+### Added
+- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
+
+
+## [1.2.38] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.38
+
+
+## [1.2.37] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.37
+
+
+## [1.2.36] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.36
+
+
+## [1.2.35] - 2025-02-19
+### Added
+- update Gitea release workflow and version to 1.2.35
+
+
+## [1.2.34] - 2025-02-19
+### Added
+- update version to 1.2.34 and enhance Gitea and GitHub release workflows
+
+
 ## [1.2.33] - 2025-02-19
 ### Added
 - update version to 1.2.33 and refactor release workflows for Gitea and GitHub

html/header.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/index.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/rfid.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/spoolman.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/upgrade.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/waage.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/wifi.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.91</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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,
+app0,     app,  ota_0,     0x10000,  0x1C0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
+app1,     app,  ota_1,     0x1D0000, 0x1C0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+spiffs,   data, spiffs,    0x390000, 0x60000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.33"
+version = "1.2.91"
 
 [env:esp32dev]
 platform = espressif32
@@ -45,7 +45,7 @@ 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
@@ -59,6 +59,14 @@ build_flags =
     -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

scripts/pre_spiffs.py

@@ -4,4 +4,18 @@ Import("env")
 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/bambu.h

@@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
 void bambu_restart();
 
+extern TaskHandle_t BambuMqttTask;
 #endif

src/ota.cpp

@@ -3,43 +3,166 @@
 #include <Update.h>
 #include <SPIFFS.h>
 #include "commonFS.h"
+#include "bambu.h"
+#include "scale.h"
+#include "nfc.h"
+
+static bool tasksAreStopped = false;
+
+void stopAllTasks() {
+    Serial.println("Stopping RFID Reader");
+    if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
+    Serial.println("Stopping Bambu");
+    if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
+    Serial.println("Stopping Scale");
+    if (ScaleTask) vTaskSuspend(ScaleTask);
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+    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 size_t contentLength = 0;
+    static File stagingFile;
     
     if (!index) {
-        contentLength = request->contentLength();
+        bool isSpiffsUpdate = filename.endsWith("_spiffs.bin");
-        Serial.printf("Update size: %u bytes\n", contentLength);
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isSpiffsUpdate ? "SPIFFS" : "OTA");
         
-        if (contentLength == 0) {
+        if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        if (!Update.begin(contentLength)) {
+        // Stop tasks before update
-            Serial.printf("Not enough space: %u required\n", contentLength);
+        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+            stopAllTasks();
-            return;
+            tasksAreStopped = true;
         }
+
+        size_t updateSize = request->contentLength();
         
-        Serial.println("Update started");
+        if (isSpiffsUpdate) {
+            if (!SPIFFS.begin(true)) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not mount SPIFFS\"}");
+                return;
+            }
+            
+            // Start SPIFFS update
+            if (!Update.begin(updateSize, U_SPIFFS)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
+                return;
+            }
+        } else {
+            // Regular OTA update
+            stagingFile = SPIFFS.open("/firmware.bin", "w");
+            if (!stagingFile) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not create staging file\"}");
+                return;
+            }
+        }
     }
 
-    if (Update.write(data, len) != len) {
+    if (stagingFile) {
-        Update.printError(Serial);
+        // Stage 1: Write to SPIFFS
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
+        if (stagingFile.write(data, len) != len) {
-        return;
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write to SPIFFS failed\"}");
+            return;
+        }
+    } else {
+        // Direct SPIFFS update
+        if (Update.write(data, len) != len) {
+            Update.printError(Serial);
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write failed\"}");
+            return;
+        }
     }
 
     if (final) {
-        if (Update.end(true)) {
+        if (stagingFile) {
-            Serial.println("Update complete");
+            // Finish Stage 1
-            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+            stagingFile.close();
-            delay(1000);
+            Serial.println("Stage 1 complete - firmware staged in SPIFFS");
-            ESP.restart();
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"Update staged successfully! Starting stage 2...\"}");
+            performStageTwo();
         } else {
-            Update.printError(Serial);
+            // Finish direct SPIFFS update
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
+            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

@@ -3,6 +3,12 @@
 
 #include <ESPAsyncWebServer.h>
 
+// Update size unknown constant, falls nicht bereits definiert
+#ifndef UPDATE_SIZE_UNKNOWN
+#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
+#endif
+
+void stopAllTasks();
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
 #endif

src/scale.h

@@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;
 
+extern TaskHandle_t ScaleTask;
+
 #endif

src/wlan.cpp

@@ -12,7 +12,7 @@ bool wm_nonblocking = false;
 void initWiFi() {
     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
   
-    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+    //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
   
     if(wm_nonblocking) wm.setConfigPortalBlocking(false);
     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen