Compare commits
	
		
			69 Commits
		
	
	
		
			v1.3.34
			...
			aa9e7da94b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| aa9e7da94b | |||
| 71cd3ba4fc | |||
| 73e240e879 | |||
| 0d34e1d718 | |||
| 84cc8beb9b | |||
| fd70e3179d | |||
| c553640ad8 | |||
| 807eca3c43 | |||
| b52730bf67 | |||
| 9a59b91e88 | |||
| a5af4013d8 | |||
| e54ce58ec4 | |||
| 142eafd232 | |||
| 63ab9e0993 | |||
| aaa5506d40 | |||
| 8037adc045 | |||
| 6e7c728cd8 | |||
| 3fe8271344 | |||
| f2bc6eab92 | |||
| 37df492339 | |||
| c4b425403f | |||
| 73244689dd | |||
| 27296104d2 | |||
| 5f99773897 | |||
| 7416285fb9 | |||
| 85928e358d | |||
| 092b4fd8ec | |||
| 399645a2b3 | |||
| 164bb241b7 | |||
| e564c6eeae | |||
| 4288dd0cd4 | |||
| 37d43b2d7d | |||
| adb354ddcd | |||
| 15d5e5edce | |||
| c6edf30245 | |||
| 65ac207f36 | |||
| 698abbd669 | |||
| 04a7c2cce3 | |||
| 78f54b72fd | |||
| f4eee9af91 | |||
| cad14b3bc2 | |||
| 312f75fc5f | |||
| b8714e93e2 | |||
| cd9da0fe4f | |||
| 2b620ef5ed | |||
| 3f63a01b8b | |||
| 22bb16b6a4 | |||
| 53ceee7816 | |||
| d48b002806 | |||
| dd905b6c6e | |||
| 77b9eda110 | |||
| 32a6e9dcd3 | |||
| 6cd5539e60 | |||
| 903b697912 | |||
| 72c2fb70c2 | |||
| f2f3f0ab9f | |||
| c07692c218 | |||
| a184903b66 | |||
| af1640383d | |||
| c00e54b145 | |||
| f6c92c686b | |||
| b8db01529b | |||
| 55db6d76ab | |||
| a18749a1ff | |||
| 1811fd9159 | |||
| b550760427 | |||
| c5033acadc | |||
| 7de4189c83 | |||
| f43f2a15b2 | 
							
								
								
									
										9
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -40,11 +40,8 @@ jobs:
 | 
				
			|||||||
        # Copy firmware binary
 | 
					        # Copy firmware binary
 | 
				
			||||||
        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
 | 
					        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Create SPIFFS binary with ESP32 image header
 | 
					        # Create SPIFFS binary - direct copy without header
 | 
				
			||||||
        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
 | 
					        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
				
			||||||
        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					 | 
				
			||||||
        # Append the actual SPIFFS data
 | 
					 | 
				
			||||||
        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Create full binary
 | 
					        # Create full binary
 | 
				
			||||||
        (cd .pio/build/esp32dev && 
 | 
					        (cd .pio/build/esp32dev && 
 | 
				
			||||||
@@ -57,7 +54,7 @@ jobs:
 | 
				
			|||||||
          0x1000 bootloader.bin \
 | 
					          0x1000 bootloader.bin \
 | 
				
			||||||
          0x8000 partitions.bin \
 | 
					          0x8000 partitions.bin \
 | 
				
			||||||
          0x10000 firmware.bin \
 | 
					          0x10000 firmware.bin \
 | 
				
			||||||
          0x390000 spiffs.bin)
 | 
					          0x3D0000 spiffs.bin)
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Verify file sizes
 | 
					        # Verify file sizes
 | 
				
			||||||
        echo "File sizes:"
 | 
					        echo "File sizes:"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										9
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -47,11 +47,8 @@ jobs:
 | 
				
			|||||||
        # Copy firmware binary
 | 
					        # Copy firmware binary
 | 
				
			||||||
        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
 | 
					        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Create SPIFFS binary with ESP32 image header
 | 
					        # Create SPIFFS binary - direct copy without header
 | 
				
			||||||
        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
 | 
					        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
				
			||||||
        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					 | 
				
			||||||
        # Append the actual SPIFFS data
 | 
					 | 
				
			||||||
        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Create full binary (always)
 | 
					        # Create full binary (always)
 | 
				
			||||||
        (cd .pio/build/esp32dev && 
 | 
					        (cd .pio/build/esp32dev && 
 | 
				
			||||||
@@ -64,7 +61,7 @@ jobs:
 | 
				
			|||||||
          0x1000 bootloader.bin \
 | 
					          0x1000 bootloader.bin \
 | 
				
			||||||
          0x8000 partitions.bin \
 | 
					          0x8000 partitions.bin \
 | 
				
			||||||
          0x10000 firmware.bin \
 | 
					          0x10000 firmware.bin \
 | 
				
			||||||
          0x390000 spiffs.bin)
 | 
					          0x3D0000 spiffs.bin)
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Verify file sizes
 | 
					        # Verify file sizes
 | 
				
			||||||
        echo "File sizes:"
 | 
					        echo "File sizes:"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										140
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										140
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,145 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.56] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.56
 | 
				
			||||||
 | 
					- update header title and improve SPIFFS update error handling
 | 
				
			||||||
 | 
					- clarify comments in Gitea and GitHub release workflows
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.55] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.55
 | 
				
			||||||
 | 
					- update component descriptions in README files
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.54] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.54
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary creation to exclude header
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.53] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- version: update to version 1.3.53
 | 
				
			||||||
 | 
					- update changelog for version 1.3.51
 | 
				
			||||||
 | 
					- update changelog for version 1.3.51
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.52] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.52
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.51] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update changelog for version 1.3.51
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.50] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.50
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.49] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.49
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary header to use correct chip revision
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.48] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.48
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary header for firmware release
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.47] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.47
 | 
				
			||||||
 | 
					- workflow: optimize firmware and SPIFFS update process, improve progress handling and logging
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.46] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.46
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.45] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.45
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.44] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.44
 | 
				
			||||||
 | 
					- update header title to 'Hollo Lollo Trollo'
 | 
				
			||||||
 | 
					- update header title to 'Filament Management Tool' and improve update response messages
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.43] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.43
 | 
				
			||||||
 | 
					- update header title to 'Hollo Lollo Trollo'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.42] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.42
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					- correct path for SPIFFS binary creation in Gitea release workflow
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.41] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.41
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					- remove redundant buffer size setting in NFC initialization
 | 
				
			||||||
 | 
					- update SPIFFS binary creation and enhance NFC buffer size
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.40] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.40
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					- update SPIFFS binary header and enhance WebSocket error handling
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.39] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.39
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary creation to set chip version to max supported
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.38] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.38
 | 
				
			||||||
 | 
					- workflow: update SPIFFS binary creation with minimal ESP32 image header
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.37] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.37
 | 
				
			||||||
 | 
					- workflow: update ESP32-WROOM image header for SPIFFS binary creation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.36] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.36
 | 
				
			||||||
 | 
					- partition: update SPIFFS binary header and offsets in workflow files
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.35] - 2025-02-22
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.35
 | 
				
			||||||
 | 
					- partition: update SPIFFS binary header and offsets in workflow files
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [1.3.34] - 2025-02-22
 | 
					## [1.3.34] - 2025-02-22
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
- update webpages for version v1.3.34
 | 
					- update webpages for version v1.3.34
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										16
									
								
								README.de.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.de.md
									
									
									
									
									
								
							@@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 | 
				
			|||||||
