docs: update changelog for version 1.3.35

.github/workflows/gitea-release.yml

@@ -2,6 +2,10 @@ name: Gitea Release
 
 on:
   workflow_call:
+    secrets:
+      GITEA_TOKEN:
+        description: 'Token für Gitea API-Zugriff'
+        required: true
 
 jobs:
   create-release:
@@ -36,8 +40,11 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary
+        # Create SPIFFS binary with ESP32 image header
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
+        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Append the actual SPIFFS data
+        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary
         (cd .pio/build/esp32dev && 
@@ -50,7 +57,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x410000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"
@@ -71,70 +78,91 @@ jobs:
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
 
+    - name: Determine Gitea URL
+      id: gitea_url
+      run: |
+        echo "Debug Environment:"
+        echo "GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-not set}"
+        echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
+        echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}"
+        echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
+        echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
+        
+        # Set API URL based on environment
+        if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
+          GITEA_API_URL="${GITHUB_SERVER_URL}"
+          GITEA_REPO=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f2)
+          GITEA_OWNER=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f1)
+        else
+          echo "Error: This workflow is only for Gitea"
+          exit 1
+        fi
+        
+        echo "GITEA_API_URL=${GITEA_API_URL}" >> $GITHUB_OUTPUT
+        echo "GITEA_REPO=${GITEA_REPO}" >> $GITHUB_OUTPUT
+        echo "GITEA_OWNER=${GITEA_OWNER}" >> $GITHUB_OUTPUT
+
     - name: Create Gitea Release
       env:
         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }}
-        GITEA_REPO: ${{ secrets.GITEA_REPO }}
+        GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }}
-        GITEA_OWNER: ${{ secrets.GITEA_OWNER }}
+        GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }}
       run: |
+        # Debug Token (nur Länge ausgeben für Sicherheit)
+        echo "Debug: Token length: ${#GITEA_TOKEN}"
+        if [ -z "$GITEA_TOKEN" ]; then
+          echo "Error: GITEA_TOKEN is empty"
+          exit 1
+        fi
+
         VERSION=${{ steps.get_version.outputs.VERSION }}
         cd .pio/build/esp32dev
         
         # Debug-Ausgaben
-        echo "Debug: Checking API URL..."
+        echo "Debug: API URL: ${GITEA_API_URL}"
-        echo "GITEA_API_URL=${GITEA_API_URL}"
+        echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}"
         
-        # Prepare files for upload
+        # Erstelle zuerst den Release ohne Dateien
-        FILES=""
-        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
-          if [ -f "$file" ]; then
-            FILES="$FILES -a $file"
-            echo "Debug: Found file: $file"
-          fi
-        done
-        
-        # Check if tag exists
-        if ! git rev-parse "v${VERSION}" >/dev/null 2>&1; then
-          echo "Debug: Creating new tag v${VERSION}"
-          git tag -a "v${VERSION}" -m "Release ${VERSION}"
-          git push origin "v${VERSION}"
-        else
-          echo "Debug: Tag v${VERSION} already exists"
-        fi
-
-        # Test API connection
-        echo "Debug: Testing API connection..."
-        TEST_RESPONSE=$(curl -s -w "\n%{http_code}" -H "Authorization: token ${GITEA_TOKEN}" "${GITEA_API_URL}/api/v1/version")
-        TEST_STATUS=$(echo "$TEST_RESPONSE" | tail -n1)
-        if [ "$TEST_STATUS" != "200" ]; then
-          echo "Error: Cannot connect to Gitea API"
-          echo "Response: $TEST_RESPONSE"
-          exit 1
-        fi
-
-        # Create Gitea release using API
         echo "Debug: Creating release..."
-        RELEASE_DATA="{
+        RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}"
-          \"tag_name\": \"v${VERSION}\",
+        
-          \"name\": \"v${VERSION}\",
+        RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \
-          \"body\": \"${{ steps.changelog.outputs.CHANGES }}\"
+          -X POST \
-        }"
-
-        # Create release and capture HTTP status
-        RESPONSE=$(curl -v -s -w "\n%{http_code}" -X POST \
           -H "Authorization: token ${GITEA_TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "$RELEASE_DATA" \
+          -d "${RELEASE_DATA}" \
           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases")
         
