Compare commits
	
		
			55 Commits
		
	
	
		
			v1.2.36
			...
			04b59f4809
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 04b59f4809 | |||
| b31861af67 | |||
| ce3b423dc1 | |||
| 05f275142f | |||
| 72af54bd20 | |||
| a1e30a3b7f | |||
| 8f8322e629 | |||
| 1e386c49af | |||
| 3070d75d07 | |||
| 34ee9badea | |||
| 6594af9540 | |||
| c21bd2d4ec | |||
| e5f895b560 | |||
| bb0f50ce1d | |||
| 499a08aa75 | |||
| 745d960f62 | |||
| 531d0fe9a2 | |||
| 2af23e8084 | |||
| cd204fdaa8 | |||
| d04ad42b5b | |||
| 8d80a8fb5a | |||
| 77032bf9ae | |||
| 3967366ae6 | |||
| cd391378c2 | |||
| 3fc3a689cb | |||
| bd5b32a3b0 | |||
| a5c999234c | |||
| f64d3e51ce | |||
| a650b7d860 | |||
| 14e98072aa | |||
| 0bc4c0565f | |||
| 4aa8e844ac | |||
| d7135fddc8 | |||
| 6e3e978839 | |||
| 33b0e79c18 | |||
| 787d878e83 | |||
| 1e24179b82 | |||
| 67027840f4 | |||
| 2755e9c863 | |||
| 7ae26fb0a9 | |||
| 98bcf98f1e | |||
| bc8ac32fee | |||
| ba74eca21d | |||
| d4e1cf1322 | |||
| 5170784e44 | |||
| ac323167d0 | |||
| 003de5bc00 | |||
| 83595cfadf | |||
| cfe21d63d7 | |||
| 63e72076ed | |||
| 2a011ee244 | |||
| 84dd2bd40b | |||
| 1449cacc0e | |||
| f1c2b2eb87 | |||
| 0f1a3b1d5b | 
							
								
								
									
										87
									
								
								.github/workflows/providers/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										87
									
								
								.github/workflows/providers/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -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
 | 
					 | 
				
			||||||
							
								
								
									
										168
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										168
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -3,11 +3,18 @@ name: Gitea Release
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  workflow_call:
 | 
					  workflow_call:
 | 
				
			||||||
    inputs:
 | 
					    inputs:
 | 
				
			||||||
      server_url:
 | 
					      gitea_ref_name:
 | 
				
			||||||
        description: 'Gitea server URL'
 | 
					        description: 'Gitea ref name'
 | 
				
			||||||
        required: false
 | 
					        required: true
 | 
				
			||||||
 | 
					        type: string
 | 
				
			||||||
 | 
					      gitea_server_url:
 | 
				
			||||||
 | 
					        description: 'Gitea server URL'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
 | 
					        type: string
 | 
				
			||||||
 | 
					      gitea_repository:
 | 
				
			||||||
 | 
					        description: 'Gitea repository'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
        type: string
 | 
					        type: string
 | 
				
			||||||
        default: 'https://gitea.your-domain.com'
 | 
					 | 
				
			||||||
    secrets:
 | 
					    secrets:
 | 
				
			||||||
      GITEA_TOKEN:
 | 
					      GITEA_TOKEN:
 | 
				
			||||||
        required: true
 | 
					        required: true
 | 
				
			||||||
