docs: update changelog for version 1.2.36

.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

@@ -3,61 +3,164 @@ name: Gitea Release
 on:
   workflow_call:
     inputs:
-      version:
-        type: string
-        required: true
-      changelog:
+      server_url:
+        description: 'Gitea server URL'
+        required: false
         type: string
+        default: 'https://gitea.your-domain.com'
+    secrets:
+      GITEA_TOKEN:
         required: true
 
 jobs:
-  release:
-    runs-on: gitea-runner
+  create-release:
+    runs-on: ubuntu-latest
+    environment: production
     steps:
-      - name: Debug Info
-        run: |
-          echo "Version: ${{ inputs.version }}"
-          echo "Changelog: ${{ inputs.changelog }}"
-          echo "Tag: ${GITHUB_REF#refs/tags/}"
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install Build Dependencies
+      run: |
+        echo "Current directory: $(pwd)"
+        
+        # Systemabhängigkeiten
+        sudo apt-get update
+        sudo apt-get install -y build-essential gcc git wget
+        
+        # PlatformIO CLI installieren
+        curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core/master/scripts/get-platformio.py -o get-platformio.py
+        python3 get-platformio.py
+        
+        # PATH aktualisieren
+        echo "$HOME/.platformio/penv/bin" >> $GITHUB_PATH
+        export PATH="$HOME/.platformio/penv/bin:$PATH"
+        
+        echo "Verifying installation:"
+        pio --version
+        python --version
+        gcc --version
+        
+        echo "Project contents:"
+        ls -la
+
+    - name: Prepare Build Environment
+      run: |
+        # PlatformIO Core initialisieren
+        pio platform install "espressif32"
+        
+        echo "Installing libraries..."
+        pio lib install \
+          "tzapu/WiFiManager @ ^2.0.17" \
+          "https://github.com/me-no-dev/ESPAsyncWebServer.git" \
+          "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"
+        
+        echo "Installed libraries:"
+        pio lib list
+
+    - name: Build Project
+      run: |
+        # PlatformIO Core Variablen setzen
+        export PLATFORMIO_BUILD_FLAGS="-D VERSION=\\"1.2.35\\" -DNDEBUG"
+        
+        echo "Building project..."
+        pio run -e esp32dev -v
+        
+        echo "Building SPIFFS..."
+        pio run -e esp32dev -t buildfs -v
+        
+        echo "Build output:"
+        ls -la .pio/build/esp32dev/
+
+    - name: Merge Firmware Files
+      run: |
+        pip install esptool==4.5.1
+        
+        echo "Available files:"
+        ls -la .pio/build/esp32dev/
+        
+        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
+        
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+        
+        echo "Final binaries:"
+        ls -la .pio/build/esp32dev/filaman_*.bin
+
+    - name: Create Release
+      shell: bash
+      env:
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
+        SERVER_URL: ${{ inputs.server_url }}
+      run: |
+        # Basis-Variablen
+        API_BASE="${GITEA_SERVER_URL:-${SERVER_URL}}/api/v1"
+        REPO="${GITEA_REPOSITORY}"
+        TAG="${GITEA_REF_NAME}"
+        
+        echo "Release configuration:"
+        echo "API Base: $API_BASE"
+        echo "Repository: $REPO"
+        echo "Tag: $TAG"
+        
+        # Test API-Verbindung
+        echo "Testing API connection..."
+        curl -k -v \
+          -H "Authorization: token ${TOKEN}" \
+          "${API_BASE}/version"
+        
+        # Release erstellen
+        echo "Creating release..."
+        RESPONSE=$(curl -k -v \
+          -X POST \
+          -H "Authorization: token ${TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
+          "${API_BASE}/repos/${REPO}/releases")
+        
+        echo "Release response:"
+        echo "$RESPONSE"
+        
+        # Release ID extrahieren
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
           
-      - uses: actions/checkout@v4
-      
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install platformio esptool
-      
-      - name: Build
-        run: |
-          pio run -t buildfs
-          pio run
+          # Binärdateien hochladen
+          for file in "filaman_full.bin" "filaman_ota.bin"; do
+            echo "Uploading $file..."
+            curl -k -v \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/$file" \
+              "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+          done
           
-      - name: Create full firmware
-        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
-          cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-      
-      - name: Create Release
-        run: |
-          TAG="${GITHUB_REF#refs/tags/}"
-          curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "{\"tag_name\":\"$TAG\",\"name\":\"Release ${{ inputs.version }}\",\"body\":\"${{ inputs.changelog }}\",\"draft\":false,\"prerelease\":false}"
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
-          GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+          echo "Upload completed"
+        else
+          echo "Failed to create release"
+          exit 1
+        fi

.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
+        pio run -t buildfs  # Build SPIFFS
+        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 }}" \
-          --notes "${{ inputs.changelog }}" \
-          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          .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,36 +6,72 @@ on:
       - 'v*'
 
 jobs:
-  prepare:
-    runs-on: gitea-runner
+  route:
+    runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.version.outputs.version }}
-      changelog: ${{ steps.changelog.outputs.changelog }}
+      provider: ${{ steps.provider.outputs.provider }}
+      server_url: ${{ steps.provider.outputs.server_url }}
     steps:
-      - uses: actions/checkout@v4
-      
-      - name: Get version from tag
-        id: version
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Debug Environment
         run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-      
-      - name: Get changelog
-        id: changelog
+          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: |
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-      
-      - name: Run GitHub Release
-        if: github.server_url == 'https://github.com'
-        uses: ./.github/workflows/providers/github-release.yml
-        with:
-          version: ${{ steps.version.outputs.version }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
-        
-      - name: Run Gitea Release
-        if: github.server_url != 'https://github.com'
-        uses: ./.github/workflows/providers/gitea-release.yml
-        with:
-          version: ${{ steps.version.outputs.version }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
+          # Initialize provider as unknown
+          PROVIDER="unknown"
+          SERVER_URL=""
+          
+          # Check for Gitea specific environment first
+          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
+            PROVIDER="gitea"
+            SERVER_URL="${GITEA_SERVER_URL}"
+          # Then check for GitHub
+          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
+            PROVIDER="github"
+          fi
+          
+          echo "Detected provider: ${PROVIDER}"
+          echo "Server URL: ${SERVER_URL}"
+          
+          {
+            echo "provider=${PROVIDER}"
+            echo "server_url=${SERVER_URL}"
+          } >> "$GITHUB_OUTPUT"
+
+  verify-provider:
+    needs: route
+    runs-on: ubuntu-latest
+    steps:
+      - name: Echo detected provider
+        run: |
+          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
+          echo "Server URL: ${{ needs.route.outputs.server_url }}"
+          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
+            echo "::error::Failed to detect CI provider!"
+            exit 1
+          fi
+
+  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:
+      server_url: ${{ needs.route.outputs.server_url }}
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

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

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.20"
+version = "1.2.36"
 
 [env:esp32dev]
 platform = espressif32