-        HTTP_STATUS=$(echo "$RESPONSE" | tail -n1)
+        RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1)
-        RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1)
+        RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1)
-
+        
-        echo "Debug: HTTP Status: $HTTP_STATUS"
+        if [ "$RELEASE_STATUS" != "201" ]; then
-        echo "Debug: Response Body: $RESPONSE_BODY"
+          echo "Error: Failed to create release"
-
+          echo "Response: $RELEASE_BODY"
-        if [ "$HTTP_STATUS" != "201" ]; then
-          echo "Fehler beim Erstellen des Releases: $RESPONSE_BODY"
           exit 1
-        fi
+        fi
+        
+        # Extrahiere die Release-ID aus der Antwort
+        RELEASE_ID=$(echo "$RELEASE_BODY" | grep -o '"id":[0-9]*' | cut -d':' -f2)
+        
+        # Lade die Dateien einzeln hoch
+        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
+          if [ -f "$file" ]; then
+            echo "Debug: Uploading $file..."
+            UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
+              -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"$file" \
+              "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${RELEASE_ID}/assets?name=${file}")
+            
+            UPLOAD_STATUS=$(echo "$UPLOAD_RESPONSE" | tail -n1)
+            if [ "$UPLOAD_STATUS" != "201" ]; then
+              echo "Warning: Failed to upload $file"
+              echo "Response: $(echo "$UPLOAD_RESPONSE" | head -n -1)"
+            else
+              echo "Successfully uploaded $file"
+            fi
+          fi
+        done

.github/workflows/github-release.yml

@@ -35,28 +35,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
-    - name: Check for Data changes
-      id: check_data
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/"; then
-          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Check for SPIFFS changes
-      id: check_spiffs
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
-          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-    
     - name: Build Firmware
       run: |
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
@@ -69,8 +47,11 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Always create SPIFFS binary
+        # Create SPIFFS binary with ESP32 image header
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
+        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Append the actual SPIFFS data
+        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary (always)
         (cd .pio/build/esp32dev && 
@@ -83,7 +64,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x410000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"
@@ -115,12 +96,12 @@ jobs:
         FILES_TO_UPLOAD=""
         
         # Always add firmware
-        if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then
+        if [ -f "upgrade_filaman_firmware_v${VERSION}.bin" ]; then
           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
         fi
         
         # Add SPIFFS and full binary only if they exist
-        if [ -f "update_filaman_website_v${VERSION}.bin" ]; then
+        if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
         fi
         

.github/workflows/release.yml

@@ -36,4 +36,6 @@ jobs:
   gitea-release:
     needs: detect-provider
     if: needs.detect-provider.outputs.provider == 'gitea'
-    uses: ./.github/workflows/gitea-release.yml
+    uses: ./.github/workflows/gitea-release.yml
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,87 @@
 # Changelog
 
+## [1.3.35] - 2025-02-22
+### Changed
+- update webpages for version v1.3.35
+- partition: update SPIFFS binary header and offsets in workflow files
+
+
+## [1.3.34] - 2025-02-22
+### Changed
+- update webpages for version v1.3.34
+- partition: update SPIFFS binary creation and offsets in workflow files
+
+
+## [1.3.33] - 2025-02-22
+### Changed
+- update webpages for version v1.3.33
+- partition: update spiffs offset and app sizes in partition files
+- partition: update spiffs offset in partition files
+- partition: update app sizes and offsets in partitions.csv
+
+
+## [1.3.32] - 2025-02-22
+### Changed
+- update webpages for version v1.3.32
+- workflow: update magic byte for SPIFFS binary creation
+
+
+## [1.3.31] - 2025-02-22
+### Changed
+- update webpages for version v1.3.31
+- workflow: remove unnecessary data and SPIFFS change checks from release workflows
+
+
+## [1.3.30] - 2025-02-22
+### Changed
+- update webpages for version v1.3.30
+- workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte
+
+
+## [1.3.29] - 2025-02-21
+### Changed
+- update webpages for version v1.3.29
+- workflow: update Gitea release workflow to create release before file uploads
+
+
+## [1.3.28] - 2025-02-21
+### Changed
+- update webpages for version v1.3.28
+- workflow: update Gitea release workflow to use file uploads with curl
+
+
+## [1.3.27] - 2025-02-21
+### Added
+- workflow: add GITEA_TOKEN secret for Gitea API access in release workflows
+
+### Changed
+- update webpages for version v1.3.27
+
+
+## [1.3.26] - 2025-02-21
+### Changed
+- update webpages for version v1.3.26
+
+### Fixed
+- workflow: improve Gitea release workflow with enhanced error handling and debug outputs
+
+
+## [1.3.25] - 2025-02-21
+### Changed
+- update webpages for version v1.3.25
+- workflow: update Gitea release workflow to include RUNNER_NAME and improve error handling
+
+
+## [1.3.24] - 2025-02-21
+### Changed
+- update webpages for version v1.3.24
+- workflow: rename update files to upgrade in GitHub release workflow
+- workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen
+
+### Fixed
+- workflow: improve Gitea release process with dynamic URL determination and debug outputs
+
+
 ## [1.3.23] - 2025-02-21
 ### Changed
 - update webpages for version v1.3.23

html/upgrade.html

@@ -167,12 +167,12 @@
             }
 
             // Validate file name pattern
