Compare commits
	
		
			27 Commits
		
	
	
		
			v1.2.71
			...
			e5240a9572
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e5240a9572 | |||
| 06ebf105cf | |||
| 118e099fc5 | |||
| 8edd50f786 | |||
| b85325a747 | |||
| e1e0352beb | |||
| 8a93cccfce | |||
| c374069f36 | |||
| 59cd7c177d | |||
| 45088b5838 | |||
| 1b9c79b559 | |||
| 37e1e861d3 | |||
| cce39319d9 | |||
| 6391054c23 | |||
| 52cf46d7f8 | |||
| 84b05e48ce | |||
| 5c41d864c1 | |||
| 5dc3563da6 | |||
| 9e1b2943d6 | |||
| 7b89b04621 | |||
| e140f8e003 | |||
| 3d0bdde476 | |||
| 3ac7d6b4f7 | |||
| 5f52775984 | |||
| 463eaf4b6f | |||
| 4bf6b11d3a | |||
| b0c4af7c4e | 
							
								
								
									
										121
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										121
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,15 +4,12 @@ on: | ||||
|   workflow_call: | ||||
|     inputs: | ||||
|       gitea_ref_name: | ||||
|         description: 'Gitea ref name' | ||||
|         required: true | ||||
|         type: string | ||||
|       gitea_server_url: | ||||
|         description: 'Gitea server URL' | ||||
|         required: true | ||||
|         type: string | ||||
|       gitea_repository: | ||||
|         description: 'Gitea repository' | ||||
|         required: true | ||||
|         type: string | ||||
|     secrets: | ||||
| @@ -23,109 +20,87 @@ jobs: | ||||
|   create-release: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|     - name: Checkout Repository | ||||
|       uses: actions/checkout@v4 | ||||
|  | ||||
|     - name: Install System Dependencies | ||||
|     - uses: actions/checkout@v4 | ||||
|      | ||||
|     - name: Set up Python | ||||
|       uses: actions/setup-python@v4 | ||||
|       with: | ||||
|         python-version: '3.x' | ||||
|      | ||||
|     - name: Install PlatformIO | ||||
|       run: | | ||||
|         sudo apt-get update | ||||
|         sudo apt-get install -y python3 python3-venv build-essential curl git | ||||
|  | ||||
|     - name: Set up Python Virtual Environment | ||||
|       run: | | ||||
|         python3 -m venv venv | ||||
|         source venv/bin/activate | ||||
|         pip install --upgrade pip | ||||
|         pip install platformio esptool | ||||
|          | ||||
|         echo "Verifying installations:" | ||||
|         platformio --version | ||||
|         python3 --version | ||||
|         esptool.py version | ||||
|  | ||||
|         python -m pip install --upgrade pip | ||||
|         pip install --upgrade platformio esptool | ||||
|      | ||||
|     - name: Build Firmware | ||||
|       run: | | ||||
|         source venv/bin/activate | ||||
|         echo "Building SPIFFS..." | ||||
|         platformio run -t buildfs | ||||
|         pio run -t buildfs  # Build SPIFFS | ||||
|         pio run            # Build firmware | ||||
|          | ||||
|         echo "Building firmware..." | ||||
|         platformio run | ||||
|  | ||||
|     - name: Create Release Files | ||||
|     - name: Prepare binaries | ||||
|       run: | | ||||
|         source venv/bin/activate | ||||
|         echo "Creating release files..." | ||||
|         cd .pio/build/esp32dev | ||||
|          | ||||
|         # Create OTA binary (firmware only) | ||||
|         cp firmware.bin filaman_ota.bin | ||||
|          | ||||
|         # Use esptool to create the full binary | ||||
|         esptool.py --chip esp32 merge_bin \ | ||||
|           --flash_mode dio \ | ||||
|           --flash_freq 40m \ | ||||
|           --flash_size 4MB \ | ||||
|           -o .pio/build/esp32dev/filaman_full.bin \ | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||
|           --target-offset 0x0 \ | ||||
|           -o filaman_full.bin \ | ||||
|           0x1000 bootloader.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x3D0000 spiffs.bin | ||||
|          | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||
|  | ||||
|     - name: Read CHANGELOG.md | ||||
|       id: changelog | ||||
|       run: | | ||||
|         VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//') | ||||
|         CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md) | ||||
|         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||
|         echo "EOF" >> $GITHUB_OUTPUT | ||||
|         echo "CHANGELOG CONTENT:" | ||||
|         echo "$CHANGELOG" | ||||
|         if [ -z "$CHANGELOG" ]; then | ||||
|           echo "No changelog found for version $VERSION" | ||||
|           exit 1 | ||||
|         fi | ||||
|         # Verify binaries | ||||
|         echo "File sizes:" | ||||
|         ls -lh *.bin | ||||
|          | ||||
|         echo "Binary information:" | ||||
|         echo "OTA binary info:" | ||||
|         esptool.py --chip esp32 image_info filaman_ota.bin || true | ||||
|         echo "Full binary first 64 bytes:" | ||||
|         od -A x -t x1z -N 64 filaman_full.bin | ||||
|  | ||||
|     - name: Create Release | ||||
|       env: | ||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
|         GITEA_REF_NAME: ${{ inputs.gitea_ref_name }} | ||||
|         GITEA_SERVER_URL: ${{ inputs.gitea_server_url }} | ||||
|         GITEA_REPOSITORY: ${{ inputs.gitea_repository }} | ||||
|         CHANGELOG: ${{ steps.changelog.outputs.CHANGES }} | ||||
|       run: | | ||||
|         echo "Debug environment:" | ||||
|         echo "GITEA_REF_NAME: ${GITEA_REF_NAME}" | ||||
|         echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}" | ||||
|         echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}" | ||||
|         echo "CHANGELOG: ${CHANGELOG}" | ||||
|          | ||||
|         TAG="${GITEA_REF_NAME}" | ||||
|         API_URL="${GITEA_SERVER_URL}/api/v1" | ||||
|         REPO="${GITEA_REPOSITORY}" | ||||
|          | ||||
|         echo "Creating release for ${TAG} on ${REPO}..." | ||||
|         TAG="${{ inputs.gitea_ref_name }}" | ||||
|         API_URL="${{ inputs.gitea_server_url }}/api/v1" | ||||
|         REPO="${{ inputs.gitea_repository }}" | ||||
|          | ||||
|         # Create release | ||||
|         RESPONSE=$(curl -k -s \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \ | ||||
|           -d "{ | ||||
|             \"tag_name\":\"${TAG}\", | ||||
|             \"name\":\"Release ${TAG}\", | ||||
|             \"body\":\"${{ steps.changelog.outputs.CHANGES }}\" | ||||
|           }" \ | ||||
|           "${API_URL}/repos/${REPO}/releases") | ||||
|          | ||||
|         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) | ||||
|         UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"') | ||||
|          | ||||
|         if [ -n "$RELEASE_ID" ]; then | ||||
|           echo "Release created with ID: $RELEASE_ID" | ||||
|            | ||||
|           # Upload files | ||||
|           for file in "filaman_full.bin" "filaman_ota.bin"; do | ||||
|           # Upload binaries | ||||
|           cd .pio/build/esp32dev | ||||
|           for file in filaman_full.bin filaman_ota.bin; do | ||||
|             echo "Uploading $file..." | ||||
|             curl -k -s \ | ||||
|               -X POST \ | ||||
|               -H "Authorization: token ${TOKEN}" \ | ||||
|               -H "Content-Type: application/octet-stream" \ | ||||
|               --data-binary "@.pio/build/esp32dev/$file" \ | ||||
|               "${UPLOAD_URL}?name=$file" | ||||
|               --data-binary "@$file" \ | ||||
|               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" | ||||
|           done | ||||
|         else | ||||
|           echo "Failed to create release. Response:" | ||||
|   | ||||
							
								
								
									
										46
									
								
								.github/workflows/providers/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										46
									
								
								.github/workflows/providers/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -19,32 +19,50 @@ jobs: | ||||
