Compare commits
	
		
			37 Commits
		
	
	
		
			v1.3.45
			...
			7b52066378
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | 
							
								
								
									
										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 with minimal header | ||||
|         ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${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 | ||||
|         (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 with minimal header | ||||
|         ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${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 &&  | ||||
|   | ||||
							
								
								
									
										72
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										72
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,77 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [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 | ||||
|   | ||||
							
								
								
									
										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 | ||||
|   | ||||
| @@ -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>Hollo Lollo Trollo</h4> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|         <nav style="display: flex; gap: 1rem;"> | ||||
|   | ||||
| @@ -189,13 +189,6 @@ | ||||
|  | ||||
|             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 { | ||||
| @@ -203,41 +196,27 @@ | ||||
|                     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; | ||||
|                         } | ||||
|                         // Zeige finale Nachricht | ||||
|                         status.textContent = jsonResponse.message || "Update complete"; | ||||
|                         status.classList.add(jsonResponse.success ? 'success' : 'error'); | ||||
|                         status.style.display = 'block'; | ||||
|                          | ||||
|                         // Handle success/error messages | ||||
|                         response = jsonResponse.message; | ||||
|                         if (jsonResponse.success) { | ||||
|                             progress.style.width = '100%'; | ||||
|                             progress.textContent = '100%'; | ||||
|                              | ||||
|                         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 = '/'; | ||||
|                             // Automatischer Neustart nach erfolgreicher Aktualisierung | ||||
|                             status.textContent = "Update successful! Restarting device..."; | ||||
|                             setTimeout(() => { | ||||
|                                 window.location.reload(); | ||||
|                             }, 5000); | ||||
|                         } else { | ||||
|                                     status.textContent = response + ` Redirecting in ${countdown} seconds...`; | ||||
|                                 } | ||||
|                             }, 1000); | ||||
|                             document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); | ||||
|                         } | ||||
|                     } catch (e) { | ||||
|                         console.error('JSON parse error:', e); | ||||
|                         status.textContent = 'Update failed: Invalid response from server'; | ||||
|                         status.classList.add('error'); | ||||
|                     } | ||||
|                      | ||||
|                     status.textContent = response; | ||||
|                     status.classList.add(xhr.status === 200 ? 'success' : 'error'); | ||||
|                     status.style.display = 'block'; | ||||
|                      | ||||
|                     if (xhr.status !== 200) { | ||||
|                         document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false); | ||||
|                     } | ||||
|                 } catch (error) { | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.45" | ||||
| version = "1.3.57" | ||||
|  | ||||
| #test | ||||
|  | ||||
|   | ||||
| @@ -165,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) { | ||||
| } | ||||
|  | ||||
| void setupWebserver(AsyncWebServer &server) { | ||||
|     // Deaktiviere alle Debug-Ausgaben | ||||
|     Serial.setDebugOutput(false); | ||||
|      | ||||
|     // WebSocket-Optimierungen | ||||
|     ws.onEvent(onWsEvent); | ||||
|     ws.enable(true); | ||||
| @@ -390,29 +393,34 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|             static size_t updateSize = 0; | ||||
|             static int command = 0; | ||||
|  | ||||
|             oledShowMessage("Upgrade please wait"); | ||||
|             //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 (command == U_SPIFFS) { | ||||
|                     Serial.println("Backup JSON configs..."); | ||||
|                     oledShowMessage("SPIFFS Update..."); | ||||
|                     backupJsonConfigs(); | ||||
|                      | ||||
|                     // Deaktiviere alle Validierungen für SPIFFS-Updates | ||||
|                     if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) { | ||||
|                         Serial.printf("Update Begin Error: %s\n", Update.errorString()); | ||||
|                     // 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 { | ||||
|                     // Normale Validierung für Firmware-Updates | ||||
|                     oledShowMessage("Firmware Update..."); | ||||
|                     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; | ||||
| @@ -422,7 +430,6 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|             if (len) { | ||||
|                 if (Update.write(data, len) != len) { | ||||
|                     Serial.printf("Update Write Error: %s\n", Update.errorString()); | ||||
|                     if (command == U_SPIFFS) { | ||||
|                         restoreJsonConfigs(); | ||||
|                     } | ||||
| @@ -431,23 +438,24 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|                     return; | ||||
|                 } | ||||
|                  | ||||
|                 // Sende den Fortschritt als JSON | ||||
|                 String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}"; | ||||
|                 request->send(200, "application/json", progress); | ||||
|                 // Update OLED Display alle 25% | ||||
|                 static int lastProgress = -1; | ||||
|                 int currentProgress = (index + len) * 100 / updateSize; | ||||
|                 if (currentProgress % 25 == 0 && currentProgress != lastProgress) { | ||||
|                     lastProgress = currentProgress; | ||||
|                     oledShowMessage(String(currentProgress) + "% complete"); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (final) { | ||||
|                 if (!Update.end(true)) { | ||||
|                     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.println("Update Success!"); | ||||
|             } | ||||
|         } | ||||
|     ); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user