### Komponenten
 | 
					### Komponenten
 | 
				
			||||||
- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
 | 
					- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/aXThslf)
 | 
					[Amazon Link](https://amzn.eu/d/aXThslf)
 | 
				
			||||||
- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung.
 | 
					- **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/1wZ4v0x)
 | 
					[Amazon Link](https://amzn.eu/d/06A0DLb)
 | 
				
			||||||
- **OLED Display:** 128x64 SSD1306.
 | 
					- **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/dozAYDU)
 | 
					[Amazon Link](https://amzn.eu/d/0AuBp2c)
 | 
				
			||||||
- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
 | 
					- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/8205DDh)
 | 
					[Amazon Link](https://amzn.eu/d/jfIuQXb)
 | 
				
			||||||
- **NFC-Tag:** NTAG215
 | 
					- **NFC Tags Ntag215:** RFID Tag
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/fywy4c4)
 | 
					[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Pin-Konfiguration
 | 
					### Pin-Konfiguration
 | 
				
			||||||
| Komponente        | ESP32 Pin |
 | 
					| 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
 | 
					### Components
 | 
				
			||||||
- **ESP32 Development Board:** Any ESP32 variant.
 | 
					- **ESP32 Development Board:** Any ESP32 variant.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/aXThslf)
 | 
					[Amazon Link](https://amzn.eu/d/aXThslf)
 | 
				
			||||||
- **HX711 Load Cell Amplifier:** For weight measurement.
 | 
					- **HX711 5kg Load Cell Amplifier:** For weight measurement.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/1wZ4v0x)
 | 
					[Amazon Link](https://amzn.eu/d/06A0DLb)
 | 
				
			||||||
- **OLED Display:** 128x64 SSD1306.
 | 
					- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/dozAYDU)
 | 
					[Amazon Link](https://amzn.eu/d/0AuBp2c)
 | 
				
			||||||
- **PN532 NFC Module:** For NFC tag operations.
 | 
					- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/8205DDh)
 | 
					[Amazon Link](https://amzn.eu/d/jfIuQXb)
 | 
				
			||||||
- **NFC-Tag:** NTAG215
 | 
					- **NFC Tags Ntag215:** RFID Tag
 | 
				
			||||||
[Amazon Link](https://amzn.eu/d/fywy4c4)
 | 
					[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Pin Configuration
 | 
					### Pin Configuration
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
@@ -189,48 +189,34 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
            const xhr = new XMLHttpRequest();
 | 
					            const xhr = new XMLHttpRequest();
 | 
				
			||||||
            xhr.open('POST', '/update', true);
 | 
					            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() {
 | 
					            xhr.onload = function() {
 | 
				
			||||||
                try {
 | 
					                try {
 | 
				
			||||||
                    let response = this.responseText;
 | 
					                    let response = this.responseText;
 | 
				
			||||||
                    try {
 | 
					                    try {
 | 
				
			||||||
                        const jsonResponse = JSON.parse(response);
 | 
					                        const jsonResponse = JSON.parse(response);
 | 
				
			||||||
                        response = jsonResponse.message;
 | 
					 | 
				
			||||||
                        
 | 
					                        
 | 
				
			||||||
                        if (jsonResponse.restart) {
 | 
					                        // Zeige finale Nachricht
 | 
				
			||||||
                            status.textContent = response + " Redirecting in 20 seconds...";
 | 
					                        status.textContent = jsonResponse.message || "Update complete";
 | 
				
			||||||
                            let countdown = 20;
 | 
					                        status.classList.add(jsonResponse.success ? 'success' : 'error');
 | 
				
			||||||
                            const timer = setInterval(() => {
 | 
					                        status.style.display = 'block';
 | 
				
			||||||
                                countdown--;
 | 
					                        
 | 
				
			||||||
                                if (countdown <= 0) {
 | 
					                        if (jsonResponse.success) {
 | 
				
			||||||
                                    clearInterval(timer);
 | 
					                            progress.style.width = '100%';
 | 
				
			||||||
                                    window.location.href = '/';
 | 
					                            progress.textContent = '100%';
 | 
				
			||||||
                                } else {
 | 
					                            
 | 
				
			||||||
                                    status.textContent = response + ` Redirecting in ${countdown} seconds...`;
 | 
					                            // Automatischer Neustart nach erfolgreicher Aktualisierung
 | 
				
			||||||
                                }
 | 
					                            status.textContent = "Update successful! Restarting device...";
 | 
				
			||||||
                            }, 1000);
 | 
					                            setTimeout(() => {
 | 
				
			||||||
 | 
					                                window.location.reload();
 | 
				
			||||||
 | 
					                            }, 5000);
 | 
				
			||||||
 | 
					                        } else {
 | 
				
			||||||
 | 
					                            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    } catch (e) {
 | 
					                    } catch (e) {
 | 
				
			||||||
                        if (!isNaN(response)) {
 | 
					                        console.error('JSON parse error:', e);
 | 
				
			||||||
                            const percent = parseInt(response);
 | 
					                        status.textContent = 'Update failed: Invalid response from server';
 | 
				
			||||||
                            progress.style.width = percent + '%';
 | 
					                        status.classList.add('error');
 | 
				
			||||||
                            progress.textContent = percent + '%';
 | 
					 | 
				
			||||||
                            return;
 | 
					 | 
				
			||||||
                        }
 | 
					 | 
				
			||||||
                    }
 | 
					 | 
				
			||||||
                    
 | 
					 | 
				
			||||||
                    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);
 | 
					                        document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                } catch (error) {
 | 
					                } catch (error) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@
 | 
				
			|||||||
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
					            <img src="/logo.png" alt="FilaMan Logo" class="logo">
 | 
				
			||||||
            <div class="logo-text">
 | 
					            <div class="logo-text">
 | 
				
			||||||
                <h1>FilaMan<span class="version"></span></h1>
 | 
					                <h1>FilaMan<span class="version"></span></h1>
 | 
				
			||||||
                <h4>Filament Management Tool</h4>
 | 
					                <h4>Hollo Lollo Trollo</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
# Name,   Type, SubType,    Offset,   Size,     Flags
 | 
					# Name,   Type, SubType,    Offset,   Size,     Flags
 | 
				
			||||||
nvs,      data, nvs,       0x9000,   0x5000,
 | 
					nvs,      data, nvs,       0x9000,   0x5000,
 | 
				
			||||||
otadata,  data, ota,       0xe000,   0x2000,
 | 
					otadata,  data, ota,       0xe000,   0x2000,
 | 
				
			||||||
app0,     app,  ota_0,     0x10000,  0x1C0000,
 | 
					app0,     app,  ota_0,     0x10000,  0x1E0000,
 | 
				
			||||||
app1,     app,  ota_1,     0x1D0000, 0x1C0000,
 | 
					app1,     app,  ota_1,     0x1F0000, 0x1E0000,
 | 
				
			||||||
spiffs,   data, spiffs,    0x390000, 0x70000,
 | 
					spiffs,   data, spiffs,    0x3D0000, 0x30000,
 | 
				
			||||||
		
		
			
  | 
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.3.34"
 | 
					version = "1.3.56"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#test
 | 
					#test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -54,12 +54,8 @@ build_flags =
 | 
				
			|||||||
    -DCONFIG_ARDUHAL_LOG_COLORS=1
 | 
					    -DCONFIG_ARDUHAL_LOG_COLORS=1
 | 
				
			||||||
    -DOTA_DEBUG=1
 | 
					    -DOTA_DEBUG=1
 | 
				
			||||||
    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
 | 
					    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
 | 
				
			||||||
    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
 | 
					 | 
				
			||||||
    -DBOOT_APP_PARTITION_OTA_0=1
 | 
					    -DBOOT_APP_PARTITION_OTA_0=1
 | 
				
			||||||
    -DCONFIG_LOG_DEFAULT_LEVEL=3
 | 
					 | 
				
			||||||
    -DCONFIG_LWIP_TCP_MSL=60000
 | 
					    -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_TCP_RCV_BUF_DEFAULT=4096
 | 
				
			||||||
    -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
 | 
					    -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,6 +19,12 @@
 | 
				
			|||||||
void setup() {
 | 
					void setup() {
 | 
				
			||||||
  Serial.begin(115200);
 | 
					  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
 | 
					  // Initialize SPIFFS
 | 
				
			||||||
  initializeSPIFFS();
 | 
					  initializeSPIFFS();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										127
									
								
								src/website.cpp
									
									
									
									
									
								
							
							
						
						
									
										127
									
								
								src/website.cpp
									
									
									
									
									
								
							@@ -8,6 +8,7 @@
 | 
				
			|||||||
#include "scale.h"
 | 
					#include "scale.h"
 | 
				
			||||||
#include "esp_task_wdt.h"
 | 
					#include "esp_task_wdt.h"
 | 
				
			||||||
#include <Update.h>
 | 
					#include <Update.h>
 | 
				
			||||||
 | 
					#include "display.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef VERSION
 | 
					#ifndef VERSION
 | 
				
			||||||
  #define VERSION "1.1.0"
 | 
					  #define VERSION "1.1.0"
 | 
				
			||||||
@@ -32,6 +33,10 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
 | 
				
			|||||||
        sendWriteResult(client, 3);
 | 
					        sendWriteResult(client, 3);
 | 
				
			||||||
    } else if (type == WS_EVT_DISCONNECT) {
 | 
					    } else if (type == WS_EVT_DISCONNECT) {
 | 
				
			||||||
        Serial.println("Client getrennt.");
 | 
					        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) {
 | 
					    } else if (type == WS_EVT_DATA) {
 | 
				
			||||||
        String message = String((char*)data);
 | 
					        String message = String((char*)data);
 | 
				
			||||||
        JsonDocument doc;
 | 
					        JsonDocument doc;
 | 
				
			||||||
@@ -160,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void setupWebserver(AsyncWebServer &server) {
 | 
					void setupWebserver(AsyncWebServer &server) {
 | 
				
			||||||
 | 
					    // Deaktiviere alle Debug-Ausgaben
 | 
				
			||||||
 | 
					    Serial.setDebugOutput(false);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
    // WebSocket-Optimierungen
 | 
					    // WebSocket-Optimierungen
 | 
				
			||||||
    ws.onEvent(onWsEvent);
 | 
					    ws.onEvent(onWsEvent);
 | 
				
			||||||
    ws.enable(true);
 | 
					    ws.enable(true);
 | 
				
			||||||
@@ -363,58 +371,91 @@ void setupWebserver(AsyncWebServer &server) {
 | 
				
			|||||||
        [](AsyncWebServerRequest *request) {
 | 
					        [](AsyncWebServerRequest *request) {
 | 
				
			||||||
            // Nach Update-Abschluss
 | 
					            // Nach Update-Abschluss
 | 
				
			||||||
            bool success = !Update.hasError();
 | 
					            bool success = !Update.hasError();
 | 
				
			||||||
 | 
					            String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
 | 
				
			||||||
            AsyncWebServerResponse *response = request->beginResponse(
 | 
					            AsyncWebServerResponse *response = request->beginResponse(
 | 
				
			||||||
                success ? 200 : 400,
 | 
					                success ? 200 : 400,
 | 
				
			||||||
                "application/json",
 | 
					                "application/json",
 | 
				
			||||||
                success ? "{\"success\":true,\"message\":\"Update successful\"}" 
 | 
					                "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
 | 
				
			||||||
                       : "{\"success\":false,\"message\":\"Update failed\"}"
 | 
					 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
            response->addHeader("Connection", "close");
 | 
					            response->addHeader("Connection", "close");
 | 
				
			||||||
            request->send(response);
 | 
					            request->send(response);
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
            if (success) {
 | 
					            if (success) {
 | 
				
			||||||
 | 
					                oledShowMessage("Upgrade successful Rebooting");
 | 
				
			||||||
                delay(500);
 | 
					                delay(500);
 | 
				
			||||||
                ESP.restart();
 | 
					                ESP.restart();
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            else {
 | 
				
			||||||
 | 
					                oledShowMessage("Upgrade failed");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
 | 
					        [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
 | 
				
			||||||
            static size_t updateSize = 0;
 | 
					            static size_t updateSize = 0;
 | 
				
			||||||
            static int command = 0;
 | 
					            static int command = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //oledShowMessage("Upgrade please wait");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (!index) {
 | 
					            if (!index) {
 | 
				
			||||||
                updateSize = request->contentLength();
 | 
					                updateSize = request->contentLength();
 | 
				
			||||||
                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
 | 
					                command = (filename.indexOf("website") > -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)) {
 | 
					                if (command == U_SPIFFS) {
 | 
				
			||||||
                    Serial.printf("Update Begin Error: ");
 | 
					                    oledShowMessage("SPIFFS Update...");
 | 
				
			||||||
                    Update.printError(Serial);
 | 
					                    backupJsonConfigs();
 | 
				
			||||||
                    String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
					                    
 | 
				
			||||||
                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
					                    // Get the actual SPIFFS partition size from ESP32
 | 
				
			||||||
                    return;
 | 
					                    const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
 | 
				
			||||||
 | 
					                    if (!partition) {
 | 
				
			||||||
 | 
					                        restoreJsonConfigs();
 | 
				
			||||||
 | 
					                        String errorMsg = "SPIFFS partition not found";
 | 
				
			||||||
 | 
					                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
 | 
					                        return;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    
 | 
				
			||||||
 | 
					                    if (!Update.begin(partition->size, command)) {
 | 
				
			||||||
 | 
					                        restoreJsonConfigs();
 | 
				
			||||||
 | 
					                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
				
			||||||
 | 
					                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
 | 
					                        return;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    oledShowMessage("Firmware Update...");
 | 
				
			||||||
 | 
					                    if (!Update.begin(updateSize, command)) {
 | 
				
			||||||
 | 
					                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
				
			||||||
 | 
					                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
 | 
					                        return;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (len) {
 | 
					            if (len) {
 | 
				
			||||||
                if (Update.write(data, len) != len) {
 | 
					                if (Update.write(data, len) != len) {
 | 
				
			||||||
                    Serial.printf("Update Write Error: ");
 | 
					                    if (command == U_SPIFFS) {
 | 
				
			||||||
                    Update.printError(Serial);
 | 
					                        restoreJsonConfigs();
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                    String errorMsg = String("Write failed: ") + Update.errorString();
 | 
					                    String errorMsg = String("Write failed: ") + Update.errorString();
 | 
				
			||||||
                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
					                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                Serial.printf("Progress: %u/%u\r", index + len, updateSize);
 | 
					                
 | 
				
			||||||
 | 
					                // 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 (final) {
 | 
				
			||||||
                if (!Update.end(true)) {
 | 
					                if (!Update.end(true)) {
 | 
				
			||||||
                    Serial.printf("Update End Error: ");
 | 
					                    if (command == U_SPIFFS) {
 | 
				
			||||||
                    Update.printError(Serial);
 | 
					                        restoreJsonConfigs();
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                    String errorMsg = String("Update end failed: ") + Update.errorString();
 | 
					                    String errorMsg = String("Update end failed: ") + Update.errorString();
 | 
				
			||||||
                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
					                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                Serial.printf("\nUpdate Success: %uB\n", index+len);
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
@@ -442,60 +483,6 @@ void setupWebserver(AsyncWebServer &server) {
 | 
				
			|||||||
    Serial.println("Webserver gestartet");
 | 
					    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() {
 | 
					void backupJsonConfigs() {
 | 
				
			||||||
    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
 | 
					    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user