Compare commits
	
		
			91 Commits
		
	
	
		
			v1.2.43
			...
			c374069f36
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c374069f36 | |||
| 59cd7c177d | |||
| 45088b5838 | |||
| 1b9c79b559 | |||
| 37e1e861d3 | |||
| cce39319d9 | |||
| 6391054c23 | |||
| 52cf46d7f8 | |||
| 84b05e48ce | |||
| 5c41d864c1 | |||
| 5dc3563da6 | |||
| 9e1b2943d6 | |||
| 7b89b04621 | |||
| e140f8e003 | |||
| 3d0bdde476 | |||
| 3ac7d6b4f7 | |||
| 5f52775984 | |||
| 463eaf4b6f | |||
| 4bf6b11d3a | |||
| b0c4af7c4e | |||
| 249e896ea4 | |||
| c74f587fff | |||
| 7a7ee72585 | |||
| 3dd5fbc585 | |||
| ed9c1487ed | |||
| d8756421a1 | |||
| d92c78f9d0 | |||
| 2d19ea745f | |||
| 13779cc9d7 | |||
| b6d5a8a00b | |||
| f6319e79f0 | |||
| 6f24630a7d | |||
| 4475d21218 | |||
| 01a926a38d | |||
| 6b966c02b3 | |||
| 1450e1ad2e | |||
| 3102a6c217 | |||
| d5b2b2746d | |||
| 7e776d4816 | |||
| e84b2973c5 | |||
| 5793dc1a1f | |||
| 1732491c48 | |||
| 0500bb6951 | |||
| ef9ef7257a | |||
| e86fd229dc | |||
| b940a166da | |||
| c857e16de2 | |||
| 8b2a537b72 | |||
| 88ec151c4c | |||
| 0a203f02eb | |||
| 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 | 
							
								
								
									
										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 |  | ||||||
							
								
								
									
										88
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										88
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,15 +4,12 @@ on: | |||||||
|   workflow_call: |   workflow_call: | ||||||
|     inputs: |     inputs: | ||||||
|       gitea_ref_name: |       gitea_ref_name: | ||||||
|         description: 'Gitea ref name' |  | ||||||
|         required: true |         required: true | ||||||
|         type: string |         type: string | ||||||
|       gitea_server_url: |       gitea_server_url: | ||||||
|         description: 'Gitea server URL' |  | ||||||
|         required: true |         required: true | ||||||
|         type: string |         type: string | ||||||
|       gitea_repository: |       gitea_repository: | ||||||
|         description: 'Gitea repository' |  | ||||||
|         required: true |         required: true | ||||||
|         type: string |         type: string | ||||||
|     secrets: |     secrets: | ||||||
| @@ -23,39 +20,29 @@ jobs: | |||||||
|   create-release: |   create-release: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout Repository |     - uses: actions/checkout@v4 | ||||||
|       uses: actions/checkout@v4 |      | ||||||
|  |     - name: Set up Python | ||||||
|     - name: Install System Dependencies |       uses: actions/setup-python@v4 | ||||||
|  |       with: | ||||||
|  |         python-version: '3.x' | ||||||
|  |      | ||||||
|  |     - name: Install PlatformIO | ||||||
|       run: | |       run: | | ||||||
|         sudo apt-get update |         python -m pip install --upgrade pip | ||||||
|         sudo apt-get install -y python3 python3-venv build-essential curl git |         pip install --upgrade platformio | ||||||
|  |      | ||||||
|     - name: Set up Python Virtual Environment |  | ||||||
|       run: | |  | ||||||
|         python3 -m venv venv |  | ||||||
|         source venv/bin/activate |  | ||||||
|         pip install --upgrade pip |  | ||||||
|         pip install platformio esptool |  | ||||||
|          |  | ||||||
|         echo "Verifying installations:" |  | ||||||
|         platformio --version |  | ||||||
|         python3 --version |  | ||||||
|         esptool.py version |  | ||||||
|  |  | ||||||
|     - name: Build Firmware |     - name: Build Firmware | ||||||
|       run: | |       run: | | ||||||
|         source venv/bin/activate |         pio run -t buildfs  # Build SPIFFS | ||||||
|         echo "Building SPIFFS..." |         pio run            # Build firmware | ||||||
|         platformio run -t buildfs |  | ||||||
|          |          | ||||||
|         echo "Building firmware..." |     - name: Install esptool | ||||||
|         platformio run |       run: | | ||||||
|  |         pip install esptool | ||||||
|     - name: Create Release Files |          | ||||||
|  |     - name: Merge firmware and SPIFFS | ||||||
|       run: | |       run: | | ||||||
|         source venv/bin/activate |  | ||||||
|         echo "Creating release files..." |  | ||||||
|         esptool.py --chip esp32 merge_bin \ |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --flash_mode dio \ |           --flash_mode dio \ | ||||||
|           --flash_freq 40m \ |           --flash_freq 40m \ | ||||||
| @@ -64,49 +51,46 @@ 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 |  | ||||||
|  |  | ||||||
|  |     - name: Prepare OTA firmware | ||||||
|  |       run: | | ||||||
|  |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||||
|  |      | ||||||
|     - name: Create Release |     - name: Create Release | ||||||
|       env: |       env: | ||||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} |         TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||||
|         GITEA_REF_NAME: ${{ inputs.gitea_ref_name }} |  | ||||||
|         GITEA_SERVER_URL: ${{ inputs.gitea_server_url }} |  | ||||||
|         GITEA_REPOSITORY: ${{ inputs.gitea_repository }} |  | ||||||
|       run: | |       run: | | ||||||
|         echo "Debug environment:" |         TAG="${{ inputs.gitea_ref_name }}" | ||||||
|         echo "GITEA_REF_NAME: ${GITEA_REF_NAME}" |         API_URL="${{ inputs.gitea_server_url }}/api/v1" | ||||||
|         echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}" |         REPO="${{ inputs.gitea_repository }}" | ||||||
|         echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}" |  | ||||||
|          |  | ||||||
|         TAG="${GITEA_REF_NAME}" |  | ||||||
|         API_URL="${GITEA_SERVER_URL}/api/v1" |  | ||||||
|         REPO="${GITEA_REPOSITORY}" |  | ||||||
|          |  | ||||||
|         echo "Creating release for ${TAG} on ${REPO}..." |  | ||||||
|          |          | ||||||
|         # Create release |         # Create release | ||||||
|         RESPONSE=$(curl -k -s \ |         RESPONSE=$(curl -k -s \ | ||||||
|           -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\":\"${{ steps.changelog.outputs.CHANGES }}\" | ||||||
|  |           }" \ | ||||||
|           "${API_URL}/repos/${REPO}/releases") |           "${API_URL}/repos/${REPO}/releases") | ||||||
|          |          | ||||||
|         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) | ||||||
|          |          | ||||||
|         if [ -n "$RELEASE_ID"; then |         if [ -n "$RELEASE_ID" ]; then | ||||||
|           echo "Release created with ID: $RELEASE_ID" |           echo "Release created with ID: $RELEASE_ID" | ||||||
|            |            | ||||||
|           # Upload files |           # Upload binaries | ||||||
|           for file in "filaman_full.bin" "filaman_ota.bin"; do |           cd .pio/build/esp32dev | ||||||
|  |           for file in filaman_full.bin filaman_ota.bin; do | ||||||
|             echo "Uploading $file..." |             echo "Uploading $file..." | ||||||
|             curl -k -s \ |             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 "@$file" \ | ||||||
|               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" |               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" | ||||||
|           done |           done | ||||||
|         else |         else | ||||||
|   | |||||||
| @@ -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: | | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -10,6 +10,9 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     outputs: |     outputs: | ||||||
|       provider: ${{ steps.provider.outputs.provider }} |       provider: ${{ steps.provider.outputs.provider }} | ||||||
|  |       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 | ||||||
| @@ -20,6 +23,7 @@ jobs: | |||||||
|           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}" |           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}" | ||||||
|           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}" |           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}" | ||||||
|           echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-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}" |           echo "RUNNER_NAME=${RUNNER_NAME:-not set}" | ||||||
|  |  | ||||||
|       - name: Determine CI Provider |       - name: Determine CI Provider | ||||||
| @@ -28,6 +32,9 @@ jobs: | |||||||
|         run: | |         run: | | ||||||
|           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then |           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||||
|             echo "provider=gitea" >> "$GITHUB_OUTPUT" |             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 |           elif [ "${GITHUB_ACTIONS}" = "true" ]; then | ||||||
|             echo "provider=github" >> "$GITHUB_OUTPUT" |             echo "provider=github" >> "$GITHUB_OUTPUT" | ||||||
|           else |           else | ||||||
| @@ -55,5 +62,9 @@ jobs: | |||||||
|     needs: [route, verify-provider] |     needs: [route, verify-provider] | ||||||
|     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: | ||||||
|  |       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 }} | ||||||
							
								
								
									
										224
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										224
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,229 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.2.77] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - optimize Gitea release workflow by simplifying build steps and improving file handling | ||||||
|  | - update webpages for version v1.2.77 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.76] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - enhance OTA update process with improved file verification and new OTA data initialization | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.76 | ||||||
|  | - streamline Gitea release workflow and remove obsolete OTA data initialization script | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.75] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.75 | ||||||
|  | - simplify OTA update handling by removing unnecessary variables and improving error reporting | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.74] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.74 | ||||||
|  | - enhance OTA update process with improved handling of full image updates and SPIFFS data | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.73] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.73 | ||||||
|  | - improve OTA update process with enhanced size checks and progress logging | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - enhance OTA update process with improved size checks and debugging output | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.72] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.72 | ||||||
|  | - simplify OTA update process by removing unnecessary buffer and adjusting offsets | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.71] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.71 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.70] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - add logging to stopAllTasks for better debugging | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.70 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.69] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.69 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.68] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.68 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - update stopAllTasks to suspend RfidReaderTask instead of NfcTask | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.67] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - improve OTA upload handling and add SPIFFS update support | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.67 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.66] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - enhance OTA upload to support SPIFFS updates | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.66 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.65] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.65 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.64] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.64 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - improve error handling in OTA upload process | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.63] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.63 | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.63 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.62] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.62 | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version 1.2.62 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [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 | ## [1.2.43] - 2025-02-19 | ||||||
| ### Added | ### Added | ||||||
| - update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43 | - update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43 | ||||||
|   | |||||||
| @@ -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.77</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.77</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.77</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.77</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.77</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.77</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.77</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.43" | version = "1.2.77" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
| @@ -59,6 +59,13 @@ build_flags = | |||||||
|     -DOTA_PARTITION_SUBTYPE=0x10 |     -DOTA_PARTITION_SUBTYPE=0x10 | ||||||
|     -DPARTITION_TABLE_OFFSET=0x8000 |     -DPARTITION_TABLE_OFFSET=0x8000 | ||||||
|     -DPARTITION_TABLE_SIZE=0x1000 |     -DPARTITION_TABLE_SIZE=0x1000 | ||||||
|  |     -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1 | ||||||
|  |     -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1 | ||||||
|  |     -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1 | ||||||
|  |     -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000 | ||||||
|  |     -DCONFIG_PARTITION_TABLE_OFFSET=0x8000 | ||||||
|  |     -DCONFIG_PARTITION_TABLE_MD5=y | ||||||
|  |     -DBOOT_APP_PARTITION_OTA_0=1 | ||||||
|      |      | ||||||
| extra_scripts =  | extra_scripts =  | ||||||
|     scripts/extra_script.py |     scripts/extra_script.py | ||||||
|   | |||||||
| @@ -36,4 +36,5 @@ void mqtt_loop(void * parameter); | |||||||
| bool setBambuSpool(String payload); | bool setBambuSpool(String payload); | ||||||
| void bambu_restart(); | void bambu_restart(); | ||||||
|  |  | ||||||
|  | extern TaskHandle_t BambuMqttTask; | ||||||
| #endif | #endif | ||||||
|   | |||||||
							
								
								
									
										60
									
								
								src/ota.cpp
									
									
									
									
									
								
							
							
						
						
									
										60
									
								
								src/ota.cpp
									
									
									
									
									
								
							| @@ -3,44 +3,76 @@ | |||||||
| #include <Update.h> | #include <Update.h> | ||||||
| #include <SPIFFS.h> | #include <SPIFFS.h> | ||||||
| #include "commonFS.h" | #include "commonFS.h" | ||||||
|  | #include "bambu.h" | ||||||
|  | #include "scale.h" | ||||||
|  | #include "nfc.h" | ||||||
|  |  | ||||||
|  | static bool tasksAreStopped = false; | ||||||
|  |  | ||||||
|  | void stopAllTasks() { | ||||||
|  |     Serial.println("Stopping RFID Reader"); | ||||||
|  |     if (RfidReaderTask) vTaskSuspend(RfidReaderTask); | ||||||
|  |     Serial.println("Stopping Bambu"); | ||||||
|  |     if (BambuMqttTask) vTaskSuspend(BambuMqttTask); | ||||||
|  |     Serial.println("Stopping Scale"); | ||||||
|  |     if (ScaleTask) vTaskSuspend(ScaleTask); | ||||||
|  |     vTaskDelay(100 / portTICK_PERIOD_MS); | ||||||
|  |     Serial.println("All tasks stopped"); | ||||||
|  | } | ||||||
|  |  | ||||||
| void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { | void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { | ||||||
|     static size_t contentLength = 0; |     static size_t contentLength = 0; | ||||||
|      |      | ||||||
|     if (!index) { |     if (!index) { | ||||||
|         contentLength = request->contentLength(); |         contentLength = request->contentLength(); | ||||||
|         Serial.printf("Update size: %u bytes\n", contentLength); |         Serial.printf("Update Start: %s (size: %u bytes)\n", filename.c_str(), contentLength); | ||||||
|          |          | ||||||
|         if (contentLength == 0) { |         if (contentLength == 0) { | ||||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}"); |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}"); | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         if (!Update.begin(contentLength)) { |         // Stoppe alle Tasks vor dem Update | ||||||
|             Serial.printf("Not enough space: %u required\n", contentLength); |         if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) { | ||||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); |             stopAllTasks(); | ||||||
|  |             tasksAreStopped = true; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         // Für full.bin keine Magic Byte Prüfung | ||||||
|  |         bool isFullImage = (contentLength > 0x300000); | ||||||
|  |         if (!isFullImage && data[0] != 0xE9) { | ||||||
|  |             Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]); | ||||||
|  |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}"); | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|          |  | ||||||
|         Serial.println("Update started"); |         // Bei full.bin UPDATE_SIZE_UNKNOWN verwenden | ||||||
|  |         if (!Update.begin(isFullImage ? UPDATE_SIZE_UNKNOWN : contentLength)) { | ||||||
|  |             Update.printError(Serial); | ||||||
|  |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}"); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         Serial.printf("Starting %s update\n", isFullImage ? "full" : "firmware"); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     // Schreibe Update-Daten | ||||||
|     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\"}"); |         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}"); | ||||||
|         return; |         return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     // Update abschließen | ||||||
|     if (final) { |     if (final) { | ||||||
|         if (Update.end(true)) { |         if (!Update.end(true)) { | ||||||
|             Serial.println("Update complete"); |  | ||||||
|             request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); |  | ||||||
|             delay(1000); |  | ||||||
|             ESP.restart(); |  | ||||||
|         } else { |  | ||||||
|             Update.printError(Serial); |             Update.printError(Serial); | ||||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}"); |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}"); | ||||||
|  |             return; | ||||||
|         } |         } | ||||||
|  |         Serial.println("Update successful, restarting..."); | ||||||
|  |         request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); | ||||||
|  |         delay(500); | ||||||
|  |         ESP.restart(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3,6 +3,12 @@ | |||||||
|  |  | ||||||
| #include <ESPAsyncWebServer.h> | #include <ESPAsyncWebServer.h> | ||||||
|  |  | ||||||
|  | // Update size unknown constant, falls nicht bereits definiert | ||||||
|  | #ifndef UPDATE_SIZE_UNKNOWN | ||||||
|  | #define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF | ||||||
|  | #endif | ||||||
|  |  | ||||||
|  | void stopAllTasks(); | ||||||
| void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); | void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); | ||||||
|  |  | ||||||
| #endif | #endif | ||||||
| @@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi; | |||||||
| extern uint8_t scale_tare_counter; | extern uint8_t scale_tare_counter; | ||||||
| extern uint8_t pauseMainTask; | extern uint8_t pauseMainTask; | ||||||
|  |  | ||||||
|  | extern TaskHandle_t ScaleTask; | ||||||
|  |  | ||||||
| #endif | #endif | ||||||
| @@ -12,7 +12,7 @@ bool wm_nonblocking = false; | |||||||
| void initWiFi() { | void initWiFi() { | ||||||
|     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP |     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP | ||||||
|    |    | ||||||
|     esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm |     //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm | ||||||
|    |    | ||||||
|     if(wm_nonblocking) wm.setConfigPortalBlocking(false); |     if(wm_nonblocking) wm.setConfigPortalBlocking(false); | ||||||
|     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen |     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user