@@ -15,84 +22,40 @@ on:
 | 
				
			|||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  create-release:
 | 
					  create-release:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    environment: production
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - name: Checkout Repository
 | 
					    - name: Checkout Repository
 | 
				
			||||||
      uses: actions/checkout@v4
 | 
					      uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					 | 
				
			||||||
        fetch-depth: 0
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Set up Python
 | 
					    - name: Install System Dependencies
 | 
				
			||||||
      uses: actions/setup-python@v4
 | 
					 | 
				
			||||||
      with:
 | 
					 | 
				
			||||||
        python-version: '3.9'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    - name: Install Build Dependencies
 | 
					 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        echo "Current directory: $(pwd)"
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        # Systemabhängigkeiten
 | 
					 | 
				
			||||||
        sudo apt-get update
 | 
					        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
 | 
					    - name: Set up Python Virtual Environment
 | 
				
			||||||
        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: |
 | 
					      run: |
 | 
				
			||||||
        # PlatformIO Core initialisieren
 | 
					        python3 -m venv venv
 | 
				
			||||||
        pio platform install "espressif32"
 | 
					        source venv/bin/activate
 | 
				
			||||||
 | 
					        pip install --upgrade pip
 | 
				
			||||||
 | 
					        pip install platformio esptool
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        echo "Installing libraries..."
 | 
					        echo "Verifying installations:"
 | 
				
			||||||
        pio lib install \
 | 
					        platformio --version
 | 
				
			||||||
          "tzapu/WiFiManager @ ^2.0.17" \
 | 
					        python3 --version
 | 
				
			||||||
          "https://github.com/me-no-dev/ESPAsyncWebServer.git" \
 | 
					        esptool.py version
 | 
				
			||||||
          "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:"
 | 
					    - name: Build Firmware
 | 
				
			||||||
        pio lib list
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    - name: Build Project
 | 
					 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        # PlatformIO Core Variablen setzen
 | 
					        source venv/bin/activate
 | 
				
			||||||
        export PLATFORMIO_BUILD_FLAGS="-D VERSION=\\"1.2.35\\" -DNDEBUG"
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        echo "Building project..."
 | 
					 | 
				
			||||||
        pio run -e esp32dev -v
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        echo "Building SPIFFS..."
 | 
					        echo "Building SPIFFS..."
 | 
				
			||||||
        pio run -e esp32dev -t buildfs -v
 | 
					        platformio run -t buildfs
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        echo "Build output:"
 | 
					        echo "Building firmware..."
 | 
				
			||||||
        ls -la .pio/build/esp32dev/
 | 
					        platformio run
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Merge Firmware Files
 | 
					    - name: Create Release Files
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        pip install esptool==4.5.1
 | 
					        source venv/bin/activate
 | 
				
			||||||
        
 | 
					        echo "Creating release files..."
 | 
				
			||||||
        echo "Available files:"
 | 
					 | 
				
			||||||
        ls -la .pio/build/esp32dev/
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        esptool.py --chip esp32 merge_bin \
 | 
					        esptool.py --chip esp32 merge_bin \
 | 
				
			||||||
          --flash_mode dio \
 | 
					          --flash_mode dio \
 | 
				
			||||||
          --flash_freq 40m \
 | 
					          --flash_freq 40m \
 | 
				
			||||||
