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

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

@@ -1,24 +1,20 @@
 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
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
 
 jobs:
-  create-release:
+  build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -30,90 +26,78 @@ jobs:
     - 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
+        pip install --upgrade platformio
     
     - 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
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
         
-    - name: Prepare binaries
+    - name: Install esptool
       run: |
-        cd .pio/build/esp32dev_ota
+        pip install esptool
         
-        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.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..."
+    - name: Merge firmware and SPIFFS
+      run: |
         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 \
-          0x8000 partitions.bin \
-          0x10000 firmware.bin \
-          0x390000 spiffs.bin
-        
-        # Verify magic bytes
-        echo "Checking magic bytes:"
-        echo "Full binary first bytes:"
-        xxd -l 16 filaman_full.bin
-        
-        # Verify file sizes
-        echo "File sizes:"
-        ls -lh *.bin
-        
-    - name: Create Release
-      env:
-        TOKEN: ${{ secrets.GITEA_TOKEN }}
+          -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: |
-        TAG="${{ inputs.gitea_ref_name }}"
-        API_URL="${{ inputs.gitea_server_url }}/api/v1"
-        REPO="${{ inputs.gitea_repository }}"
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.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: |
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.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:
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+    run: |
+        # Create release using Gitea API
+        RESPONSE=$(curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        -H "accept: application/json" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+        -d '{
+            "tag_name": "${{ github.ref_name }}",
+            "name": "Release ${{ steps.get_version.outputs.VERSION }}",
+            "body": "${{ steps.changelog.outputs.CHANGES }}",
+            "draft": false,
+            "prerelease": false
+        }')
         
-        # Create release
-        RESPONSE=$(curl -k -s \
-          -X POST \
-          -H "Authorization: token ${TOKEN}" \
-          -H "Content-Type: application/json" \
-          -d "{
-            \"tag_name\":\"${TAG}\",
-            \"name\":\"Release ${TAG}\",
-            \"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
-          }" \
-          "${API_URL}/repos/${REPO}/releases")
+        # Extract release ID from response
+        RELEASE_ID=$(echo $RESPONSE | jq -r .id)
         
-        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        # Upload full firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_full.bin
         
-        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; do
-            echo "Uploading $file..."
-            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
-        else
-          echo "Failed to create release. Response:"
-          echo "$RESPONSE"
-          exit 1
-        fi
+        # Upload OTA firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_ota.bin

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

@@ -1,13 +1,20 @@
 name: GitHub Release
 
 on:
-  workflow_call:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
 
 jobs:
-  create-release:
+  build:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
+      contents: write # Required for creating releases at job level
     steps:
     - uses: actions/checkout@v4
     
@@ -19,71 +26,60 @@ jobs:
     - 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
+        pip install --upgrade platformio
     
     - 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
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
         
-    - name: Prepare binaries
+    - name: Install esptool
       run: |
-        cd .pio/build/esp32dev_ota
+        pip install esptool
         
-        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.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..."
+    - name: Merge firmware and SPIFFS
+      run: |
         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 \
-          0x8000 partitions.bin \
-          0x10000 firmware.bin \
-          0x390000 spiffs.bin
-        
-        # Verify magic bytes
-        echo "Checking magic bytes:"
-        echo "Full binary first bytes:"
-        xxd -l 16 filaman_full.bin
-        
-        # Verify file sizes
-        echo "File sizes:"
-        ls -lh *.bin
+          -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: |
+        # Use PlatformIO to create a proper OTA image
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
     
     - name: Get version from tag
       id: get_version
-      run: |
-        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+      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)
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.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
+    
+    - name: Install and Configure GitHub CLI
+      run: |
+        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+        && sudo apt update \
+        && sudo apt install gh -y
+        
+    - name: Create Release with GitHub CLI
       env:
