Compare commits
	
		
			69 Commits
		
	
	
		
			v1.3.24
			...
			adb354ddcd
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | 
							
								
								
									
										110
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										110
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -2,6 +2,10 @@ name: Gitea Release | ||||
|  | ||||
| on: | ||||
|   workflow_call: | ||||
|     secrets: | ||||
|       GITEA_TOKEN: | ||||
|         description: 'Token für Gitea API-Zugriff' | ||||
|         required: true | ||||
|  | ||||
| jobs: | ||||
|   create-release: | ||||
| @@ -36,8 +40,8 @@ jobs: | ||||
|         # Copy firmware binary | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||
|          | ||||
|         # Create SPIFFS binary | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|         # Create SPIFFS binary with minimal header | ||||
|         ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -50,7 +54,7 @@ jobs: | ||||
|           0x1000 bootloader.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x390000 spiffs.bin) | ||||
|           0x3D0000 spiffs.bin) | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
| @@ -79,14 +83,15 @@ jobs: | ||||
|         echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}" | ||||
|         echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}" | ||||
|         echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}" | ||||
|         echo "RUNNER_NAME=${RUNNER_NAME:-not set}" | ||||
|          | ||||
|         # Set API URL based on environment | ||||
|         if [ -n "${GITEA_SERVER_URL}" ]; then | ||||
|           GITEA_API_URL="${GITEA_SERVER_URL}" | ||||
|           GITEA_REPO=$(echo "${GITEA_REPOSITORY}" | cut -d'/' -f2) | ||||
|           GITEA_OWNER=$(echo "${GITEA_REPOSITORY}" | cut -d'/' -f1) | ||||
|         if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||
|           GITEA_API_URL="${GITHUB_SERVER_URL}" | ||||
|           GITEA_REPO=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f2) | ||||
|           GITEA_OWNER=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f1) | ||||
|         else | ||||
|           echo "Error: Could not determine Gitea server URL" | ||||
|           echo "Error: This workflow is only for Gitea" | ||||
|           exit 1 | ||||
|         fi | ||||
|          | ||||
| @@ -101,63 +106,60 @@ jobs: | ||||
|         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: Checking API URL..." | ||||
|         echo "GITEA_API_URL=${GITEA_API_URL}" | ||||
|         echo "Debug: API URL: ${GITEA_API_URL}" | ||||
|         echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}" | ||||
|          | ||||
|         # Prepare files for upload | ||||
|         FILES="" | ||||
|         for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do | ||||
|           if [ -f "$file" ]; then | ||||
|             FILES="$FILES -a $file" | ||||
|             echo "Debug: Found file: $file" | ||||
|           fi | ||||
|         done | ||||
|          | ||||
|         # Check if tag exists | ||||
|         if ! git rev-parse "v${VERSION}" >/dev/null 2>&1; then | ||||
|           echo "Debug: Creating new tag v${VERSION}" | ||||
|           git tag -a "v${VERSION}" -m "Release ${VERSION}" | ||||
|           git push origin "v${VERSION}" | ||||
|         else | ||||
|           echo "Debug: Tag v${VERSION} already exists" | ||||
|         fi | ||||
|  | ||||
|         # Test API connection | ||||
|         echo "Debug: Testing API connection..." | ||||
|         TEST_RESPONSE=$(curl -s -w "\n%{http_code}" -H "Authorization: token ${GITEA_TOKEN}" "${GITEA_API_URL}/api/v1/version") | ||||
|         TEST_STATUS=$(echo "$TEST_RESPONSE" | tail -n1) | ||||
|         if [ "$TEST_STATUS" != "200" ]; then | ||||
|           echo "Error: Cannot connect to Gitea API" | ||||
|           echo "Response: $TEST_RESPONSE" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|         # Create Gitea release using API | ||||
|         # 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_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" | ||||
|          | ||||
|         # Create release and capture HTTP status | ||||
|         RESPONSE=$(curl -v -s -w "\n%{http_code}" -X POST \ | ||||
|         RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "$RELEASE_DATA" \ | ||||
|           -d "${RELEASE_DATA}" \ | ||||
|           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases") | ||||
|          | ||||
|         HTTP_STATUS=$(echo "$RESPONSE" | tail -n1) | ||||
|         RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1) | ||||
|         RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1) | ||||
|         RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1) | ||||
|          | ||||
|         echo "Debug: HTTP Status: $HTTP_STATUS" | ||||
|         echo "Debug: Response Body: $RESPONSE_BODY" | ||||
|  | ||||
|         if [ "$HTTP_STATUS" != "201" ]; then | ||||
|           echo "Fehler beim Erstellen des Releases: $RESPONSE_BODY" | ||||
|         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 | ||||
							
								
								
									
										28
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -35,28 +35,6 @@ jobs: | ||||
|         sudo apt-get update | ||||
|         sudo apt-get install xxd | ||||
|      | ||||
|     - name: Check for Data changes | ||||
|       id: check_data | ||||
|       run: | | ||||
|         git fetch --unshallow || true | ||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) | ||||
|         if echo "$CHANGED_FILES" | grep -q "^data/"; then | ||||
|           echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT | ||||
|         else | ||||
|           echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT | ||||
|         fi | ||||
|  | ||||
|     - name: Check for SPIFFS changes | ||||
|       id: check_spiffs | ||||
|       run: | | ||||
|         git fetch --unshallow || true | ||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) | ||||
|         if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then | ||||
|           echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT | ||||
|         else | ||||
|           echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT | ||||
|         fi | ||||
|      | ||||
|     - name: Build Firmware | ||||
|       run: | | ||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||
| @@ -69,8 +47,8 @@ jobs: | ||||
|         # Copy firmware binary | ||||
|         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/upgrade_filaman_website_v${VERSION}.bin | ||||
|         # Create SPIFFS binary with minimal header | ||||
|         ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary (always) | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -83,7 +61,7 @@ jobs: | ||||
|           0x1000 bootloader.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x390000 spiffs.bin) | ||||
|           0x3D0000 spiffs.bin) | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -37,3 +37,5 @@ jobs: | ||||
|     needs: detect-provider | ||||
|     if: needs.detect-provider.outputs.provider == 'gitea' | ||||
|     uses: ./.github/workflows/gitea-release.yml | ||||
|     secrets: | ||||
|       GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
							
								
								
									
										145
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										145
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,150 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [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 | ||||
|   | ||||
| @@ -24,7 +24,7 @@ | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version"></span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|                 <h4>Hollo Lollo Trollo</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|         <nav style="display: flex; gap: 1rem;"> | ||||
|   | ||||
| @@ -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; | ||||
|             } | ||||
|              | ||||
| @@ -202,6 +202,16 @@ | ||||
|                     let response = this.responseText; | ||||
|                     try { | ||||
|                         const jsonResponse = JSON.parse(response); | ||||
|                          | ||||
|                         // Handle progress updates | ||||
|                         if (jsonResponse.progress !== undefined) { | ||||
|                             const percent = jsonResponse.progress; | ||||
|                             progress.style.width = percent + '%'; | ||||
|                             progress.textContent = Math.round(percent) + '%'; | ||||
|                             return; | ||||
|                         } | ||||
|                          | ||||
|                         // Handle success/error messages | ||||
|                         response = jsonResponse.message; | ||||
|                          | ||||
|                         if (jsonResponse.restart) { | ||||
| @@ -218,12 +228,9 @@ | ||||
|                             }, 1000); | ||||
|                         } | ||||
|                     } catch (e) { | ||||
|                         if (!isNaN(response)) { | ||||
|                             const percent = parseInt(response); | ||||
|                             progress.style.width = percent + '%'; | ||||
|                             progress.textContent = percent + '%'; | ||||
|                             return; | ||||
|                         } | ||||
|                         console.error('JSON parse error:', e); | ||||
|                         status.textContent = 'Update failed: Invalid response from server'; | ||||
|                         status.classList.add('error'); | ||||
|                     } | ||||
|                      | ||||
|                     status.textContent = response; | ||||
|   | ||||
| @@ -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,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.24" | ||||
| version = "1.3.46" | ||||
|  | ||||
| #test | ||||
|  | ||||
| @@ -54,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 | ||||
|      | ||||
|   | ||||
| @@ -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(); | ||||
|  | ||||
|   | ||||
							
								
								
									
										115
									
								
								src/website.cpp
									
									
									
									
									
								
							
							
						
						
									
										115
									
								
								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" | ||||
