docs: update changelog for version 1.2.35

.github/workflows/providers/build.yml

@@ -0,0 +1,87 @@
+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,47 +2,61 @@ name: Gitea Release
 
 on:
   workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      changelog:
-        required: true
-        type: string
-
-permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout Repository
+      uses: actions/checkout@v4
 
-    - name: Set up Python
+    - name: Install Build Dependencies
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        # System-Level Dependencies
-        pip install --upgrade platformio esptool
+        echo "Installing system dependencies..."
         sudo apt-get update
-        sudo apt-get install -y jq
+        sudo apt-get install -y python3-minimal python3-pip curl
+
+        # Verify Python installation
+        echo "Python version:"
+        python3 --version
+        
+        # Verify pip installation
+        echo "Pip version:"
+        pip3 --version
+        
+        # Install Python packages
+        echo "Installing Python packages..."
+        python3 -m pip install --user platformio
+        python3 -m pip install --user esptool
+        
+        # Add local bin to PATH
+        echo "${HOME}/.local/bin" >> $GITHUB_PATH
+        export PATH="${HOME}/.local/bin:$PATH"
+        
+        # Verify installations
+        echo "PlatformIO version:"
+        pio --version || echo "PlatformIO not found in PATH"
+        
+        echo "Esptool version:"
+        esptool.py version || echo "Esptool not found in PATH"
 
     - name: Build Firmware
       run: |
-        pio run -t buildfs
+        # Ensure PlatformIO is in PATH
-        pio run
+        export PATH="${HOME}/.local/bin:$PATH"
         
-    - name: Merge firmware and SPIFFS
+        echo "Building SPIFFS..."
+        python3 -m platformio run -t buildfs
+        
+        echo "Building firmware..."
+        python3 -m platformio run
+
+    - name: Merge Firmware Files
       run: |
-        esptool.py --chip esp32 merge_bin \
+        export PATH="${HOME}/.local/bin:$PATH"
+        
+        python3 -m esptool --chip esp32 merge_bin \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
@@ -52,67 +66,49 @@ jobs:
           0x10000 .pio/build/esp32dev/firmware.bin \
           0x290000 .pio/build/esp32dev/spiffs.bin
         
-    - name: Prepare OTA firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
 
     - name: Create Release
+      shell: bash
       env:
         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
-        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
       run: |
-        # Validate and sanitize API URL
+        # Basis-Variablen setzen
-        if [[ ! "$GITEA_API_URL" =~ ^https?:// ]]; then
+        API_BASE="${GITEA_SERVER_URL}/api/v1"
-          echo "Error: GITEA_API_URL must start with http:// or https://"
+        REPO="${GITEA_REPOSITORY}"
-          exit 1
+        TAG="${GITEA_REF_NAME}"
-        fi
         
-        # Remove trailing slash and ensure /api/v1
+        echo "Creating release for ${TAG}..."
-        GITEA_API_URL="${GITEA_API_URL%/}"
-        if [[ ! "$GITEA_API_URL" =~ /api/v1$ ]]; then
-          GITEA_API_URL="${GITEA_API_URL}/api/v1"
-        fi
         
-        echo "Creating Gitea release..."
+        # Release erstellen
-        RESPONSE=$(curl -sS -X POST \
+        RESPONSE=$(curl -k -f -s \
+          -X POST \
+          -H "accept: application/json" \
           -H "Authorization: token ${GITEA_TOKEN}" \
           -H "Content-Type: application/json" \
-          -H "Accept: application/json" \
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
-          "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+          "${API_BASE}/repos/${REPO}/releases")
-          -d @- << EOF
-{
-  "tag_name": "${{ github.ref_name }}",
-  "name": "Release ${{ inputs.version }}",
-  "body": ${{ toJSON(inputs.changelog) }},
-  "draft": false,
-  "prerelease": false
-}
-EOF
-)
         
-        # Extract and validate release ID
+        # Release ID extrahieren
-        RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2)
-        if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
+        
-          echo "Error: Failed to get release ID"
+        if [ -n "$RELEASE_ID" ]; then
-          echo "API Response:"
+          echo "Release created with ID: $RELEASE_ID"
-          echo "$RESPONSE" | jq .
+          
+          # Binärdateien hochladen
+          for file in "filaman_full.bin" "filaman_ota.bin"; do
+            echo "Uploading $file..."
+            curl -k -f -s \
+              -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/$file" \
+              "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+          done
+          
+          echo "Upload completed"
+        else
+          echo "Failed to create release"
+          echo "$RESPONSE"
           exit 1
         fi
-        
-        # Upload binary files
-        for file in "filaman_full.bin" "filaman_ota.bin"; do
-          echo "Uploading $file..."
-          if ! curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/octet-stream" \
-            "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${file}" \
-            --data-binary "@.pio/build/esp32dev/${file}"; then
-            echo "Error: Failed to upload $file"
-            exit 1
-          fi
-          echo "Successfully uploaded $file"
-        done
-      }
-    }
-  }
-}

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

