docs: update changelog for version 1.2.67

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

@@ -1,44 +1,61 @@
 name: Gitea Release
 
 on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
+  workflow_call:
+    inputs:
+      gitea_ref_name:
+        description: 'Gitea ref name'
+        required: true
+        type: string
+      gitea_server_url:
+        description: 'Gitea server URL'
+        required: true
+        type: string
+      gitea_repository:
+        description: 'Gitea repository'
+        required: true
+        type: string
+    secrets:
+      GITEA_TOKEN:
+        required: true
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install PlatformIO
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Install System Dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
-    
+        sudo apt-get update
+        sudo apt-get install -y python3 python3-venv build-essential curl git
+
+    - name: Set up Python Virtual Environment
+      run: |
+        python3 -m venv venv
+        source venv/bin/activate
+        pip install --upgrade pip
+        pip install platformio esptool
+        
+        echo "Verifying installations:"
+        platformio --version
+        python3 --version
+        esptool.py version
+
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        source venv/bin/activate
+        echo "Building SPIFFS..."
+        platformio run -t buildfs
         
-    - name: Install esptool
-      run: |
-        pip install esptool
-        
-    - name: Merge firmware and SPIFFS
+        echo "Building firmware..."
+        platformio run
+
+    - name: Create Release Files
       run: |
+        source venv/bin/activate
+        echo "Creating release files..."
         esptool.py --chip esp32 merge_bin \
           --flash_mode dio \
           --flash_freq 40m \
@@ -47,56 +64,71 @@ jobs:
           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: |
+          0x3D0000 .pio/build/esp32dev/spiffs.bin
+        
         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)
+        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
+        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
-    
+        echo "CHANGELOG CONTENT:"
+        echo "$CHANGELOG"
+        if [ -z "$CHANGELOG" ]; then
+          echo "No changelog found for version $VERSION"
+          exit 1
+        fi
+
     - name: Create Release
       env:
-        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
+        GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
+        GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
+        CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
       run: |
-        # Create release using Gitea API
-        RESPONSE=$(curl -X POST \
-          -H "Authorization: token ${GITEA_TOKEN}" \
+        echo "Debug environment:"
+        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
+        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
+        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
+        echo "CHANGELOG: ${CHANGELOG}"
+        
+        TAG="${GITEA_REF_NAME}"
+        API_URL="${GITEA_SERVER_URL}/api/v1"
+        REPO="${GITEA_REPOSITORY}"
+        
+        echo "Creating release for ${TAG} on ${REPO}..."
+        
+        # Create release
+        RESPONSE=$(curl -k -s \
+          -X POST \
+          -H "Authorization: token ${TOKEN}" \
           -H "Content-Type: application/json" \
-          -H "accept: application/json" \
-          ${GITEA_API_URL}/repos/${GITHUB_REPOSITORY}/releases \
-          -d '{
-            "tag_name": "${{ github.ref_name }}",
-            "name": "Release ${{ steps.get_version.outputs.VERSION }}",
-            "body": "${{ steps.changelog.outputs.CHANGES }}",
-            "draft": false,
-            "prerelease": false
-          }')
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
+          "${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_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
         
-        # Upload full firmware
-        curl -X POST \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          -H "Content-Type: application/octet-stream" \
-          ${GITEA_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin \
-          --data-binary @.pio/build/esp32dev/filaman_full.bin
-        
-        # Upload OTA firmware
-        curl -X POST \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          -H "Content-Type: application/octet-stream" \
-          ${GITEA_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin \
-          --data-binary @.pio/build/esp32dev/filaman_ota.bin
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
+          
+          # Upload files
+          for file in "filaman_full.bin" "filaman_ota.bin"; do
+            echo "Uploading $file..."
+            curl -k -s \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/$file" \
+              "${UPLOAD_URL}?name=$file"
+          done
+        else
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
+          exit 1
+        fi

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

@@ -1,20 +1,13 @@
 name: GitHub Release
 
 on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
+  workflow_call:
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
     permissions:
-      contents: write # Required for creating releases at job level
+      contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -47,39 +40,32 @@ jobs:
           0x1000 .pio/build/esp32dev/bootloader.bin \
           0x8000 .pio/build/esp32dev/partitions.bin \
           0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
+          0x3D0000 .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: |
-        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        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: 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
+
+    - name: Create GitHub Release
       env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        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/filaman_full.bin#filaman_full.bin" \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          .pio/build/esp32dev/filaman_full.bin \
+          .pio/build/esp32dev/filaman_ota.bin

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Workflow
 
 on:
   push:
@@ -6,27 +6,65 @@ on:
       - 'v*'
 
 jobs:
-  detect-and-run:
+  route:
     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 code
-        uses: actions/checkout@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-      - name: Determine hosting platform
-        id: platform
+      - name: Debug Environment
         run: |
-          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
-            echo "platform=github" >> $GITHUB_OUTPUT
-          elif [[ "$CI_SERVER_URL" == *"gitlab"* ]]; then
-            echo "platform=gitlab" >> $GITHUB_OUTPUT
+          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"
           else
-            echo "platform=gitea" >> $GITHUB_OUTPUT
+            echo "provider=unknown" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Run GitHub Release
-        if: steps.platform.outputs.platform == 'github'
-        uses: ./.github/workflows/providers/github-release.yml
+  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 Gitea Release
-        if: steps.platform.outputs.platform == 'gitea'
-        uses: ./.github/workflows/providers/gitea-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 }}

CHANGELOG.md

@@ -1,5 +1,351 @@
 # Changelog
 
+## [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,6 +124,24 @@ 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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.4"
+version = "1.2.67"
 
 [env:esp32dev]
 platform = espressif32

src/ota.cpp

@@ -4,10 +4,33 @@
 #include <SPIFFS.h>
 #include "commonFS.h"
 
+// Magic byte patterns für verschiedene Image-Typen
+const uint8_t FIRMWARE_MAGIC = 0xE9;
+const uint8_t ESP_MAGIC = 0xE9;
+
+void stopTasks() {
+    // Stop all tasks
+    vTaskSuspend(NULL);
+}
+
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
     static size_t contentLength = 0;
+    static bool isFullImage = false;
+    static uint32_t currentOffset = 0;
+    static uint8_t *spiffsBuffer = nullptr;
+    static size_t spiffsSize = 0;
+    static const uint32_t SPIFFS_START = 0x310000;  // SPIFFS start in full.bin
     
+    stopTasks();
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+
     if (!index) {
+        // Reset static variables
+        if (spiffsBuffer) {
+            free(spiffsBuffer);
+            spiffsBuffer = nullptr;
+        }
+        
         contentLength = request->contentLength();
         Serial.printf("Update size: %u bytes\n", contentLength);
         
@@ -16,30 +39,136 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        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\"}");
+        if (data[0] == ESP_MAGIC) {
+            isFullImage = (contentLength > 0x3D0000);
+            
+            // Korrektur: Bei full.bin die gesamte Größe verwenden
+            if (!Update.begin(contentLength, U_FLASH)) {
+                Serial.printf("Not enough space: %u required\n", contentLength);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+                return;
+            }
+            
+            Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
+            
+            if (isFullImage) {
+                spiffsSize = 0x0F0000;  // 960KB SPIFFS size
+                spiffsBuffer = (uint8_t*)malloc(spiffsSize);
+                if (!spiffsBuffer) {
+                    Serial.println("Failed to allocate SPIFFS buffer");
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
+                    return;
+                }
+                memset(spiffsBuffer, 0xFF, spiffsSize); // Initialize buffer with 0xFF
+            }
+        } else {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
             return;
         }
+        currentOffset = 0;
+    }
+    
+    if (isFullImage) {
+        // Zuerst vollständiges Firmware-Update durchführen
+        if (Update.write(data, len) != len) {
+            String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
+                Update.printError(Serial);
+                if (spiffsBuffer) free(spiffsBuffer);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}");
+                return;
+            }
+        }
         