| @@ -32,6 +33,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; | ||||
| @@ -363,58 +368,86 @@ 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); | ||||
|                  | ||||
|                 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) { | ||||
|                     Serial.println("Backup JSON configs..."); | ||||
|                     backupJsonConfigs(); | ||||
|                      | ||||
|                     // Deaktiviere alle Validierungen für SPIFFS-Updates | ||||
|                     if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) { | ||||
|                         Serial.printf("Update Begin Error: %s\n", Update.errorString()); | ||||
|                         restoreJsonConfigs(); | ||||
|                         String errorMsg = String("Update begin failed: ") + Update.errorString(); | ||||
|                         request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                         return; | ||||
|                     } | ||||
|                 } else { | ||||
|                     // Normale Validierung für Firmware-Updates | ||||
|                     if (!Update.begin(updateSize, command)) { | ||||
|                         Serial.printf("Update Begin Error: %s\n", Update.errorString()); | ||||
|                         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); | ||||
|                     Serial.printf("Update Write Error: %s\n", Update.errorString()); | ||||
|                     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); | ||||
|                  | ||||
|                 // Sende den Fortschritt als JSON | ||||
|                 String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}"; | ||||
|                 request->send(200, "application/json", progress); | ||||
|             } | ||||
|  | ||||
|             if (final) { | ||||
|                 if (!Update.end(true)) { | ||||
|                     Serial.printf("Update End Error: "); | ||||
|                     Update.printError(Serial); | ||||
|                     Serial.printf("Update End Error: %s\n", Update.errorString()); | ||||
|                     if (command == U_SPIFFS) { | ||||
|                         Serial.println("Restoring JSON configs..."); | ||||
|                         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); | ||||
|                 Serial.println("Update Success!"); | ||||
|             } | ||||
|         } | ||||
|     ); | ||||
| @@ -442,60 +475,6 @@ 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"}; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user