Compare commits
	
		
			26 Commits
		
	
	
		
			v1.3.48
			...
			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 | 
							
								
								
									
										4
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -40,8 +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 minimal header
 | 
					        # Create SPIFFS binary - direct copy without header
 | 
				
			||||||
        ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					        cp .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 && 
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -47,8 +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 minimal header
 | 
					        # Create SPIFFS binary - direct copy without header
 | 
				
			||||||
        ( printf '\xe9\x01\x00\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					        cp .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 && 
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										49
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										49
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,54 @@
 | 
				
			|||||||
# 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
 | 
					## [1.3.48] - 2025-02-22
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
- update webpages for version v1.3.48
 | 
					- update webpages for version v1.3.48
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										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>Hollo Lollo Trollo</h4>
 | 
					                <h4>Filament Management Tool</h4>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <nav style="display: flex; gap: 1rem;">
 | 
					        <nav style="display: flex; gap: 1rem;">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.3.48"
 | 
					version = "1.3.56"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#test
 | 
					#test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
#include "nfc.h"
 | 
					#include "nfc.h"
 | 
				
			||||||
#include "scale.h"
 | 
					#include "scale.h"
 | 
				
			||||||
#include "esp_task_wdt.h"
 | 
					#include "esp_task_wdt.h"
 | 
				
			||||||
#include "esp_log.h"
 | 
					 | 
				
			||||||
#include <Update.h>
 | 
					#include <Update.h>
 | 
				
			||||||
#include "display.h"
 | 
					#include "display.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -166,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);
 | 
				
			||||||
@@ -391,25 +393,29 @@ void setupWebserver(AsyncWebServer &server) {
 | 
				
			|||||||
            static size_t updateSize = 0;
 | 
					            static size_t updateSize = 0;
 | 
				
			||||||
            static int command = 0;
 | 
					            static int command = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            oledShowMessage("Upgrade please wait");
 | 
					            //oledShowMessage("Upgrade please wait");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (!index) {
 | 
					            if (!index) {
 | 
				
			||||||
                // Reduziere Debug-Level während des Updates
 | 
					 | 
				
			||||||
                esp_log_level_set("*", ESP_LOG_ERROR);
 | 
					 | 
				
			||||||
                
 | 
					 | 
				
			||||||
                updateSize = request->contentLength();
 | 
					                updateSize = request->contentLength();
 | 
				
			||||||
                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
 | 
					                command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH;
 | 
				
			||||||
                
 | 
					                
 | 
				
			||||||
                if (command == U_SPIFFS) {
 | 
					                if (command == U_SPIFFS) {
 | 
				
			||||||
                    oledShowMessage("SPIFFS Update...");
 | 
					                    oledShowMessage("SPIFFS Update...");
 | 
				
			||||||
                    backupJsonConfigs();
 | 
					                    backupJsonConfigs();
 | 
				
			||||||
                    
 | 
					                    
 | 
				
			||||||
                    if (!Update.begin(updateSize, command)) {
 | 
					                    // 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();
 | 
					                        restoreJsonConfigs();
 | 
				
			||||||
                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
					                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
				
			||||||
                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
					                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
                        // Stelle Debug-Level wieder her
 | 
					 | 
				
			||||||
                        esp_log_level_set("*", ESP_LOG_INFO);
 | 
					 | 
				
			||||||
                        return;
 | 
					                        return;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
@@ -417,8 +423,6 @@ void setupWebserver(AsyncWebServer &server) {
 | 
				
			|||||||
                    if (!Update.begin(updateSize, command)) {
 | 
					                    if (!Update.begin(updateSize, command)) {
 | 
				
			||||||
                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
					                        String errorMsg = String("Update begin failed: ") + Update.errorString();
 | 
				
			||||||
                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
					                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
 | 
				
			||||||
                        // Stelle Debug-Level wieder her
 | 
					 | 
				
			||||||
                        esp_log_level_set("*", ESP_LOG_INFO);
 | 
					 | 
				
			||||||
                        return;
 | 
					                        return;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
@@ -450,12 +454,8 @@ void setupWebserver(AsyncWebServer &server) {
 | 
				
			|||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    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 + "\"}");
 | 
				
			||||||
                    // Stelle Debug-Level wieder her
 | 
					 | 
				
			||||||
                    esp_log_level_set("*", ESP_LOG_INFO);
 | 
					 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                // Stelle Debug-Level wieder her
 | 
					 | 
				
			||||||
                esp_log_level_set("*", ESP_LOG_INFO);
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user