@@ -101,66 +64,71 @@ jobs:
 | 
				
			|||||||
          0x1000 .pio/build/esp32dev/bootloader.bin \
 | 
					          0x1000 .pio/build/esp32dev/bootloader.bin \
 | 
				
			||||||
          0x8000 .pio/build/esp32dev/partitions.bin \
 | 
					          0x8000 .pio/build/esp32dev/partitions.bin \
 | 
				
			||||||
          0x10000 .pio/build/esp32dev/firmware.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
 | 
					        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        echo "Final binaries:"
 | 
					    - name: Read CHANGELOG.md
 | 
				
			||||||
        ls -la .pio/build/esp32dev/filaman_*.bin
 | 
					      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
 | 
					    - name: Create Release
 | 
				
			||||||
      shell: bash
 | 
					 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        TOKEN: ${{ secrets.GITEA_TOKEN }}
 | 
					        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: |
 | 
					      run: |
 | 
				
			||||||
        # Basis-Variablen
 | 
					        echo "Debug environment:"
 | 
				
			||||||
        API_BASE="${GITEA_SERVER_URL:-${SERVER_URL}}/api/v1"
 | 
					        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
 | 
				
			||||||
        REPO="${GITEA_REPOSITORY}"
 | 
					        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
 | 
				
			||||||
 | 
					        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
 | 
				
			||||||
 | 
					        echo "CHANGELOG: ${CHANGELOG}"
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
        TAG="${GITEA_REF_NAME}"
 | 
					        TAG="${GITEA_REF_NAME}"
 | 
				
			||||||
 | 
					        API_URL="${GITEA_SERVER_URL}/api/v1"
 | 
				
			||||||
 | 
					        REPO="${GITEA_REPOSITORY}"
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        echo "Release configuration:"
 | 
					        echo "Creating release for ${TAG} on ${REPO}..."
 | 
				
			||||||
        echo "API Base: $API_BASE"
 | 
					 | 
				
			||||||
        echo "Repository: $REPO"
 | 
					 | 
				
			||||||
        echo "Tag: $TAG"
 | 
					 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Test API-Verbindung
 | 
					        # Create release
 | 
				
			||||||
        echo "Testing API connection..."
 | 
					        RESPONSE=$(curl -k -s \
 | 
				
			||||||
        curl -k -v \
 | 
					 | 
				
			||||||
          -H "Authorization: token ${TOKEN}" \
 | 
					 | 
				
			||||||
          "${API_BASE}/version"
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        # Release erstellen
 | 
					 | 
				
			||||||
        echo "Creating release..."
 | 
					 | 
				
			||||||
        RESPONSE=$(curl -k -v \
 | 
					 | 
				
			||||||
          -X POST \
 | 
					          -X POST \
 | 
				
			||||||
          -H "Authorization: token ${TOKEN}" \
 | 
					          -H "Authorization: token ${TOKEN}" \
 | 
				
			||||||
          -H "Content-Type: application/json" \
 | 
					          -H "Content-Type: application/json" \
 | 
				
			||||||
          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
 | 
					          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
 | 
				
			||||||
          "${API_BASE}/repos/${REPO}/releases")
 | 
					          "${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)
 | 
					        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
 | 
					        if [ -n "$RELEASE_ID" ]; then
 | 
				
			||||||
          echo "Release created with ID: $RELEASE_ID"
 | 
					          echo "Release created with ID: $RELEASE_ID"
 | 
				
			||||||
          
 | 
					          
 | 
				
			||||||
          # Binärdateien hochladen
 | 
					          # Upload files
 | 
				
			||||||
          for file in "filaman_full.bin" "filaman_ota.bin"; do
 | 
					          for file in "filaman_full.bin" "filaman_ota.bin"; do
 | 
				
			||||||
            echo "Uploading $file..."
 | 
					            echo "Uploading $file..."
 | 
				
			||||||
            curl -k -v \
 | 
					            curl -k -s \
 | 
				
			||||||
              -X POST \
 | 
					              -X POST \
 | 
				
			||||||
              -H "Authorization: token ${TOKEN}" \
 | 
					              -H "Authorization: token ${TOKEN}" \
 | 
				
			||||||
              -H "Content-Type: application/octet-stream" \
 | 
					              -H "Content-Type: application/octet-stream" \
 | 
				
			||||||
              --data-binary "@.pio/build/esp32dev/$file" \
 | 
					              --data-binary "@.pio/build/esp32dev/$file" \
 | 
				
			||||||
              "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
 | 
					              "${UPLOAD_URL}?name=$file"
 | 
				
			||||||
          done
 | 
					          done
 | 
				
			||||||
          
 | 
					 | 
				
			||||||
          echo "Upload completed"
 | 
					 | 
				
			||||||
        else
 | 
					        else
 | 
				
			||||||
          echo "Failed to create release"
 | 
					          echo "Failed to create release. Response:"
 | 
				
			||||||
 | 
					          echo "$RESPONSE"
 | 
				
			||||||
          exit 1
 | 
					          exit 1
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
@@ -40,7 +40,7 @@ jobs:
 | 
				
			|||||||
          0x1000 .pio/build/esp32dev/bootloader.bin \
 | 
					          0x1000 .pio/build/esp32dev/bootloader.bin \
 | 
				
			||||||
          0x8000 .pio/build/esp32dev/partitions.bin \
 | 
					          0x8000 .pio/build/esp32dev/partitions.bin \
 | 
				
			||||||
          0x10000 .pio/build/esp32dev/firmware.bin \
 | 
					          0x10000 .pio/build/esp32dev/firmware.bin \
 | 
				
			||||||
          0x290000 .pio/build/esp32dev/spiffs.bin
 | 
					          0x3D0000 .pio/build/esp32dev/spiffs.bin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Prepare OTA firmware
 | 
					    - name: Prepare OTA firmware
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										33
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										33
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -10,7 +10,9 @@ jobs:
 | 
				
			|||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    outputs:
 | 
					    outputs:
 | 
				
			||||||
      provider: ${{ steps.provider.outputs.provider }}
 | 
					      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:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout Repository
 | 
					      - name: Checkout Repository
 | 
				
			||||||
        uses: actions/checkout@v3
 | 
					        uses: actions/checkout@v3
 | 
				
			||||||
@@ -28,27 +30,17 @@ jobs:
 | 
				
			|||||||
        id: provider
 | 
					        id: provider
 | 
				
			||||||
        shell: bash
 | 
					        shell: bash
 | 
				
			||||||
        run: |
 | 
					        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
 | 
					          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
 | 
				
			||||||
            PROVIDER="gitea"
 | 
					            echo "provider=gitea" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
            SERVER_URL="${GITEA_SERVER_URL}"
 | 
					            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
          # Then check for GitHub
 | 
					            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
 | 
					            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
 | 
					          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
 | 
				
			||||||
            PROVIDER="github"
 | 
					            echo "provider=github" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
 | 
					          else
 | 
				
			||||||
 | 
					            echo "provider=unknown" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
          fi
 | 
					          fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          echo "Detected provider: ${PROVIDER}"
 | 
					 | 
				
			||||||
          echo "Server URL: ${SERVER_URL}"
 | 
					 | 
				
			||||||
          
 | 
					 | 
				
			||||||
          {
 | 
					 | 
				
			||||||
            echo "provider=${PROVIDER}"
 | 
					 | 
				
			||||||
            echo "server_url=${SERVER_URL}"
 | 
					 | 
				
			||||||
          } >> "$GITHUB_OUTPUT"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  verify-provider:
 | 
					  verify-provider:
 | 
				
			||||||
    needs: route
 | 
					    needs: route
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
@@ -56,7 +48,6 @@ jobs:
 | 
				
			|||||||
      - name: Echo detected provider
 | 
					      - name: Echo detected provider
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
 | 
					          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
 | 
				
			||||||
          echo "Server URL: ${{ needs.route.outputs.server_url }}"
 | 
					 | 
				
			||||||
          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
 | 
					          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
 | 
				
			||||||
            echo "::error::Failed to detect CI provider!"
 | 
					            echo "::error::Failed to detect CI provider!"
 | 
				
			||||||
            exit 1
 | 
					            exit 1
 | 
				
			||||||
@@ -72,6 +63,8 @@ jobs:
 | 
				
			|||||||
    if: needs.route.outputs.provider == 'gitea'
 | 
					    if: needs.route.outputs.provider == 'gitea'
 | 
				
			||||||
    uses: ./.github/workflows/providers/gitea-release.yml
 | 
					    uses: ./.github/workflows/providers/gitea-release.yml
 | 
				
			||||||
    with:
 | 
					    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:
 | 
					    secrets:
 | 
				
			||||||
      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
 | 
					      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
 | 
				
			||||||
							
								
								
									
										140
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										140
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,145 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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
 | 
					## [1.2.36] - 2025-02-19
 | 
				
			||||||
### Added
 | 
					### Added
 | 
				
			||||||
- update Gitea release workflow and increment version to 1.2.36
 | 
					- update Gitea release workflow and increment version to 1.2.36
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
					        <div style="display: flex; align-items: center; gap: 2rem;">
 | 
				
			||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version">v1.2.29</span></h1>
 | 
					                <h1>FilaMan<span class="version">v1.2.61</span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.2.36"
 | 
					version = "1.2.61"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[env:esp32dev]
 | 
					[env:esp32dev]
 | 
				
			||||||
platform = espressif32
 | 
					platform = espressif32
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								src/ota.cpp
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								src/ota.cpp
									
									
									
									
									
								
							@@ -16,18 +16,33 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
 | 
				
			|||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (!Update.begin(contentLength)) {
 | 
					        // Determine if this is a full image (firmware + SPIFFS) or just firmware
 | 
				
			||||||
            Serial.printf("Not enough space: %u required\n", contentLength);
 | 
					        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
 | 
				
			||||||
            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
 | 
					
 | 
				
			||||||
            return;
 | 
					        if (isFullImage) {
 | 
				
			||||||
 | 
					            // For full images, we need to make sure we have enough space and properly partition it
 | 
				
			||||||
 | 
					            if (!Update.begin(ESP.getFreeSketchSpace(), U_FLASH)) {
 | 
				
			||||||
 | 
					                Serial.printf("Not enough space for full image: %u bytes required\n", contentLength);
 | 
				
			||||||
 | 
					                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Full image updates are not supported via OTA. Please use USB update for full images.\"}");
 | 
				
			||||||
 | 
					                return;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            // For firmware-only updates
 | 
				
			||||||
 | 
					            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 for firmware update\"}");
 | 
				
			||||||
 | 
					                return;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        Serial.println("Update started");
 | 
					        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 | 
					    // Write chunk to flash
 | 
				
			||||||
    if (Update.write(data, len) != len) {
 | 
					    if (Update.write(data, len) != len) {
 | 
				
			||||||
        Update.printError(Serial);
 | 
					        Update.printError(Serial);
 | 
				
			||||||
        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
 | 
					        String errorMsg = Update.errorString();
 | 
				
			||||||
 | 
					        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -38,8 +53,9 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
 | 
				
			|||||||
            delay(1000);
 | 
					            delay(1000);
 | 
				
			||||||
            ESP.restart();
 | 
					            ESP.restart();
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 | 
					            String errorMsg = Update.errorString();
 | 
				
			||||||
            Update.printError(Serial);
 | 
					            Update.printError(Serial);
 | 
				
			||||||
            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
 | 
					            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user