|     - name: Install PlatformIO | ||||
|       run: | | ||||
|         python -m pip install --upgrade pip | ||||
|         pip install --upgrade platformio | ||||
|         pip install --upgrade platformio esptool | ||||
|      | ||||
|     - name: Build Firmware | ||||
|       run: | | ||||
|         pio run -t buildfs  # Build SPIFFS | ||||
|         pio run            # Build firmware | ||||
|          | ||||
|     - name: Install esptool | ||||
|     - name: Prepare binaries | ||||
|       run: | | ||||
|         pip install esptool | ||||
|         cd .pio/build/esp32dev | ||||
|          | ||||
|     - name: Merge firmware and SPIFFS | ||||
|       run: | | ||||
|         # Debug: Show all generated files | ||||
|         echo "Files in build directory:" | ||||
|         ls -la | ||||
|          | ||||
|         # Create OTA binary (already has correct magic byte) | ||||
|         cp firmware.bin filaman_ota.bin | ||||
|          | ||||
|         # Create a magic byte prepended binary for the bootloader | ||||
|         echo -ne '\xE9' > bootloader_with_magic.bin | ||||
|         cat bootloader.bin >> bootloader_with_magic.bin | ||||
|          | ||||
|         echo "Creating full binary with magic byte..." | ||||
|         esptool.py --chip esp32 merge_bin \ | ||||
|           --fill-flash-size 4MB \ | ||||
|           --flash_mode dio \ | ||||
|           --flash_freq 40m \ | ||||
|           --flash_size 4MB \ | ||||
|           -o .pio/build/esp32dev/filaman_full.bin \ | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||
|  | ||||
|     - name: Prepare OTA firmware | ||||
|       run: | | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||
|           -o filaman_full.bin \ | ||||
|           0x0000 bootloader_with_magic.bin \ | ||||
|           0x8000 partitions.bin \ | ||||
|           0x10000 firmware.bin \ | ||||
|           0x3D0000 spiffs.bin | ||||
|          | ||||
|         # Verify magic bytes | ||||
|         echo "Checking magic bytes:" | ||||
|         echo "OTA binary first bytes:" | ||||
|         hexdump -C -n 16 filaman_ota.bin | ||||
|         echo "Full binary first bytes:" | ||||
|         hexdump -C -n 16 filaman_full.bin | ||||
|          | ||||
|         # Verify file sizes | ||||
|         echo "File sizes:" | ||||
|         ls -lh *.bin | ||||
|      | ||||
|     - name: Get version from tag | ||||
|       id: get_version | ||||
|   | ||||
							
								
								
									
										57
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										57
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,62 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.2.79] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.79 | ||||
| - simplify Gitea release workflow by using esptool for binary creation | ||||
|  | ||||
|  | ||||
| ## [1.2.78] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.78 | ||||
| - streamline Gitea release workflow and update version to 1.2.77 | ||||
|  | ||||
| ### Fixed | ||||
| - update Gitea and GitHub release workflows to improve binary preparation and verification fix: correct version number in HTML files and platformio.ini to v1.2.76 enhance: streamline OTA update handling by removing unnecessary magic byte checks | ||||
|  | ||||
|  | ||||
| ## [1.2.77] - 2025-02-20 | ||||
| ### Changed | ||||
| - optimize Gitea release workflow by simplifying build steps and improving file handling | ||||
| - update webpages for version v1.2.77 | ||||
|  | ||||
|  | ||||
| ## [1.2.76] - 2025-02-20 | ||||
| ### Added | ||||
| - enhance OTA update process with improved file verification and new OTA data initialization | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.2.76 | ||||
| - streamline Gitea release workflow and remove obsolete OTA data initialization script | ||||
|  | ||||
|  | ||||
| ## [1.2.75] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.75 | ||||
| - simplify OTA update handling by removing unnecessary variables and improving error reporting | ||||
|  | ||||
|  | ||||
| ## [1.2.74] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.74 | ||||
| - enhance OTA update process with improved handling of full image updates and SPIFFS data | ||||
|  | ||||
|  | ||||
| ## [1.2.73] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.73 | ||||
| - improve OTA update process with enhanced size checks and progress logging | ||||
|  | ||||
| ### Fixed | ||||
| - enhance OTA update process with improved size checks and debugging output | ||||
|  | ||||
|  | ||||
| ## [1.2.72] - 2025-02-20 | ||||
| ### Changed | ||||
| - update webpages for version v1.2.72 | ||||
| - simplify OTA update process by removing unnecessary buffer and adjusting offsets | ||||
|  | ||||
|  | ||||
| ## [1.2.71] - 2025-02-20 | ||||
| ### Added | ||||
| - update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.71</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.79</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.2.71" | ||||
| version = "1.2.79" | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
| @@ -59,6 +59,13 @@ build_flags = | ||||
|     -DOTA_PARTITION_SUBTYPE=0x10 | ||||
|     -DPARTITION_TABLE_OFFSET=0x8000 | ||||
|     -DPARTITION_TABLE_SIZE=0x1000 | ||||
|     -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1 | ||||
|     -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1 | ||||
|     -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1 | ||||
|     -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000 | ||||
|     -DCONFIG_PARTITION_TABLE_OFFSET=0x8000 | ||||
|     -DCONFIG_PARTITION_TABLE_MD5=y | ||||
|     -DBOOT_APP_PARTITION_OTA_0=1 | ||||
|      | ||||
| extra_scripts =  | ||||
|     scripts/extra_script.py | ||||
| @@ -66,7 +73,6 @@ extra_scripts = | ||||
|     pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt | ||||
|     pre:scripts/combine_html.py  ; wird als drittes ausgeführt | ||||
|     scripts/gzip_files.py | ||||
|     scripts/create_full_bin.py  ; Neues Skript zur Erstellung der full.bin | ||||
|  | ||||
| ; Remove or comment out the targets line | ||||
| ;targets = buildfs, build | ||||
|   | ||||
| @@ -1,48 +0,0 @@ | ||||
| import os | ||||
| import shutil | ||||
| from platformio import util | ||||
|  | ||||
| Import("env") | ||||
|  | ||||
| def create_full_bin(source, target, env): | ||||
|     # Get paths | ||||
|     firmware_path = str(target[0]) | ||||
|     build_dir = os.path.dirname(firmware_path) | ||||
|     project_dir = env.get("PROJECT_DIR") | ||||
|      | ||||
|     # Create full binary | ||||
|     firmware_name = os.path.basename(firmware_path) | ||||
|     spiffs_bin = os.path.join(build_dir, "spiffs.bin") | ||||
|     full_bin = os.path.join(build_dir, "full.bin") | ||||
|      | ||||
|     print("Creating full.bin...") | ||||
|      | ||||
|     # Check if files exist | ||||
|     if not os.path.exists(firmware_path): | ||||
|         print("Error: Firmware binary not found!") | ||||
|         return | ||||
|     if not os.path.exists(spiffs_bin): | ||||
|         print("Error: SPIFFS binary not found!") | ||||
|         return | ||||
|      | ||||
|     # Calculate padding size | ||||
|     firmware_size = os.path.getsize(firmware_path) | ||||
|     padding_size = 0x3D0000 - firmware_size  # SPIFFS start address - firmware size | ||||
|      | ||||
|     # Create full binary | ||||
|     with open(full_bin, 'wb') as outfile: | ||||
|         # Copy firmware | ||||
|         with open(firmware_path, 'rb') as f: | ||||
|             outfile.write(f.read()) | ||||
|          | ||||
|         # Add padding | ||||
|         outfile.write(b'\xFF' * padding_size) | ||||
|          | ||||
|         # Copy SPIFFS | ||||
|         with open(spiffs_bin, 'rb') as f: | ||||
|             outfile.write(f.read()) | ||||
|      | ||||
|     print(f"Created full.bin ({os.path.getsize(full_bin)} bytes)") | ||||
|  | ||||
| # Register the callback | ||||
| env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", create_full_bin) | ||||
							
								
								
									
										186
									
								
								src/ota.cpp
									
									
									
									
									
								
							
							
						
						
									
										186
									
								
								src/ota.cpp
									
									
									
									
									
								
							| @@ -7,13 +7,9 @@ | ||||