-        GH_TOKEN: ${{ github.token }}
+        GH_TOKEN: ${{ secrets.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/filaman_full.bin#filaman_full.bin" \
+          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release Workflow
+name: Release
 
 on:
   push:
@@ -6,65 +6,27 @@ on:
       - 'v*'
 
 jobs:
-  route:
+  detect-and-run:
     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
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: Debug Environment
+      - name: Determine hosting platform
+        id: platform
         run: |
-          echo "CI Environment Details:"
-          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: |
-          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
-            echo "provider=gitea" >> "$GITHUB_OUTPUT"
-            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
-            echo "provider=github" >> "$GITHUB_OUTPUT"
+          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
+            echo "platform=github" >> $GITHUB_OUTPUT
+          elif [[ "$CI_SERVER_URL" == *"gitlab"* ]]; then
+            echo "platform=gitlab" >> $GITHUB_OUTPUT
           else
-            echo "provider=unknown" >> "$GITHUB_OUTPUT"
+            echo "platform=gitea" >> $GITHUB_OUTPUT
           fi
 
-  verify-provider:
-    needs: route
-    runs-on: ubuntu-latest
-    steps:
-      - name: Echo detected provider
-        run: |
-          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
-          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
-            echo "::error::Failed to detect CI provider!"
-            exit 1
-          fi
+      - name: Run GitHub Release
+        if: steps.platform.outputs.platform == 'github'
+        uses: ./.github/workflows/providers/github-release.yml
 
-  github-release:
-    needs: [route, verify-provider]
-    if: needs.route.outputs.provider == 'github'
-    uses: ./.github/workflows/providers/github-release.yml
-
-  gitea-release:
-    needs: [route, verify-provider]
-    if: needs.route.outputs.provider == 'gitea'
-    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 }}
+      - name: Run Gitea Release
+        if: steps.platform.outputs.platform == 'gitea'
+        uses: ./.github/workflows/providers/gitea-release.yml

CHANGELOG.md

@@ -1,489 +1,5 @@
 # Changelog
 
-## [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
-
-
-## [1.2.32] - 2025-02-19
-### Added
-- update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases
-
-
-## [1.2.31] - 2025-02-19
-### Added
-- update version to 1.2.31
-
-
-## [1.2.30] - 2025-02-19
-### Added
-- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
-
-
-## [1.2.29] - 2025-02-19
-### Added
-- update version to 1.2.29 and enhance Gitea release workflow with improved error handling and debugging
-
-
-## [1.2.28] - 2025-02-19
-### Added
-- add build and release workflows for Gitea and GitHub, increment version to 1.2.28
-
-
-## [1.2.27] - 2025-02-19
-### Added
-- enhance CI workflows with provider detection and update version to 1.2.27
-
-
-## [1.2.26] - 2025-02-19
-### Added
-- update release workflows for Gitea and GitHub, increment version to 1.2.26
-
-
-## [1.2.25] - 2025-02-19
-### Added
-- update GitHub release workflows and increment version to 1.2.25
-
-
-## [1.2.24] - 2025-02-19
-### Added
-- update GitHub release workflow and increment version to 1.2.24
-
-
-## [1.2.23] - 2025-02-19
-### Added
-- update Gitea release workflow and increment version to 1.2.23
-
-
-## [1.2.22] - 2025-02-19
-### Added
-- update Gitea runner configuration and increment version to 1.2.22
-
-
-## [1.2.21] - 2025-02-19
-### Added
-- update Gitea release condition and increment version to 1.2.21
-
-
-## [1.2.20] - 2025-02-19
-### Added
-- update release workflows for GitHub and Gitea, increment version to 1.2.20
-
-
-## [1.2.19] - 2025-02-19
-### Added
-- add Gitea and GitHub release workflows for version 1.2.19
-
-
-## [1.2.18] - 2025-02-19
-### Added
-- remove Gitea and GitHub release workflows and increment version to 1.2.18
-
-
-## [1.2.17] - 2025-02-19
-### Added
-- update Gitea release workflow for version 1.2.17 and improve job structure
-
-
-## [1.2.16] - 2025-02-19
-### Added
-- update Gitea release workflow and increment version to 1.2.16
-
-
-## [1.2.15] - 2025-02-19
-### Added
-- update version to 1.2.15 and clean up Gitea release workflow
-
-
-## [1.2.14] - 2025-02-19
-### Added
-- update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
-
-
-## [1.2.13] - 2025-02-19
-### Added
-- update version to 1.2.13 and enhance release workflow with Python setup and Gitea support
-
-
-## [1.2.12] - 2025-02-19
-### Added
-- update version to 1.2.12 and refactor release workflows for improved provider detection and execution
-
-
-## [1.2.11] - 2025-02-18
-### Added
-- update version to 1.2.11 and enhance GitHub and Gitea release workflows with input validation and improved error handling
-
-
-## [1.2.10] - 2025-02-18
-### Added
-- enhance Gitea release workflow with API connection verification and URL validation; update version to 1.2.10
-
-
-## [1.2.9] - 2025-02-18
-### Added
-- update version to 1.2.9 in platformio.ini
-- refactor GitHub and Gitea release workflows for improved version handling and firmware uploads
-
-
-## [1.2.8] - 2025-02-18
-### Added
-- update version to 1.2.8 in platformio.ini; refactor Gitea and GitHub release workflows
-- update version to 1.2.7 in platformio.ini; adjust Gitea release workflow
-
-
-## [1.2.6] - 2025-02-18
-### Added
-- update version to 1.2.6 in platformio.ini
-- update version to 1.2.5; enhance Gitea release workflow and streamline release process
-
-### Changed
-- update changelog for version 1.2.5
-
-
-## [1.2.5] - 2025-02-18
-### Added
-- update version to 1.2.5; enhance Gitea release workflow and streamline release process
-
-
 ## [1.2.4] - 2025-02-18
 ### Added
 - update version to 1.2.4 in HTML files and platformio.ini