@@ -2,20 +2,12 @@ name: GitHub Release
 
 on:
   workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      changelog:
-        required: true
-        type: string
-
-permissions:
-  contents: write
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -24,15 +16,19 @@ jobs:
       with:
         python-version: '3.x'
     
-    - name: Install dependencies
+    - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio esptool
+        pip install --upgrade platformio
     
     - name: Build Firmware
       run: |
-        pio run -t buildfs
+        pio run -t buildfs  # Build SPIFFS
-        pio run
+        pio run            # Build firmware
+        
+    - name: Install esptool
+      run: |
+        pip install esptool
         
     - name: Merge firmware and SPIFFS
       run: |
@@ -47,14 +43,29 @@ jobs:
           0x290000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
-      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+      run: |
+        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: |
+        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:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ github.token }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ inputs.version }}" \
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
-          --notes "${{ inputs.changelog }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
+          .pio/build/esp32dev/filaman_full.bin \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          .pio/build/esp32dev/filaman_ota.bin

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Workflow
 
 on:
   push:
@@ -6,50 +6,58 @@ on:
       - 'v*'
 
 jobs:
-  get-version-and-changelog:
+  route:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.get_version.outputs.VERSION }}
+      provider: ${{ steps.provider.outputs.provider }}
-      changelog: ${{ steps.changelog.outputs.CHANGES }}
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-      - name: Get version from tag
+      - name: Debug Environment
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      
-      - name: Verify version match
         run: |
-          PIO_VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+          echo "CI Environment Details:"
-          TAG_VERSION=${{ steps.get_version.outputs.VERSION }}
+          echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
+          echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
+          echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
+          echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
 
-          if [ "$PIO_VERSION" != "$TAG_VERSION" ]; then
+      - name: Determine CI Provider
-            echo "Error: Version mismatch between tag ($TAG_VERSION) and platformio.ini ($PIO_VERSION)"
+        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"
+          # Then check for GitHub
+          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
+            PROVIDER="github"
+          fi
+          
+          echo "Detected provider: ${PROVIDER}"
+          echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
+
+  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: 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
-
   github-release:
-    needs: get-version-and-changelog
+    needs: [route, verify-provider]
-    if: github.server_url == 'https://github.com'
+    if: needs.route.outputs.provider == 'github'
     uses: ./.github/workflows/providers/github-release.yml
-    with:
-      version: ${{ needs.get-version-and-changelog.outputs.version }}
-      changelog: ${{ needs.get-version-and-changelog.outputs.changelog }}
-    secrets: inherit
 
   gitea-release:
-    needs: get-version-and-changelog
+    needs: [route, verify-provider]
-    if: github.server_url != 'https://github.com'
+    if: needs.route.outputs.provider == 'gitea'
     uses: ./.github/workflows/providers/gitea-release.yml
-    with:
-      version: ${{ needs.get-version-and-changelog.outputs.version }}
-      changelog: ${{ needs.get-version-and-changelog.outputs.changelog }}
-    secrets: inherit

CHANGELOG.md

@@ -1,5 +1,110 @@
 # Changelog
 
+## [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

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.29</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.29</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.29</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.29</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.29</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.29</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.29</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.14"
+version = "1.2.35"
 
 [env:esp32dev]
 platform = espressif32