docs: update changelog for version 1.2.58

.github/workflows/providers/build.yml

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

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

@@ -3,11 +3,18 @@ name: Gitea Release
 on:
   workflow_call:
     inputs:
-      server_url:
-        description: 'Gitea server URL'
-        required: false
+      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
-        default: 'https://gitea.your-domain.com'
     secrets:
       GITEA_TOKEN:
         required: true
@@ -15,84 +22,40 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
-    environment: production
     steps:
     - 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
+    - name: Install System Dependencies
       run: |
-        echo "Current directory: $(pwd)"
-        
-        # Systemabhängigkeiten
         sudo apt-get update
-        sudo apt-get install -y build-essential gcc git wget
+        sudo apt-get install -y python3 python3-venv build-essential curl git
 
-        # 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
+    - name: Set up Python Virtual Environment
       run: |
-        # PlatformIO Core initialisieren
-        pio platform install "espressif32"
+        python3 -m venv venv
+        source venv/bin/activate
+        pip install --upgrade pip
+        pip install platformio esptool
         
-        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 "Verifying installations:"
+        platformio --version
+        python3 --version
+        esptool.py version
 
-        echo "Installed libraries:"
-        pio lib list
-
-    - name: Build Project
+    - name: Build Firmware
       run: |
-        # PlatformIO Core Variablen setzen
-        export PLATFORMIO_BUILD_FLAGS="-D VERSION=\\"1.2.35\\" -DNDEBUG"
-        
-        echo "Building project..."
-        pio run -e esp32dev -v
-        
+        source venv/bin/activate
         echo "Building SPIFFS..."
-        pio run -e esp32dev -t buildfs -v
+        platformio run -t buildfs
         
-        echo "Build output:"
-        ls -la .pio/build/esp32dev/
+        echo "Building firmware..."
+        platformio run
 
-    - name: Merge Firmware Files
+    - name: Create Release Files
       run: |
-        pip install esptool==4.5.1
-        
-        echo "Available files:"
-        ls -la .pio/build/esp32dev/
-        
+        source venv/bin/activate
+        echo "Creating release files..."
         esptool.py --chip esp32 merge_bin \
           --flash_mode dio \
           --flash_freq 40m \
@@ -101,66 +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
+          0x3D0000 .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: Read CHANGELOG.md
+      id: changelog
+      run: |
+        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
-      shell: bash
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
-        SERVER_URL: ${{ inputs.server_url }}
+        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: |
-        # Basis-Variablen
-        API_BASE="${GITEA_SERVER_URL:-${SERVER_URL}}/api/v1"
-        REPO="${GITEA_REPOSITORY}"
+        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 "Release configuration:"
-        echo "API Base: $API_BASE"
-        echo "Repository: $REPO"
-        echo "Tag: $TAG"
+        echo "Creating release for ${TAG} on ${REPO}..."
         
-        # 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 \
+        # Create release
+        RESPONSE=$(curl -k -s \
           -X POST \
           -H "Authorization: token ${TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
-          "${API_BASE}/repos/${REPO}/releases")
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
+          "${API_URL}/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)
+        UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
         
         if [ -n "$RELEASE_ID" ]; then
           echo "Release created with ID: $RELEASE_ID"
           
-          # Binärdateien hochladen
+          # Upload files
           for file in "filaman_full.bin" "filaman_ota.bin"; do
             echo "Uploading $file..."
-            curl -k -v \
+            curl -k -s \
               -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"
+              "${UPLOAD_URL}?name=$file"
           done
-          
-          echo "Upload completed"
         else
-          echo "Failed to create release"
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
           exit 1
         fi

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

@@ -40,7 +40,7 @@ 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: |

.github/workflows/release.yml

@@ -10,7 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       provider: ${{ steps.provider.outputs.provider }}
-      server_url: ${{ steps.provider.outputs.server_url }}
+      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
@@ -28,27 +30,17 @@ jobs:
         id: provider
         shell: bash
         run: |
-          # 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
+            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
-            PROVIDER="github"
+            echo "provider=github" >> "$GITHUB_OUTPUT"
+          else
+            echo "provider=unknown" >> "$GITHUB_OUTPUT"
           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
@@ -56,7 +48,6 @@ jobs:
       - 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
@@ -72,6 +63,8 @@ jobs:
     if: needs.route.outputs.provider == 'gitea'
     uses: ./.github/workflows/providers/gitea-release.yml
     with:
-      server_url: ${{ needs.route.outputs.server_url }}
+      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,121 @@
 # Changelog
 
+## [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

html/header.html

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

html/index.html

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

html/rfid.html

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

html/spoolman.html

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

html/upgrade.html

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

html/waage.html

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

html/wifi.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.29</span></h1>
+                <h1>FilaMan<span class="version">v1.2.58</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.36"
+version = "1.2.58"
 
 [env:esp32dev]
 platform = espressif32