Compare commits
	
		
			5 Commits
		
	
	
		
			v1.3.44
			...
			adb354ddcd
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| adb354ddcd | |||
| 15d5e5edce | |||
| c6edf30245 | |||
| 65ac207f36 | |||
| 698abbd669 | 
							
								
								
									
										4
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -40,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 (without header) | ||||
|         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 &&  | ||||
|   | ||||
							
								
								
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -47,8 +47,8 @@ jobs: | ||||
|         # Copy firmware binary | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||
|          | ||||
|         # Create SPIFFS binary (without header) | ||||
|         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 &&  | ||||
|   | ||||
							
								
								
									
										11
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,16 @@ | ||||
| # 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 | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.44" | ||||
| version = "1.3.46" | ||||
|  | ||||
| #test | ||||
|  | ||||
|   | ||||
| @@ -397,27 +397,20 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|                 command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH; | ||||
|                 Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command); | ||||
|                  | ||||
|                 // Überprüfe die SPIFFS-Größe | ||||
|                 if (command == U_SPIFFS && updateSize > 0x30000) { | ||||
|                     String errorMsg = "SPIFFS update too large. Maximum size is 192KB"; | ||||
|                     Serial.println(errorMsg); | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|  | ||||
|                 if (command == U_SPIFFS) { | ||||
|                     Serial.println("Backup JSON configs..."); | ||||
|                     backupJsonConfigs(); | ||||
|                      | ||||
|                     if (!Update.begin(updateSize, command, false)) { | ||||
|                     // Deaktiviere alle Validierungen für SPIFFS-Updates | ||||
|                     if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) { | ||||
|                         Serial.printf("Update Begin Error: %s\n", Update.errorString()); | ||||
|                         Serial.println("Restoring JSON configs..."); | ||||
|                         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(); | ||||
| @@ -431,7 +424,6 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|                 if (Update.write(data, len) != len) { | ||||
|                     Serial.printf("Update Write Error: %s\n", Update.errorString()); | ||||
|                     if (command == U_SPIFFS) { | ||||
|                         Serial.println("Restoring JSON configs..."); | ||||
|                         restoreJsonConfigs(); | ||||
|                     } | ||||
|                     String errorMsg = String("Write failed: ") + Update.errorString(); | ||||
| @@ -439,7 +431,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 Serial.printf("Progress: %u/%u\n", index + len, updateSize); | ||||
|                 // Sende den Fortschritt als JSON | ||||
|                 String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}"; | ||||
|                 request->send(200, "application/json", progress); | ||||
|             } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user