-        Serial.println("Update started");
-    }
-
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
-        return;
+        // SPIFFS-Daten separat sammeln
+        if (currentOffset >= SPIFFS_START) {
+            uint32_t spiffsOffset = currentOffset - SPIFFS_START;
+            if (spiffsOffset < spiffsSize) {
+                size_t copyLen = min(len, spiffsSize - spiffsOffset);
+                memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
+                Serial.printf("Collecting SPIFFS data at offset %u, length %u\n", spiffsOffset, copyLen);
+            }
+        }
+    } else {
+        // Normal firmware update
+        if (Update.write(data, len) != len) {
+            String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
+                Update.printError(Serial);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
+                return;
+            }
+        }
     }
+    
+    currentOffset += len;
 
     if (final) {
         if (Update.end(true)) {
-            Serial.println("Update complete");
+            Serial.println("Firmware update complete");
+            
+            if (isFullImage && spiffsBuffer) {
+                Serial.println("Starting SPIFFS update");
+                
+                // Unmount SPIFFS first
+                if (SPIFFS.begin()) {
+                    SPIFFS.end();
+                }
+                
+                // Update SPIFFS
+                if (!Update.begin(spiffsSize, U_SPIFFS)) {
+                    Serial.println("Could not begin SPIFFS update");
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
+                    return;
+                }
+                
+                if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
+                    Serial.println("SPIFFS Write Failed");
+                    Update.printError(Serial);
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
+                    return;
+                }
+                
+                if (!Update.end(true)) {
+                    Serial.println("SPIFFS End Failed");
+                    Update.printError(Serial);
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
+                    return;
+                }
+                
+                free(spiffsBuffer);
+                spiffsBuffer = nullptr;
+                Serial.println("SPIFFS update complete");
+                
+                // Verify SPIFFS
+                if (!SPIFFS.begin(true)) {
+                    Serial.println("SPIFFS mount after update failed");
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
+                    return;
+                }
+                SPIFFS.end();
+            }
+            
             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\"}");
+            if (spiffsBuffer) {
+                free(spiffsBuffer);
+                spiffsBuffer = nullptr;
+            }
+            String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
+                Update.printError(Serial);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
+            } else {
+                request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+                delay(1000);
+                ESP.restart();
+            }
         }
     }
 }