Compare commits
	
		
			160 Commits
		
	
	
		
			v1.3.8
			...
			fe7b57fe0e
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fe7b57fe0e | |||
| c1ae6b7295 | |||
| 9eee89fac7 | |||
| 8c5e7e26ac | |||
| 7b52066378 | |||
| d5afa38ded | |||
| cf50baba2d | |||
| aa9e7da94b | |||
| 71cd3ba4fc | |||
| 73e240e879 | |||
| 0d34e1d718 | |||
| 84cc8beb9b | |||
| fd70e3179d | |||
| c553640ad8 | |||
| 807eca3c43 | |||
| b52730bf67 | |||
| 9a59b91e88 | |||
| a5af4013d8 | |||
| e54ce58ec4 | |||
| 142eafd232 | |||
| 63ab9e0993 | |||
| aaa5506d40 | |||
| 8037adc045 | |||
| 6e7c728cd8 | |||
| 3fe8271344 | |||
| f2bc6eab92 | |||
| 37df492339 | |||
| c4b425403f | |||
| 73244689dd | |||
| 27296104d2 | |||
| 5f99773897 | |||
| 7416285fb9 | |||
| 85928e358d | |||
| 092b4fd8ec | |||
| 399645a2b3 | |||
| 164bb241b7 | |||
| e564c6eeae | |||
| 4288dd0cd4 | |||
| 37d43b2d7d | |||
| adb354ddcd | |||
| 15d5e5edce | |||
| c6edf30245 | |||
| 65ac207f36 | |||
| 698abbd669 | |||
| 04a7c2cce3 | |||
| 78f54b72fd | |||
| f4eee9af91 | |||
| cad14b3bc2 | |||
| 312f75fc5f | |||
| b8714e93e2 | |||
| cd9da0fe4f | |||
| 2b620ef5ed | |||
| 3f63a01b8b | |||
| 22bb16b6a4 | |||
| 53ceee7816 | |||
| d48b002806 | |||
| dd905b6c6e | |||
| 77b9eda110 | |||
| 32a6e9dcd3 | |||
| 6cd5539e60 | |||
| 903b697912 | |||
| 72c2fb70c2 | |||
| f2f3f0ab9f | |||
| c07692c218 | |||
| a184903b66 | |||
| af1640383d | |||
| c00e54b145 | |||
| f6c92c686b | |||
| b8db01529b | |||
| 55db6d76ab | |||
| a18749a1ff | |||
| 1811fd9159 | |||
| b550760427 | |||
| c5033acadc | |||
| 7de4189c83 | |||
| f43f2a15b2 | |||
| 858192c6cb | |||
| e2bd39922d | |||
| c86cc7173e | |||
| 16362e66a3 | |||
| 48d9ba8f71 | |||
| e2bea5a0c3 | |||
| 3e11f65188 | |||
| df59c42c8a | |||
| abe1d7c930 | |||
| ca614c3cc4 | |||
| 5153374093 | |||
| 66db4d7a85 | |||
| 90e71922b1 | |||
| e8e5c0bd3d | |||
| 7e53e1ccb0 | |||
| e49e812b13 | |||
| b1e0fcfadf | |||
| 31ef3ac8df | |||
| 8cf3f87c89 | |||
| c446188311 | |||
| 8e2a8d597d | |||
| 7d3b1c34f6 | |||
| b95c61118b | |||
| 0dfb158959 | |||
| 75c774bb24 | |||
| cf80adb43c | |||
| 36d50cbe7f | |||
| 9148d207c7 | |||
| 5f6fef9448 | |||
| 946202de0e | |||
| 41a3717347 | |||
| 255c820439 | |||
| aef3ba77ba | |||
| 2592c3a497 | |||
| a48c5dfef0 | |||
| 00554d0b09 | |||
| 05a91cd8d8 | |||
| 7cf113eaff | |||
| 44d27adab2 | |||
| e0a2dff5fe | |||
| 519a089684 | |||
| ef053bb2b6 | |||
| 0a91c7b269 | |||
| 875d9d2b70 | |||
| 52840b9b0b | |||
| da1fc7678f | |||
| 982bb5aa21 | |||
| 007737db13 | |||
| 17e5949201 | |||
| 6a57186091 | |||
| babd3f47a0 | |||
| 5372fe10fe | |||
| e0c9d90892 | |||
| e5f5d1961b | |||
| 31a960fb9e | |||
| 3c2e75b77a | |||
| 367143c456 | |||
| fbde4b764f | |||
| e57f4216d4 | |||
| b8beb992d6 | |||
| 4234b2254e | |||
| b8faf79163 | |||
| d35afaff46 | |||
| a8a00372b5 | |||
| 72f4eab588 | |||
| afa4eddc00 | |||
| b0888e7e63 | |||
| 238a84a8a2 | |||
| 59cc00ca13 | |||
| ab083f5f57 | |||
| c111573206 | |||
| 52b2494e52 | |||
| 069ec2d7a1 | |||
| 94e35ae86e | |||
| d71e3d8184 | |||
| bb166aa29f | |||
| 0d718023f8 | |||
| b16781043f | |||
| dff184ff25 | |||
| 0ce281221d | |||
| bc26c160e8 | |||
| c25f41db75 | |||
| e107c17f50 | |||
| 85b9d03ebd | 
							
								
								
									
										207
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										207
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -2,15 +2,9 @@ name: Gitea Release | ||||
|  | ||||
| on: | ||||
|   workflow_call: | ||||
|     inputs: | ||||
|       gitea_server_url: | ||||
|         required: true | ||||
|         type: string | ||||
|       gitea_repository: | ||||
|         required: true | ||||
|         type: string | ||||
|     secrets: | ||||
|       GITEA_TOKEN: | ||||
|         description: 'Token für Gitea API-Zugriff' | ||||
|         required: true | ||||
|  | ||||
| jobs: | ||||
| @@ -34,50 +28,22 @@ jobs: | ||||
|         sudo apt-get update | ||||
|         sudo apt-get install xxd | ||||
|      | ||||
|     - 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: 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: Get version from platformio.ini | ||||
|       id: get_version | ||||
|       run: | | ||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||
|         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT | ||||
|  | ||||
|     - name: Build Firmware | ||||
|       run: | | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||
|          | ||||
|         # Always build firmware and SPIFFS | ||||
|         # Build firmware and SPIFFS | ||||
|         echo "Building firmware and SPIFFS..." | ||||
|         pio run -e esp32dev | ||||
|         pio run -t buildfs | ||||
|          | ||||
|         # Copy firmware binary | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||
|          | ||||
|         # Always create SPIFFS binary | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin | ||||
|         # Create SPIFFS binary - direct copy without header | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary (always) | ||||
|         # Create full binary | ||||
|         (cd .pio/build/esp32dev &&  | ||||
|         esptool.py --chip esp32 merge_bin \ | ||||
|           --fill-flash-size 4MB \ | ||||
| @@ -88,35 +54,17 @@ jobs: | ||||
|           0x1000 bootloader.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x390000 spiffs.bin) | ||||
|           0x3D0000 spiffs.bin) | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
|         (cd .pio/build/esp32dev && ls -lh *.bin) | ||||
|      | ||||
|     - name: Prepare binaries | ||||
|     - name: Get version from platformio.ini | ||||
|       id: get_version | ||||
|       run: | | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|          | ||||
|         # Create full binary only if SPIFFS changed | ||||
|         if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then | ||||
|           echo "Creating full binary..." | ||||
|           cd .pio/build/esp32dev && \ | ||||
|           esptool.py --chip esp32 merge_bin \ | ||||
|             --fill-flash-size 4MB \ | ||||
|             --flash_mode dio \ | ||||
|             --flash_freq 40m \ | ||||
|             --flash_size 4MB \ | ||||
|             -o filaman_full_${VERSION}.bin \ | ||||
|             0x0000 bootloader.bin \ | ||||
|             0x8000 partitions.bin \ | ||||
|             0x10000 firmware.bin \ | ||||
|             0x390000 spiffs.bin | ||||
|         fi | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
|         cd .pio/build/esp32dev && ls -lh *.bin | ||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||
|         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT | ||||
|        | ||||
|     - name: Read CHANGELOG.md | ||||
|       id: changelog | ||||
| @@ -127,56 +75,91 @@ jobs: | ||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||
|         echo "EOF" >> $GITHUB_OUTPUT | ||||
|  | ||||
|     - name: Create Release | ||||
|       env: | ||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
|     - name: Determine Gitea URL | ||||
|       id: gitea_url | ||||
|       run: | | ||||
|         API_URL="${{ inputs.gitea_server_url }}/api/v1" | ||||
|         REPO="${{ inputs.gitea_repository }}" | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|         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}" | ||||
|          | ||||
|         # Create release | ||||
|         RESPONSE=$(curl -k -s \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "{ | ||||
|             \"tag_name\":\"v${VERSION}\", | ||||
|             \"name\":\"Release ${VERSION}\", | ||||
|             \"body\":\"${{ steps.changelog.outputs.CHANGES }}\" | ||||
|           }" \ | ||||
|           "${API_URL}/repos/${REPO}/releases") | ||||
|          | ||||
|         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) | ||||
|          | ||||
|         if [ -n "$RELEASE_ID" ]; then | ||||
|           echo "Release created with ID: $RELEASE_ID" | ||||
|            | ||||
|           # Always upload firmware and full binary | ||||
|           for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do | ||||
|             if [ -f ".pio/build/esp32dev/$file" ]; then | ||||
|               echo "Uploading $file..." | ||||
|               curl -k -s \ | ||||
|                 -X POST \ | ||||
|                 -H "Authorization: token ${TOKEN}" \ | ||||
|                 -H "Content-Type: application/octet-stream" \ | ||||
|                 --data-binary "@.pio/build/esp32dev/$file" \ | ||||
|                 "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" | ||||
|             fi | ||||
|           done | ||||
|            | ||||
|           # Upload SPIFFS binary only if it exists (data changes) | ||||
|           if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then | ||||
|             echo "Uploading webpage binary..." | ||||
|             curl -k -s \ | ||||
|               -X POST \ | ||||
|               -H "Authorization: token ${TOKEN}" \ | ||||
|               -H "Content-Type: application/octet-stream" \ | ||||
|               --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \ | ||||
|               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin" | ||||
|           fi | ||||
|         # 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 "Failed to create release. Response:" | ||||
|           echo "$RESPONSE" | ||||
|           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: ${{ steps.gitea_url.outputs.GITEA_API_URL }} | ||||
|         GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }} | ||||
|         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: API URL: ${GITEA_API_URL}" | ||||
|         echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}" | ||||
|          | ||||
|         # Erstelle zuerst den Release ohne Dateien | ||||
|         echo "Debug: Creating release..." | ||||
|         RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" | ||||
|          | ||||
|         RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "${RELEASE_DATA}" \ | ||||
|           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases") | ||||
|          | ||||
|         RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1) | ||||
|         RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1) | ||||
|          | ||||
|         if [ "$RELEASE_STATUS" != "201" ]; then | ||||
|           echo "Error: Failed to create release" | ||||
|           echo "Response: $RELEASE_BODY" | ||||
|           exit 1 | ||||
|         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 | ||||
							
								
								
									
										51
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										51
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -2,6 +2,13 @@ name: GitHub Release | ||||
|  | ||||
| on: | ||||
|   workflow_call: | ||||
|     secrets: | ||||
|       RELEASE_TOKEN: | ||||
|         description: 'GitHub token for release creation' | ||||
|         required: true | ||||
|  | ||||
| permissions: | ||||
|   contents: write | ||||
|  | ||||
| jobs: | ||||
|   create-release: | ||||
| @@ -10,6 +17,8 @@ jobs: | ||||
|       contents: write | ||||
|     steps: | ||||
|     - uses: actions/checkout@v4 | ||||
|       with: | ||||
|         fetch-depth: 0 | ||||
|      | ||||
|     - name: Set up Python | ||||
|       uses: actions/setup-python@v4 | ||||
| @@ -26,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) | ||||
| @@ -58,10 +45,10 @@ jobs: | ||||
|         pio run -t buildfs | ||||
|          | ||||
|         # Copy firmware binary | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||
|          | ||||
|         # Always create SPIFFS binary | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin | ||||
|         # Create SPIFFS binary - direct copy without header | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary (always) | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -74,7 +61,7 @@ jobs: | ||||
|           0x1000 bootloader.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x390000 spiffs.bin) | ||||
|           0x3D0000 spiffs.bin) | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
| @@ -97,22 +84,22 @@ jobs: | ||||
|  | ||||
|     - name: Create GitHub Release | ||||
|       env: | ||||
|         GH_TOKEN: ${{ github.token }} | ||||
|         GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} | ||||
|       run: | | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|         cd .pio/build/esp32dev | ||||
|          | ||||
|         # Create release with available files | ||||
|         cd .pio/build/esp32dev | ||||
|         FILES_TO_UPLOAD="" | ||||
|          | ||||
|         # Always add firmware | ||||
|         if [ -f "filaman_${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin" | ||||
|         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 "webpage_${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin" | ||||
|         if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin" | ||||
|         fi | ||||
|          | ||||
|         if [ -f "filaman_full_${VERSION}.bin" ]; then | ||||
|   | ||||
							
								
								
									
										55
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										55
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -5,66 +5,37 @@ on: | ||||
|     tags: | ||||
|       - 'v*' | ||||
|  | ||||
| permissions: | ||||
|   contents: write | ||||
|  | ||||
| jobs: | ||||
|   route: | ||||
|   detect-provider: | ||||
|     runs-on: ubuntu-latest | ||||
|     outputs: | ||||
|       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: | ||||
|       - name: Checkout Repository | ||||
|         uses: actions/checkout@v3 | ||||
|  | ||||
|       - name: Debug Environment | ||||
|         run: | | ||||
|           echo "CI Environment Details:" | ||||
|           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}" | ||||
|           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}" | ||||
|           echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}" | ||||
|           echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}" | ||||
|           echo "RUNNER_NAME=${RUNNER_NAME:-not set}" | ||||
|  | ||||
|       - name: Determine CI Provider | ||||
|         id: provider | ||||
|         shell: bash | ||||
|         run: | | ||||
|           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||
|             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 | ||||
|             echo "provider=github" >> "$GITHUB_OUTPUT" | ||||
|           else | ||||
|             echo "provider=unknown" >> "$GITHUB_OUTPUT" | ||||
|           fi | ||||
|  | ||||
|   verify-provider: | ||||
|     needs: route | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - name: Echo detected provider | ||||
|         run: | | ||||
|           echo "Detected CI Provider: ${{ needs.route.outputs.provider }}" | ||||
|           if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then | ||||
|             echo "::error::Failed to detect CI provider!" | ||||
|             exit 1 | ||||
|             echo "provider=github" >> "$GITHUB_OUTPUT" | ||||
|           fi | ||||
|  | ||||
|   github-release: | ||||
|     needs: [route, verify-provider] | ||||
|     if: needs.route.outputs.provider == 'github' | ||||
|     needs: detect-provider | ||||
|     permissions: | ||||
|       contents: write | ||||
|     if: needs.detect-provider.outputs.provider == 'github' | ||||
|     uses: ./.github/workflows/github-release.yml | ||||
|     secrets: | ||||
|       RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||
|  | ||||
|   gitea-release: | ||||
|     needs: [route, verify-provider] | ||||
|     if: needs.route.outputs.provider == 'gitea' | ||||
|     needs: detect-provider | ||||
|     if: needs.detect-provider.outputs.provider == 'gitea' | ||||
|     uses: ./.github/workflows/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: | ||||
|       GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
							
								
								
									
										336
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										336
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,341 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.3.58] - 2025-02-22 | ||||
| ### Added | ||||
| - implement backup and restore functionality for Bambu credentials and Spoolman URL | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.58 | ||||
| - update upgrade page message and improve progress display logic | ||||
|  | ||||
|  | ||||
| ## [1.3.57] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.57 | ||||
| - update header title to 'Filament Management Tool' in multiple HTML files | ||||
|  | ||||
|  | ||||
| ## [1.3.56] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.56 | ||||
| - update header title and improve SPIFFS update error handling | ||||
| - clarify comments in Gitea and GitHub release workflows | ||||
|  | ||||
|  | ||||
| ## [1.3.55] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.55 | ||||
| - update component descriptions in README files | ||||
|  | ||||
|  | ||||
| ## [1.3.54] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.54 | ||||
| - workflow: update SPIFFS binary creation to exclude header | ||||
|  | ||||
|  | ||||
| ## [1.3.53] - 2025-02-22 | ||||
| ### Changed | ||||
| - version: update to version 1.3.53 | ||||
| - update changelog for version 1.3.51 | ||||
| - update changelog for version 1.3.51 | ||||
| - workflow: update SPIFFS binary magic byte and revert version to 1.3.51 | ||||
|  | ||||
|  | ||||
| ## [1.3.52] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.52 | ||||
| - workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3) | ||||
|  | ||||
|  | ||||
| ## [1.3.51] - 2025-02-22 | ||||
| ### Changed | ||||
| - update changelog for version 1.3.51 | ||||
| - workflow: update SPIFFS binary magic byte and revert version to 1.3.51 | ||||
|  | ||||
| ## [1.3.50] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.50 | ||||
|  | ||||
|  | ||||
| ## [1.3.49] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.49 | ||||
| - workflow: update SPIFFS binary header to use correct chip revision | ||||
|  | ||||
|  | ||||
| ## [1.3.48] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.48 | ||||
| - workflow: update SPIFFS binary header for firmware release | ||||
|  | ||||
|  | ||||
| ## [1.3.47] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.47 | ||||
| - workflow: optimize firmware and SPIFFS update process, improve progress handling and logging | ||||
|  | ||||
|  | ||||
| ## [1.3.46] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.46 | ||||
|  | ||||
|  | ||||
| ## [1.3.45] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.45 | ||||
| - workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic | ||||
|  | ||||
|  | ||||
| ## [1.3.44] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.44 | ||||
| - update header title to 'Hollo Lollo Trollo' | ||||
| - update header title to 'Filament Management Tool' and improve update response messages | ||||
|  | ||||
|  | ||||
| ## [1.3.43] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.43 | ||||
| - update header title to 'Hollo Lollo Trollo' | ||||
|  | ||||
|  | ||||
| ## [1.3.42] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.42 | ||||
|  | ||||
| ### Fixed | ||||
| - correct path for SPIFFS binary creation in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.41] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.41 | ||||
|  | ||||
| ### Fixed | ||||
| - remove redundant buffer size setting in NFC initialization | ||||
| - update SPIFFS binary creation and enhance NFC buffer size | ||||
|  | ||||
|  | ||||
| ## [1.3.40] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.40 | ||||
|  | ||||
| ### Fixed | ||||
| - update SPIFFS binary header and enhance WebSocket error handling | ||||
|  | ||||
|  | ||||
| ## [1.3.39] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.39 | ||||
| - workflow: update SPIFFS binary creation to set chip version to max supported | ||||
|  | ||||
|  | ||||
| ## [1.3.38] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.38 | ||||
| - workflow: update SPIFFS binary creation with minimal ESP32 image header | ||||
|  | ||||
|  | ||||
| ## [1.3.37] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.37 | ||||
| - workflow: update ESP32-WROOM image header for SPIFFS binary creation | ||||
|  | ||||
|  | ||||
| ## [1.3.36] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.36 | ||||
| - partition: update SPIFFS binary header and offsets in workflow files | ||||
|  | ||||
|  | ||||
| ## [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 | ||||
|  | ||||
| ### Fixed | ||||
| - workflow: enhance Gitea release process with debug outputs and API connection checks | ||||
|  | ||||
|  | ||||
| ## [1.3.22] - 2025-02-21 | ||||
| ### Added | ||||
| - workflow: improve Gitea release process with additional environment variables and error handling | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.22 | ||||
|  | ||||
|  | ||||
| ## [1.3.21] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.21 | ||||
| - workflow: enhance Gitea release process with API integration and token management | ||||
|  | ||||
|  | ||||
| ## [1.3.20] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.20 | ||||
| - workflow: enable git tagging and pushing for Gitea releases | ||||
|  | ||||
|  | ||||
| ## [1.3.19] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.19 | ||||
| - workflow: enable git push for version tagging in Gitea release | ||||
|  | ||||
|  | ||||
| ## [1.3.18] - 2025-02-21 | ||||
| ### Changed | ||||
| - ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten. | ||||
| - ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained. | ||||
|  | ||||
|  | ||||
|  | ||||
| ## [1.3.18] - 2025-02-21 | ||||
| ### Added | ||||
| - add note about filaman_full.bin installation in changelog | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.18 | ||||
| - update changelog for version 1.3.18 and enhance update script for existing entries | ||||
|  | ||||
| ## [1.3.17] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.17 | ||||
| - ci: comment out git tag and push commands in gitea-release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.16] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.16 | ||||
| - ci: update filenames for firmware and website binaries in release workflows | ||||
|  | ||||
|  | ||||
| ## [1.3.15] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.15 | ||||
|  | ||||
| ### Fixed | ||||
| - ci: fix missing 'fi' in GitHub release workflow script | ||||
|  | ||||
|  | ||||
| ## [1.3.14] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.14 | ||||
| - ci: update GitHub release workflow to improve file upload handling | ||||
|  | ||||
|  | ||||
| ## [1.3.13] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.13 | ||||
| - ci: update GitHub release workflow to use RELEASE_TOKEN for improved security | ||||
|  | ||||
|  | ||||
| ## [1.3.12] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.12 | ||||
| - ci: enhance GitHub release workflow with token handling and file upload improvements | ||||
|  | ||||
|  | ||||
| ## [1.3.11] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.11 | ||||
| - ci: refactor Gitea release workflow by simplifying input handling and removing unnecessary checks | ||||
|  | ||||
|  | ||||
| ## [1.3.10] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.10 | ||||
| - ci: simplify GitHub release workflow by removing provider verification step | ||||
|  | ||||
|  | ||||
| ## [1.3.9] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.9 | ||||
| - ci: comment out permissions for GitHub release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.8] - 2025-02-21 | ||||
| ### Added | ||||
| - add Gitea and GitHub release workflows | ||||
|   | ||||
							
								
								
									
										16
									
								
								README.de.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.de.md
									
									
									
									
									
								
							| @@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO | ||||