| #include "scale.h" | ||||
| #include "nfc.h" | ||||
|  | ||||
| // Magic byte patterns für verschiedene Image-Typen | ||||
| const uint8_t FIRMWARE_MAGIC = 0xE9; | ||||
| const uint8_t ESP_MAGIC = 0xE9; | ||||
| static bool tasksAreStopped = false; | ||||
|  | ||||
| void stopAllTasks() { | ||||
|     // Stop all tasks | ||||
|     Serial.println("Stopping RFID Reader"); | ||||
|     if (RfidReaderTask) vTaskSuspend(RfidReaderTask); | ||||
|     Serial.println("Stopping Bambu"); | ||||
| @@ -25,175 +21,43 @@ void stopAllTasks() { | ||||
| } | ||||
|  | ||||
| void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { | ||||
|     static size_t contentLength = 0; | ||||
|     static bool isFullImage = false; | ||||
|     static uint32_t currentOffset = 0; | ||||
|     static uint8_t *spiffsBuffer = nullptr; | ||||
|     static size_t spiffsSize = 0; | ||||
|     static const uint32_t SPIFFS_START = 0x3D0000;  // Korrigierter SPIFFS start address aus partitions.csv | ||||
|     static const uint32_t SPIFFS_SIZE = 0x30000;   // Korrigierte SPIFFS size aus partitions.csv | ||||
|      | ||||
|     // Stop all tasks to save resources | ||||
|     if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) { | ||||
|         stopAllTasks(); | ||||
|         tasksAreStopped = true; | ||||
|     } | ||||
|  | ||||
|     if (!index) { | ||||
|         // Reset static variables | ||||
|         if (spiffsBuffer) { | ||||
|             free(spiffsBuffer); | ||||
|             spiffsBuffer = nullptr; | ||||
|         } | ||||
|          | ||||
|         contentLength = request->contentLength(); | ||||
|         Serial.printf("Update size: %u bytes\n", contentLength); | ||||
|          | ||||
|         if (contentLength == 0) { | ||||
|         Serial.printf("Update Start: %s\n", filename.c_str()); | ||||
|         if (request->contentLength() == 0) { | ||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}"); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         if (data[0] == ESP_MAGIC) { | ||||
|             isFullImage = (contentLength > SPIFFS_START); | ||||
|              | ||||
|             if (isFullImage) { | ||||
|                 if (!Update.begin(SPIFFS_START, U_FLASH)) { | ||||
|                     Serial.printf("Not enough space for firmware: %u required\n", SPIFFS_START); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 spiffsSize = SPIFFS_SIZE; | ||||
|                 spiffsBuffer = (uint8_t*)malloc(spiffsSize); | ||||
|                 if (!spiffsBuffer) { | ||||
|                     Serial.println("Failed to allocate SPIFFS buffer"); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 memset(spiffsBuffer, 0xFF, spiffsSize); | ||||
|                 Serial.println("Full image update started"); | ||||
|             } else { | ||||
|                 if (!Update.begin(contentLength, U_FLASH)) { | ||||
|                     Serial.printf("Not enough space: %u required\n", contentLength); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 Serial.println("Firmware update started"); | ||||
|             } | ||||
|         } else { | ||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}"); | ||||
|         if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) { | ||||
|             stopAllTasks(); | ||||
|             tasksAreStopped = true; | ||||
|         } | ||||
|  | ||||
|         // Da die full.bin jetzt das korrekte Magic Byte hat,  | ||||
|         // können wir ein normales Update ohne spezielle Flags starten | ||||
|         if (!Update.begin()) { | ||||
|             Update.printError(Serial); | ||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}"); | ||||
|             return; | ||||
|         } | ||||
|         currentOffset = 0; | ||||
|     } | ||||
|      | ||||
|     if (isFullImage) { | ||||
|         // Firmware Teil | ||||
|         if (currentOffset < SPIFFS_START) { | ||||
|             size_t writeLen = min(len, (size_t)(SPIFFS_START - currentOffset)); | ||||
|             if (Update.write(data, writeLen) != writeLen) { | ||||
|                 String errorMsg = Update.errorString(); | ||||
|                 if (errorMsg != "No Error") { | ||||
|                     Update.printError(Serial); | ||||
|                     if (spiffsBuffer) free(spiffsBuffer); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|          | ||||
|         // SPIFFS Teil | ||||
|         if (currentOffset + len > SPIFFS_START) { | ||||
|             uint32_t spiffsOffset = (currentOffset >= SPIFFS_START) ?  | ||||
|                                   (currentOffset - SPIFFS_START) : 0; | ||||
|             uint32_t dataOffset = (currentOffset < SPIFFS_START) ?  | ||||
|                                 (SPIFFS_START - currentOffset) : 0; | ||||
|              | ||||
|             if (spiffsOffset < spiffsSize) { | ||||
|                 size_t copyLen = min(len - dataOffset, spiffsSize - spiffsOffset); | ||||
|                 memcpy(spiffsBuffer + spiffsOffset, data + dataOffset, copyLen); | ||||
|                 Serial.printf("Collecting SPIFFS data: offset=%u, len=%u\n", spiffsOffset, copyLen); | ||||
|             } | ||||
|         } | ||||
|     } else { | ||||
|         if (Update.write(data, len) != len) { | ||||
|             String errorMsg = Update.errorString(); | ||||
|             if (errorMsg != "No Error") { | ||||
|                 Update.printError(Serial); | ||||
|                 request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}"); | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|     if (Update.write(data, len) != len) { | ||||
|         Update.printError(Serial); | ||||
|         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}"); | ||||
|         return; | ||||
|     } | ||||
|      | ||||
|     currentOffset += len; | ||||
|  | ||||
|     if (final) { | ||||
|         if (Update.end(true)) { | ||||
|             Serial.println("Firmware update complete"); | ||||
|              | ||||
|             if (isFullImage && spiffsBuffer) { | ||||
|                 Serial.println("Starting SPIFFS update"); | ||||
|                  | ||||
|                 if (SPIFFS.begin(true)) { | ||||
|                     SPIFFS.end(); | ||||
|                 } | ||||
|                  | ||||
|                 if (!Update.begin(spiffsSize, U_SPIFFS)) { | ||||
|                     Serial.println("Could not begin SPIFFS update"); | ||||
|                     free(spiffsBuffer); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 Serial.printf("Writing SPIFFS data: %u bytes\n", spiffsSize); | ||||
|                 if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) { | ||||
|                     Serial.println("SPIFFS Write Failed"); | ||||
|                     Update.printError(Serial); | ||||
|                     free(spiffsBuffer); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 if (!Update.end(true)) { | ||||
|                     Serial.println("SPIFFS End Failed"); | ||||
|                     Update.printError(Serial); | ||||
|                     free(spiffsBuffer); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 free(spiffsBuffer); | ||||
|                 spiffsBuffer = nullptr; | ||||
|                 Serial.println("SPIFFS update complete"); | ||||
|                  | ||||
|                 if (!SPIFFS.begin(true)) { | ||||
|                     Serial.println("SPIFFS mount after update failed"); | ||||
|                     request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 SPIFFS.end(); | ||||
|             } | ||||
|              | ||||
|             request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); | ||||
|             delay(1000); | ||||
|             ESP.restart(); | ||||
|         } else { | ||||
|             if (spiffsBuffer) { | ||||
|                 free(spiffsBuffer); | ||||
|                 spiffsBuffer = nullptr; | ||||
|             } | ||||
|             String errorMsg = Update.errorString(); | ||||
|             if (errorMsg != "No Error") { | ||||
|                 Update.printError(Serial); | ||||
|                 request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}"); | ||||
|             } else { | ||||
|                 request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); | ||||
|                 delay(1000); | ||||
|                 ESP.restart(); | ||||
|             } | ||||
|         if (!Update.end(true)) { | ||||
|             Update.printError(Serial); | ||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}"); | ||||
|             return; | ||||
|         } | ||||
|         Serial.println("Update successful, restarting..."); | ||||
|         request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}"); | ||||
|         delay(500); | ||||
|         ESP.restart(); | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -3,6 +3,12 @@ | ||||
|  | ||||
| #include <ESPAsyncWebServer.h> | ||||
|  | ||||
| // Update size unknown constant, falls nicht bereits definiert | ||||
| #ifndef UPDATE_SIZE_UNKNOWN | ||||
| #define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF | ||||
| #endif | ||||
|  | ||||
| void stopAllTasks(); | ||||
| void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); | ||||
|  | ||||
| #endif | ||||
		Reference in New Issue
	
	Block a user