-            if (updateType === 'firmware' && !file.name.startsWith('filaman_')) {
+            if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) {
-                alert('Please select a valid firmware file (filaman_*.bin)');
+                alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)');
                 return;
             }
-            if (updateType === 'webpage' && !file.name.startsWith('webpage_')) {
+            if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) {
-                alert('Please select a valid webpage file (webpage_*.bin)');
+                alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)');
                 return;
             }
             

partitions.csv

@@ -1,6 +1,6 @@
 # Name,   Type, SubType,    Offset,   Size,     Flags
 nvs,      data, nvs,       0x9000,   0x5000,
 otadata,  data, ota,       0xe000,   0x2000,
-app0,     app,  ota_0,     0x10000,  0x180000,
+app0,     app,  ota_0,     0x10000,  0x200000,
-app1,     app,  ota_1,     0x190000, 0x180000,
+app1,     app,  ota_1,     0x210000, 0x200000,
-spiffs,   data, spiffs,    0x310000, 0xE0000,
+spiffs,   data, spiffs,    0x410000, 0x60000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.23"
+version = "1.3.35"
 
 #test
 

scripts/update_changelog.py

@@ -122,29 +122,29 @@ def update_changelog():
                 f.write(updated_content)
             push_changes(version)
         else:
-            # Version existiert bereits, füge neue Einträge unter der existierenden Version ein
+            # Version existiert bereits, aktualisiere die bestehenden Einträge
             version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
             next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}"
             
             # Finde den Start der aktuellen Version
             version_match = re.search(version_pattern, content)
             if version_match:
-                version_start = version_match.end()
+                version_start = version_match.start()
                 # Suche nach der nächsten Version
-                next_version_match = re.search(next_version_pattern, content[version_start:])
+                next_version_match = re.search(next_version_pattern, content[version_start + 1:])
                 
                 if next_version_match:
-                    # Füge zwischen aktueller und nächster Version ein
+                    # Ersetze den Inhalt zwischen aktueller und nächster Version
-                    insert_pos = version_start + next_version_match.start()
+                    next_version_pos = version_start + 1 + next_version_match.start()
-                    updated_content = content[:insert_pos] + "\n" + changelog_entry + content[insert_pos:]
+                    updated_content = content[:version_start] + changelog_entry + content[next_version_pos:]
                 else:
-                    # Füge am Ende des Abschnitts ein
+                    # Wenn keine nächste Version existiert, ersetze bis zum Ende
-                    updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:]
+                    updated_content = content[:version_start] + changelog_entry + "\n"
                 
                 with open(changelog_path, 'w') as f:
                     f.write(updated_content)
                 push_changes(version)
-                print(f"Added new entries to existing version {version}")
+                print(f"Updated entries for version {version}")
 
 if __name__ == "__main__":
     update_changelog()