README.md

@@ -124,24 +124,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
     - Configure WiFi settings through the captive portal.
     - Access the web interface at `http://filaman.local` or the IP address.
 
-## GitHub Actions Configuration
-
-### Required Secrets for Gitea Releases
-
-When using Gitea as your repository host, you need to configure the following secrets in your repository:
-
-- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
-- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
-- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
-
-Example values:
-```
-GITEA_API_URL=https://git.example.com
-GITEA_TOKEN=abcdef1234567890
-GITEA_REPOSITORY=username/filaman
-```
-
-Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.
 
 ## Documentation
 

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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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.86</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</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,  0x1C0000,
-app1,     app,  ota_1,     0x1D0000, 0x1C0000,
-spiffs,   data, spiffs,    0x390000, 0x60000,
+app0,     app,  ota_0,     0x10000,  0x1E0000,
+app1,     app,  ota_1,     0x1F0000, 0x1E0000,
+spiffs,   data, spiffs,    0x3D0000, 0x30000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.86"
+version = "1.2.4"
 
 [env:esp32dev]
 platform = espressif32
@@ -59,80 +59,6 @@ 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
-    
-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
-[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
@@ -146,5 +72,5 @@ extra_scripts =
 
 ; Add a custom target to build both
 [platformio]
-default_envs = esp32dev, esp32dev_ota
+default_envs = esp32dev
 

scripts/pre_spiffs.py

@@ -4,18 +4,4 @@ Import("env")
 exec(open("./scripts/pre_build.py").read())
 
 # Bind to SPIFFS build
-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.")
+env.AddPreAction("buildfs", replace_version)

src/bambu.h

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

src/ota.cpp

@@ -3,75 +3,44 @@
 #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 handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+    static size_t contentLength = 0;
+    
     if (!index) {
-        bool isFullImage = filename.endsWith("full.bin");
-        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
+        contentLength = request->contentLength();
+        Serial.printf("Update size: %u bytes\n", contentLength);
         
-        if (request->contentLength() == 0) {
+        if (contentLength == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
-            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\"}");
-                return;
-            }
-            success = Update.begin(request->contentLength());
-        }
-
-        if (!success) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
+        if (!Update.begin(contentLength)) {
+            Serial.printf("Not enough space: %u required\n", contentLength);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
             return;
         }
+        
+        Serial.println("Update started");
     }
 
     if (Update.write(data, len) != len) {
         Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
         return;
     }
 
     if (final) {
-        if (!Update.end(true)) {
+        if (Update.end(true)) {
+            Serial.println("Update complete");
+            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+            delay(1000);
+            ESP.restart();
+        } else {
             Update.printError(Serial);
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update 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();
     }
 }
 

src/ota.h

@@ -3,12 +3,6 @@
 
 #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,6 +15,4 @@ 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