| ### Komponenten | ||||
| - **ESP32 Entwicklungsboard:** Jede ESP32-Variante. | ||||
| [Amazon Link](https://amzn.eu/d/aXThslf) | ||||
| - **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung. | ||||
| [Amazon Link](https://amzn.eu/d/1wZ4v0x) | ||||
| - **OLED Display:** 128x64 SSD1306. | ||||
| [Amazon Link](https://amzn.eu/d/dozAYDU) | ||||
| - **PN532 NFC Modul:** Für NFC-Tag-Operationen. | ||||
| [Amazon Link](https://amzn.eu/d/8205DDh) | ||||
| - **NFC-Tag:** NTAG215 | ||||
| [Amazon Link](https://amzn.eu/d/fywy4c4) | ||||
| - **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung. | ||||
| [Amazon Link](https://amzn.eu/d/06A0DLb) | ||||
| - **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306. | ||||
| [Amazon Link](https://amzn.eu/d/0AuBp2c) | ||||
| - **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen. | ||||
| [Amazon Link](https://amzn.eu/d/jfIuQXb) | ||||
| - **NFC Tags Ntag215:** RFID Tag | ||||
| [Amazon Link](https://amzn.eu/d/9Z6mXc1) | ||||
|  | ||||
| ### Pin-Konfiguration | ||||
| | Komponente        | ESP32 Pin | | ||||
|   | ||||
							
								
								
									
										16
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.md
									
									
									
									
									
								
							| @@ -56,14 +56,14 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | ||||
| ### Components | ||||
| - **ESP32 Development Board:** Any ESP32 variant. | ||||
| [Amazon Link](https://amzn.eu/d/aXThslf) | ||||
| - **HX711 Load Cell Amplifier:** For weight measurement. | ||||
| [Amazon Link](https://amzn.eu/d/1wZ4v0x) | ||||
| - **OLED Display:** 128x64 SSD1306. | ||||
| [Amazon Link](https://amzn.eu/d/dozAYDU) | ||||
| - **PN532 NFC Module:** For NFC tag operations. | ||||
| [Amazon Link](https://amzn.eu/d/8205DDh) | ||||
| - **NFC-Tag:** NTAG215 | ||||
| [Amazon Link](https://amzn.eu/d/fywy4c4) | ||||
| - **HX711 5kg Load Cell Amplifier:** For weight measurement. | ||||
| [Amazon Link](https://amzn.eu/d/06A0DLb) | ||||
| - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306. | ||||
| [Amazon Link](https://amzn.eu/d/0AuBp2c) | ||||
| - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations. | ||||
| [Amazon Link](https://amzn.eu/d/jfIuQXb) | ||||
| - **NFC Tags Ntag215:** RFID Tag | ||||
| [Amazon Link](https://amzn.eu/d/9Z6mXc1) | ||||
|  | ||||
|  | ||||
| ### Pin Configuration | ||||
|   | ||||
| @@ -167,12 +167,12 @@ | ||||
|             } | ||||
|  | ||||
|             // Validate file name pattern | ||||
|             if (updateType === 'firmware' && !file.name.startsWith('filaman_')) { | ||||
|                 alert('Please select a valid firmware file (filaman_*.bin)'); | ||||
|             if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) { | ||||
|                 alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)'); | ||||
|                 return; | ||||
|             } | ||||
|             if (updateType === 'webpage' && !file.name.startsWith('webpage_')) { | ||||
|                 alert('Please select a valid webpage file (webpage_*.bin)'); | ||||
|             if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) { | ||||
|                 alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)'); | ||||
|                 return; | ||||
|             } | ||||
|              | ||||
| @@ -189,48 +189,34 @@ | ||||
|  | ||||
|             const xhr = new XMLHttpRequest(); | ||||
|             xhr.open('POST', '/update', true); | ||||
|             xhr.upload.onprogress = (e) => { | ||||
|                 if (e.lengthComputable) { | ||||
|                     const percentComplete = (e.loaded / e.total) * 100; | ||||
|                     progress.style.width = percentComplete + '%'; | ||||
|                     progress.textContent = Math.round(percentComplete) + '%'; | ||||
|                 } | ||||
|             }; | ||||
|  | ||||
|             xhr.onload = function() { | ||||
|                 try { | ||||
|                     let response = this.responseText; | ||||
|                     try { | ||||
|                         const jsonResponse = JSON.parse(response); | ||||
|                         response = jsonResponse.message; | ||||
|                          | ||||
|                         if (jsonResponse.restart) { | ||||
|                             status.textContent = response + " Redirecting in 20 seconds..."; | ||||
|                             let countdown = 20; | ||||
|                             const timer = setInterval(() => { | ||||
|                                 countdown--; | ||||
|                                 if (countdown <= 0) { | ||||
|                                     clearInterval(timer); | ||||
|                                     window.location.href = '/'; | ||||
|                                 } else { | ||||
|                                     status.textContent = response + ` Redirecting in ${countdown} seconds...`; | ||||
|                                 } | ||||
|                             }, 1000); | ||||
|                         // Zeige finale Nachricht | ||||
|                         status.textContent = jsonResponse.message || "Update complete"; | ||||
|                         status.classList.add(jsonResponse.success ? 'success' : 'error'); | ||||
|                         status.style.display = 'block'; | ||||
|                          | ||||
|                         if (jsonResponse.success) { | ||||
|                             progress.style.width = '100%'; | ||||
|                             progress.textContent = '100%'; | ||||
|                              | ||||
|                             // Automatischer Neustart nach erfolgreicher Aktualisierung | ||||
|                             status.textContent = "Update successful! Restarting device... The page will reload in 30 seconds."; | ||||
|                             setTimeout(() => { | ||||
|                                 window.location.href = '/'; | ||||
|                             }, 30000); | ||||
|                         } else { | ||||
|                             document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); | ||||
|                         } | ||||
|                     } catch (e) { | ||||
|                         if (!isNaN(response)) { | ||||
|                             const percent = parseInt(response); | ||||
|                             progress.style.width = percent + '%'; | ||||
|                             progress.textContent = percent + '%'; | ||||
|                             return; | ||||
|                         } | ||||
|                     } | ||||
|                      | ||||
|                     status.textContent = response; | ||||
|                     status.classList.add(xhr.status === 200 ? 'success' : 'error'); | ||||
|                     status.style.display = 'block'; | ||||
|                      | ||||
|                     if (xhr.status !== 200) { | ||||
|                         console.error('JSON parse error:', e); | ||||
|                         status.textContent = 'Update failed: Invalid response from server'; | ||||
|                         status.classList.add('error'); | ||||
|                         document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); | ||||
|                     } | ||||
|                 } catch (error) { | ||||
|   | ||||
| @@ -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, | ||||
| app1,     app,  ota_1,     0x190000, 0x180000, | ||||
| spiffs,   data, spiffs,    0x310000, 0xE0000, | ||||
| app0,     app,  ota_0,     0x10000,  0x1E0000, | ||||
| app1,     app,  ota_1,     0x1F0000, 0x1E0000, | ||||
| spiffs,   data, spiffs,    0x3D0000, 0x30000, | ||||
| 
 | 
| @@ -9,7 +9,9 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.8" | ||||
| version = "1.3.58" | ||||
|  | ||||
| #test | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
| @@ -52,12 +54,8 @@ build_flags = | ||||
|     -DCONFIG_ARDUHAL_LOG_COLORS=1 | ||||
|     -DOTA_DEBUG=1 | ||||
|     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1 | ||||
|     -DCONFIG_ESP32_PANIC_PRINT_REBOOT | ||||
|     -DBOOT_APP_PARTITION_OTA_0=1 | ||||
|     -DCONFIG_LOG_DEFAULT_LEVEL=3 | ||||
|     -DCONFIG_LWIP_TCP_MSL=60000 | ||||
|     -DCONFIG_LWIP_TCP_WND_DEFAULT=8192 | ||||
|     -DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096 | ||||
|     -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096 | ||||
|     -DCONFIG_LWIP_MAX_ACTIVE_TCP=16 | ||||
|      | ||||
|   | ||||
| @@ -122,7 +122,29 @@ def update_changelog(): | ||||
|                 f.write(updated_content) | ||||
|             push_changes(version) | ||||
|         else: | ||||
|             print(f"Version {version} already exists in changelog") | ||||
|             # 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.start() | ||||
|                 # Suche nach der nächsten Version | ||||
|                 next_version_match = re.search(next_version_pattern, content[version_start + 1:]) | ||||
|                  | ||||
|                 if next_version_match: | ||||
|                     # Ersetze den Inhalt zwischen aktueller und nächster Version | ||||
|                     next_version_pos = version_start + 1 + next_version_match.start() | ||||
|                     updated_content = content[:version_start] + changelog_entry + content[next_version_pos:] | ||||
|                 else: | ||||
|                     # Wenn keine nächste Version existiert, ersetze bis zum Ende | ||||
|                     updated_content = content[:version_start] + changelog_entry + "\n" | ||||
|                  | ||||
|                 with open(changelog_path, 'w') as f: | ||||
|                     f.write(updated_content) | ||||
|                 push_changes(version) | ||||
|                 print(f"Updated entries for version {version}") | ||||
|  | ||||
| if __name__ == "__main__": | ||||
|     update_changelog() | ||||
| @@ -19,6 +19,12 @@ | ||||
| void setup() { | ||||
|   Serial.begin(115200); | ||||
|  | ||||
|   uint64_t chipid; | ||||
|  | ||||
|   chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes). | ||||
|   Serial.printf("ESP32 Chip ID = %04X", (uint16_t)(chipid >> 32)); //print High 2 bytes | ||||
|   Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes. | ||||
|  | ||||
|   // Initialize SPIFFS | ||||
|   initializeSPIFFS(); | ||||
|  | ||||
|   | ||||
							
								
								
									
										184
									
								
								src/website.cpp
									
									
									
									
									
								
							
							
						
						
									
										184
									
								
								src/website.cpp
									
									
									
									
									
								
							| @@ -8,6 +8,7 @@ | ||||
| #include "scale.h" | ||||
| #include "esp_task_wdt.h" | ||||
| #include <Update.h> | ||||
| #include "display.h" | ||||
|  | ||||
| #ifndef VERSION | ||||
|   #define VERSION "1.1.0" | ||||
| @@ -22,6 +23,10 @@ AsyncWebSocket ws("/ws"); | ||||
| uint8_t lastSuccess = 0; | ||||
| uint8_t lastHasReadRfidTag = 0; | ||||
|  | ||||
| // Globale Variablen für Config Backups hinzufügen | ||||
| String bambuCredentialsBackup; | ||||
| String spoolmanUrlBackup; | ||||
|  | ||||
| void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) { | ||||
|     if (type == WS_EVT_CONNECT) { | ||||
|         Serial.println("Neuer Client verbunden!"); | ||||
| @@ -32,6 +37,10 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
|         sendWriteResult(client, 3); | ||||
|     } else if (type == WS_EVT_DISCONNECT) { | ||||
|         Serial.println("Client getrennt."); | ||||
|     } else if (type == WS_EVT_ERROR) { | ||||
|         Serial.printf("WebSocket Client #%u error(%u): %s\n", client->id(), *((uint16_t*)arg), (char*)data); | ||||
|     } else if (type == WS_EVT_PONG) { | ||||
|         Serial.printf("WebSocket Client #%u pong\n", client->id()); | ||||
|     } else if (type == WS_EVT_DATA) { | ||||
|         String message = String((char*)data); | ||||
|         JsonDocument doc; | ||||
| @@ -160,6 +169,9 @@ void sendAmsData(AsyncWebSocketClient *client) { | ||||
| } | ||||
|  | ||||
| void setupWebserver(AsyncWebServer &server) { | ||||
|     // Deaktiviere alle Debug-Ausgaben | ||||
|     Serial.setDebugOutput(false); | ||||
|      | ||||
|     // WebSocket-Optimierungen | ||||
|     ws.onEvent(onWsEvent); | ||||
|     ws.enable(true); | ||||
| @@ -363,58 +375,96 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|         [](AsyncWebServerRequest *request) { | ||||
|             // Nach Update-Abschluss | ||||
|             bool success = !Update.hasError(); | ||||
|             String message = success ? "Update successful" : String("Update failed: ") + Update.errorString(); | ||||
|             AsyncWebServerResponse *response = request->beginResponse( | ||||
|                 success ? 200 : 400, | ||||
|                 "application/json", | ||||
|                 success ? "{\"success\":true,\"message\":\"Update successful\"}"  | ||||
|                        : "{\"success\":false,\"message\":\"Update failed\"}" | ||||
|                 "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}" | ||||
|             ); | ||||
|             response->addHeader("Connection", "close"); | ||||
|             request->send(response); | ||||
|              | ||||
|             if (success) { | ||||
|                 oledShowMessage("Upgrade successful Rebooting"); | ||||
|                 delay(500); | ||||
|                 ESP.restart(); | ||||
|             } | ||||
|             else { | ||||
|                 oledShowMessage("Upgrade failed"); | ||||
|             } | ||||
|         }, | ||||
|         [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) { | ||||
|             static size_t updateSize = 0; | ||||
|             static int command = 0; | ||||
|  | ||||
|             //oledShowMessage("Upgrade please wait"); | ||||
|  | ||||
|             if (!index) { | ||||
|                 updateSize = request->contentLength(); | ||||
|                 command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH; | ||||
|                 Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command); | ||||
|                 command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH; | ||||
|                  | ||||
|                 if (!Update.begin(updateSize, command)) { | ||||
|                     Serial.printf("Update Begin Error: "); | ||||
|                     Update.printError(Serial); | ||||
|                     String errorMsg = String("Update begin failed: ") + Update.errorString(); | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                     return; | ||||
|                 if (command == U_SPIFFS) { | ||||
|                     oledShowMessage("SPIFFS Update..."); | ||||
|                     backupJsonConfigs(); | ||||
|                      | ||||
|                     // Get the actual SPIFFS partition size from ESP32 | ||||
|                     const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL); | ||||
|                     if (!partition) { | ||||
|                         restoreJsonConfigs(); | ||||
|                         String errorMsg = "SPIFFS partition not found"; | ||||
|                         request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                         return; | ||||
|                     } | ||||
|                      | ||||
|                     if (!Update.begin(partition->size, command)) { | ||||
|                         restoreJsonConfigs(); | ||||
|                         String errorMsg = String("Update begin failed: ") + Update.errorString(); | ||||
|                         request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                         return; | ||||
|                     } | ||||
|                 } else { | ||||
|                     oledShowMessage("Firmware Update..."); | ||||
|                     if (!Update.begin(updateSize, command)) { | ||||
|                         String errorMsg = String("Update begin failed: ") + Update.errorString(); | ||||
|                         request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                         return; | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (len) { | ||||
|                 if (Update.write(data, len) != len) { | ||||
|                     Serial.printf("Update Write Error: "); | ||||
|                     Update.printError(Serial); | ||||
|                     if (command == U_SPIFFS) { | ||||
|                         restoreJsonConfigs(); | ||||
|                     } | ||||
|                     String errorMsg = String("Write failed: ") + Update.errorString(); | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 Serial.printf("Progress: %u/%u\r", index + len, updateSize); | ||||
|                  | ||||
|                 // Update OLED Display alle 5% und Webseite bei jeder Änderung | ||||
|                 static int lastProgress = -1; | ||||
|                 int currentProgress = (index + len) * 100 / updateSize; | ||||
|                 if (currentProgress != lastProgress) { | ||||
|                     // OLED nur alle 5% aktualisieren | ||||
|                     if (currentProgress % 5 == 0) { | ||||
|                         oledShowMessage(String(currentProgress) + "% complete"); | ||||
|                     } | ||||
|                     // Webseite bei jeder Änderung aktualisieren | ||||
|                     lastProgress = currentProgress; | ||||
|                     ws.textAll("{\"type\":\"updateProgress\",\"progress\":" + String(currentProgress) + "}"); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (final) { | ||||
|                 if (!Update.end(true)) { | ||||
|                     Serial.printf("Update End Error: "); | ||||
|                     Update.printError(Serial); | ||||
|                     if (command == U_SPIFFS) { | ||||
|                         restoreJsonConfigs(); | ||||
|                     } | ||||
|                     String errorMsg = String("Update end failed: ") + Update.errorString(); | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 Serial.printf("\nUpdate Success: %uB\n", index+len); | ||||
|             } | ||||
|         } | ||||
|     ); | ||||
| @@ -442,79 +492,49 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     Serial.println("Webserver gestartet"); | ||||
| } | ||||
|  | ||||
| void handleOTAUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) { | ||||
|     static bool isSpiffsUpdate = false; | ||||
|     if (!index) { | ||||
|         // Start eines neuen Uploads | ||||
|         Serial.println("Update Start: " + filename); | ||||
|          | ||||
|         // Überprüfe den Dateityp basierend auf dem Dateinamen | ||||
|         bool isFirmware = filename.startsWith("filaman_"); | ||||
|         isSpiffsUpdate = filename.startsWith("webpage_"); | ||||
|          | ||||
|         if (!isFirmware && !isSpiffsUpdate) { | ||||
|             request->send(400, "application/json", "{\"message\":\"Invalid file type. File must start with 'filaman_' or 'webpage_'\"}"); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         // Wähle den Update-Typ basierend auf dem Dateinamen | ||||
|         if (isSpiffsUpdate) { | ||||
|             if (!Update.begin(SPIFFS.totalBytes(), U_SPIFFS)) { | ||||
|                 Update.printError(Serial); | ||||
|                 request->send(400, "application/json", "{\"message\":\"SPIFFS Update failed: " + String(Update.errorString()) + "\"}"); | ||||
|                 return; | ||||
|             } | ||||
|             // Backup JSON configs before SPIFFS update | ||||
|             backupJsonConfigs(); | ||||
|         } else { | ||||
|             if (!Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH)) { | ||||
|                 Update.printError(Serial); | ||||
|                 request->send(400, "application/json", "{\"message\":\"Firmware Update failed: " + String(Update.errorString()) + "\"}"); | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     if (Update.write(data, len) != len) { | ||||
|         Update.printError(Serial); | ||||
|         request->send(400, "application/json", "{\"message\":\"Write failed: " + String(Update.errorString()) + "\"}"); | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     if (final) { | ||||
|         if (!Update.end(true)) { | ||||
|             Update.printError(Serial); | ||||
|             request->send(400, "application/json", "{\"message\":\"Update failed: " + String(Update.errorString()) + "\"}"); | ||||
|             return; | ||||
|         } | ||||
|         if (isSpiffsUpdate) { | ||||
|             // Restore JSON configs after SPIFFS update | ||||
|             restoreJsonConfigs(); | ||||
|         } | ||||
|         request->send(200, "application/json", "{\"message\":\"Update successful!\", \"restart\": true}"); | ||||
|         delay(500); | ||||
|         ESP.restart(); | ||||
|     } | ||||
| } | ||||
|  | ||||
| void backupJsonConfigs() { | ||||
|     const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"}; | ||||
|     for (const char* config : configs) { | ||||
|         if (SPIFFS.exists(config)) { | ||||
|             String backupPath = String(config) + ".bak"; | ||||
|             SPIFFS.remove(backupPath); | ||||
|             SPIFFS.rename(config, backupPath); | ||||
|     // Bambu Credentials backup | ||||
|     if (SPIFFS.exists("/bambu_credentials.json")) { | ||||
|         File file = SPIFFS.open("/bambu_credentials.json", "r"); | ||||
|         if (file) { | ||||
|             bambuCredentialsBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials backed up"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // Spoolman URL backup | ||||
|     if (SPIFFS.exists("/spoolman_url.json")) { | ||||
|         File file = SPIFFS.open("/spoolman_url.json", "r"); | ||||
|         if (file) { | ||||
|             spoolmanUrlBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL backed up"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| void restoreJsonConfigs() { | ||||
|     const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"}; | ||||
|     for (const char* config : configs) { | ||||
|         String backupPath = String(config) + ".bak"; | ||||
|         if (SPIFFS.exists(backupPath)) { | ||||
|             SPIFFS.remove(config); | ||||
|             SPIFFS.rename(backupPath, config); | ||||
|     // Restore Bambu credentials | ||||
|     if (bambuCredentialsBackup.length() > 0) { | ||||
|         File file = SPIFFS.open("/bambu_credentials.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(bambuCredentialsBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials restored"); | ||||
|         } | ||||
|         bambuCredentialsBackup = ""; // Clear backup | ||||
|     } | ||||
|  | ||||
|     // Restore Spoolman URL | ||||
|     if (spoolmanUrlBackup.length() > 0) { | ||||
|         File file = SPIFFS.open("/spoolman_url.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(spoolmanUrlBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL restored"); | ||||
|         } | ||||
|         spoolmanUrlBackup = ""; // Clear backup | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user