Compare commits
	
		
			115 Commits
		
	
	
		
			v1.3.73
			...
			d9c40f5124
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d9c40f5124 | |||
| 68bc31e29a | |||
| 9b23ac5fd2 | |||
| d31bff14c3 | |||
| 150f92484a | |||
| fa74832fb9 | |||
| 2eab3db77d | |||
| 0a1bf22f7e | |||
| d58244c1f8 | |||
| db626ea516 | |||
| fd8f7685a1 | |||
| 944b156528 | |||
| 76100593cc | |||
| 732d590344 | |||
| 46cd953b80 | |||
| c645035bbe | |||
| 9e76620cd3 | |||
| faddda6201 | |||
| de9c1706c0 | |||
| 9f7ee13e78 | |||
| cf3f6f6741 | |||
| b87d43c64e | |||
| 3d0411e3c1 | |||
| 9c61b708aa | |||
| 90f800d042 | |||
| a7b1721e1d | |||
| e4825d2905 | |||
| c1733848d3 | |||
| 484c95523d | |||
| 8499613215 | |||
| 08f37186b4 | |||
| 2948a35fa8 | |||
| 730724fe58 | |||
| 714b7065e7 | |||
| 2d8aec515d | |||
| b245a206ce | |||
| f1489e75cc | |||
| d9ae829503 | |||
| 2247b8ed6c | |||
| d70b187bf9 | |||
| 1ade007473 | |||
| 0af14e2f7d | |||
| de67cdbff3 | |||
| 98fce15ccc | |||
| ab417ba64b | |||
| 320057bc49 | |||
| 9007a65fc2 | |||
| 2214f5f5de | |||
| 5c5846c52c | |||
| 517fa37a3d | |||
| aaa7a6ee9c | |||
| a0b8639488 | |||
| a16c05287e | |||
| ecb35a97bd | |||
| ba968611ec | |||
| 6bd11ddce3 | |||
| 3eb313e61a | |||
| aad35dc296 | |||
| 85ac636b1e | |||
| 6f1804c3fe | |||
| 89716920dc | |||
| 78b5078651 | |||
| 6098c3b052 | |||
| e7537f94d4 | |||
| 37717392d0 | |||
| c6da28ad6f | |||
| d6e38a4e73 | |||
| 4e0d9353c8 | |||
| 7059826659 | |||
| 41faa8bb1c | |||
| b38e3fa5ef | |||
| 5280d7e341 | |||
| 2f95c66d39 | |||
| df1b87465c | |||
| 84f1420999 | |||
| b14dd5475d | |||
| 975845421b | |||
| 044ddbe0eb | |||
| c385544d67 | |||
| c6cfd85687 | |||
| 84632322e2 | |||
| 86e55a8696 | |||
| d2b40daaca | |||
| 9d58cbc31c | |||
| d09aeaf47c | |||
| 9fb82fe51e | |||
| 5e0e2c5f6b | |||
| a8460503ff | |||
| 6700a1761f | |||
| 7207f36e06 | |||
| e79bee3381 | |||
| c3918f075b | |||
| 0c384219c5 | |||
| 42b9daf4be | |||
| 13a771682f | |||
| f79f87bf09 | |||
| 9fe3f6c0ff | |||
| 55e89948bb | |||
| 6c5e8c4d07 | |||
| 4f79700d74 | |||
| 1b4fecf409 | |||
| 89a6101d97 | |||
| ee45a74fee | |||
| db365aba3c | |||
| 63cdfaee6c | |||
| eb2e360c35 | |||
| 7d578640e2 | |||
| b006533a91 | |||
| 9fa7526623 | |||
| dfbb2fbd9b | |||
| 0302158449 | |||
| 68c385f9d7 | |||
| 9a8bd58cb3 | |||
| 0d8b8918c1 | |||
| a892b854b5 | 
							
								
								
									
										23
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -6,13 +6,17 @@ on: | ||||
|       GITEA_TOKEN: | ||||
|         description: 'Token für Gitea API-Zugriff' | ||||
|         required: true | ||||
|       FTP_PASSWORD: | ||||
|         description: 'FTP Password for firmware upload' | ||||
|         required: true | ||||
|  | ||||
|     outputs: | ||||
|       version: | ||||
|         description: 'The version that was released' | ||||
|         value: ${{ jobs.create-release.outputs.version }} | ||||
|  | ||||
| jobs: | ||||
|   create-release: | ||||
|     runs-on: ubuntu-latest | ||||
|     outputs: | ||||
|       version: ${{ steps.get_version.outputs.VERSION }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v4 | ||||
|       with: | ||||
| @@ -202,16 +206,3 @@ jobs: | ||||
|             fi | ||||
|           fi | ||||
|         done | ||||
|  | ||||
|     - name: Upload Firmware via FTP | ||||
|       if: success() | ||||
|       uses: sebastianpopp/ftp-action@releases/v2 | ||||
|       with: | ||||
|         host: "filaman.app" | ||||
|         port: 21 | ||||
|         user: "firmware" | ||||
|         password: ${{ secrets.FTP_PASSWORD }} | ||||
|         forceSsl: true | ||||
|         localDir: ".pio/build/esp32dev" | ||||
|         remoteDir: "/" | ||||
|         options: "set ssl:verify-certificate no; mirror -R --include-glob filaman_full_*.bin --parallel=1" | ||||
							
								
								
									
										33
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										33
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -149,4 +149,37 @@ jobs: | ||||
|         else | ||||
|           echo "Error: No files found to upload" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|     - name: Install lftp | ||||
|       run: sudo apt-get install -y lftp | ||||
|          | ||||
|     - name: Upload Firmware via FTP | ||||
|       if: success() | ||||
|       env: | ||||
|         FTP_PASSWORD: ${{ vars.FTP_PASSWORD }} | ||||
|         FTP_USER: ${{ vars.FTP_USER }} | ||||
|         FTP_HOST: ${{ vars.FTP_HOST }} | ||||
|         VERSION: ${{ steps.get_version.outputs.VERSION }} | ||||
|       run: | | ||||
|         echo "Environment variables:" | ||||
|         env | grep -E '^FTP_' | while read -r line; do | ||||
|           var_name=$(echo "$line" | cut -d= -f1) | ||||
|           var_value=$(echo "$line" | cut -d= -f2-) | ||||
|           echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)" | ||||
|         done | ||||
|          | ||||
|         cd .pio/build/esp32dev | ||||
|         if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then | ||||
|           echo "All FTP credentials are present, attempting upload..." | ||||
|           lftp -c "set ssl:verify-certificate no; \ | ||||
|                     set ftp:ssl-protect-data true; \ | ||||
|                     set ftp:ssl-force true; \ | ||||
|                     set ssl:check-hostname false; \ | ||||
|                     set ftp:ssl-auth TLS; \ | ||||
|                     open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \ | ||||
|                     put -O / filaman_full_${VERSION}.bin -o filaman_full.bin" | ||||
|         else | ||||
|           echo "Error: Some FTP credentials are missing" | ||||
|           exit 1 | ||||
|         fi | ||||
							
								
								
									
										54
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										54
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							| @@ -1,54 +0,0 @@ | ||||
| { | ||||
|     "files.associations": { | ||||
|         "algorithm": "cpp", | ||||
|         "vector": "cpp", | ||||
|         "cmath": "cpp", | ||||
|         "array": "cpp", | ||||
|         "atomic": "cpp", | ||||
|         "*.tcc": "cpp", | ||||
|         "bitset": "cpp", | ||||
|         "cctype": "cpp", | ||||
|         "clocale": "cpp", | ||||
|         "cstdarg": "cpp", | ||||
|         "cstddef": "cpp", | ||||
|         "cstdint": "cpp", | ||||
|         "cstdio": "cpp", | ||||
|         "cstdlib": "cpp", | ||||
|         "cstring": "cpp", | ||||
|         "ctime": "cpp", | ||||
|         "cwchar": "cpp", | ||||
|         "cwctype": "cpp", | ||||
|         "deque": "cpp", | ||||
|         "unordered_map": "cpp", | ||||
|         "unordered_set": "cpp", | ||||
|         "exception": "cpp", | ||||
|         "functional": "cpp", | ||||
|         "iterator": "cpp", | ||||
|         "map": "cpp", | ||||
|         "memory": "cpp", | ||||
|         "memory_resource": "cpp", | ||||
|         "numeric": "cpp", | ||||
|         "optional": "cpp", | ||||
|         "random": "cpp", | ||||
|         "regex": "cpp", | ||||
|         "string": "cpp", | ||||
|         "string_view": "cpp", | ||||
|         "system_error": "cpp", | ||||
|         "tuple": "cpp", | ||||
|         "type_traits": "cpp", | ||||
|         "utility": "cpp", | ||||
|         "fstream": "cpp", | ||||
|         "initializer_list": "cpp", | ||||
|         "iomanip": "cpp", | ||||
|         "iosfwd": "cpp", | ||||
|         "istream": "cpp", | ||||
|         "limits": "cpp", | ||||
|         "new": "cpp", | ||||
|         "ostream": "cpp", | ||||
|         "sstream": "cpp", | ||||
|         "stdexcept": "cpp", | ||||
|         "streambuf": "cpp", | ||||
|         "cinttypes": "cpp", | ||||
|         "typeinfo": "cpp" | ||||
|     } | ||||
| } | ||||
							
								
								
									
										246
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										246
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,251 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.3.98] - 2025-02-28 | ||||
| ### Changed | ||||
| - update platformio.ini for version v1.3.98 | ||||
| - migrate from SPIFFS to LittleFS for file handling | ||||
| - remove unused VSCode settings file | ||||
| - remove commented-out spoolman and filaman data from api.cpp | ||||
|  | ||||
|  | ||||
| ## [1.3.97] - 2025-02-28 | ||||
| ### Added | ||||
| - füge Bestätigungsmeldung für Spool-Einstellung hinzu | ||||
| - verbessere WLAN-Konfiguration und füge mDNS-Unterstützung hinzu | ||||
| - aktualisiere OLED-Anzeige mit Versionsnummer und verbessere Textausrichtung | ||||
| - füge regelmäßige WLAN-Verbindungsüberprüfung hinzu | ||||
| - aktualisiere Schaltplan-Bild | ||||
| - zeige Versionsnummer im OLED-Display an | ||||
|  | ||||
| ### Changed | ||||
| - update platformio.ini for version v1.3.97 | ||||
| - entferne text-shadow von deaktivierten Schaltflächen | ||||
| - füge Link zum Wiki für detaillierte Informationen über die Nutzung hinzu | ||||
|  | ||||
| ### Fixed | ||||
| - Speichernutzung optimiert | ||||
| - behebe doppelte http.end() Aufrufe in checkSpoolmanExtraFields | ||||
| - optimiere Verzögerungen und Stackgrößen in NFC-Task-Funktionen | ||||
| - entferne ungenutzte Bibliotheken und Debug-Ausgaben aus main.cpp | ||||
|  | ||||
|  | ||||
| ## [1.3.96] - 2025-02-25 | ||||
| ### Added | ||||
| - füge Unterstützung für Spoolman-Einstellungen hinzu und aktualisiere die Benutzeroberfläche | ||||
| - entferne die sendAmsData-Funktion aus der API-Schnittstelle | ||||
| - erweitere Bambu-Credentials um AutoSend-Zeit und aktualisiere die Benutzeroberfläche | ||||
| - erweitere Bambu-Credentials mit AutoSend-Wartezeit und aktualisiere die Benutzeroberfläche | ||||
| - add espRestart function and replace delay with vTaskDelay for OTA update process | ||||
| - implement OTA update functionality with backup and restore for configurations | ||||
| - add own_filaments.json and integrate custom filament loading in bambu.cpp | ||||
|  | ||||
| ### Changed | ||||
| - update platformio.ini for version v1.3.96 | ||||
|  | ||||
| ### Fixed | ||||
| - aktualisiere Bedingungen für die AMS-Datenaktualisierung und entferne unnötige Aufrufe | ||||
| - aktualisiere Bedingung für den Fortschritt der OTA-Update-Nachricht | ||||
| - update auto set logic to check RFID tag before setting Bambu spool | ||||
|  | ||||
|  | ||||
| ## [1.3.95] - 2025-02-24 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.95 | ||||
|  | ||||
| ### Fixed | ||||
| - bind autoSendToBambu variable to checkbox in spoolman.html | ||||
|  | ||||
|  | ||||
| ## [1.3.94] - 2025-02-24 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.94 | ||||
|  | ||||
| ### Fixed | ||||
| - correct payload type check in NFC write event handling | ||||
|  | ||||
|  | ||||
| ## [1.3.93] - 2025-02-24 | ||||
| ### Added | ||||
| - implement auto send feature for Bambu spool management and update related configurations | ||||
| - add debug mode instructions for Spoolman in README | ||||
| - add wiring diagrams to README for PN532 I2C setup | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.93 | ||||
| - simplify filament names in JSON configuration | ||||
| - update findFilamentIdx to return structured result and improve type searching logic | ||||
| - update README to reflect PN532 I2C configuration and remove SPI pin details | ||||
|  | ||||
| ### Fixed | ||||
| - remove debug output from splitTextIntoLines and update weight display logic in scanRfidTask | ||||
| - enhance weight display logic for negative values | ||||
| - remove unnecessary CPU frequency configuration from setup function | ||||
|  | ||||
|  | ||||
| ## [1.3.92] - 2025-02-24 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.92 | ||||
| - remove commented-out code in setBambuSpool function | ||||
| - update installation instructions and formatting in README files | ||||
|  | ||||
| ### Fixed | ||||
| - configure CPU frequency settings in setup function only for testing | ||||
| - update comment to clarify NVS reading process | ||||
| - adjust weight display logic to handle cases for weight less than 2 | ||||
| - update weight display logic to handle negative and specific weight cases | ||||
|  | ||||
|  | ||||
| ## [1.3.91] - 2025-02-23 | ||||
| ### Added | ||||
| - update GitHub Actions workflow for FTP firmware upload with improved credential checks | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.91 | ||||
|  | ||||
|  | ||||
| ## [1.3.90] - 2025-02-23 | ||||
| ### Added | ||||
| - update index.html for improved content structure and additional links | ||||
| - improve UI for Spoolman and Bambu Lab printer credentials, enhancing layout and styling | ||||
| - update README files with HSPI default PINs and add ESP32 pin diagram | ||||
| - implement scale calibration checks and update start_scale function to return calibration status | ||||
| - add FTP upload functionality to GitHub release workflow and update installation instructions in README | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.90 | ||||
|  | ||||
| ### Fixed | ||||
| - remove debug secrets check from Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.89] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.89 | ||||
|  | ||||
| ### Fixed | ||||
| - update Gitea release workflow to use vars for FTP credentials | ||||
|  | ||||
|  | ||||
| ## [1.3.88] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.88 | ||||
|  | ||||
| ### Fixed | ||||
| - update Gitea release workflow to use secrets for FTP credentials | ||||
|  | ||||
|  | ||||
| ## [1.3.87] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.87 | ||||
|  | ||||
| ### Fixed | ||||
| - enhance FTP upload workflow with credential checks and version output | ||||
|  | ||||
|  | ||||
| ## [1.3.86] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.86 | ||||
|  | ||||
| ### Fixed | ||||
| - streamline FTP credentials usage in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.85] - 2025-02-23 | ||||
| ### Added | ||||
| - add FTP_USER variable for Gitea release workflow | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.85 | ||||
|  | ||||
|  | ||||
| ## [1.3.84] - 2025-02-23 | ||||
| ### Added | ||||
| - add FTP_HOST variable for firmware upload in Gitea release workflow | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.84 | ||||
|  | ||||
|  | ||||
| ## [1.3.83] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.83 | ||||
|  | ||||
| ### Fixed | ||||
| - correct variable interpolation for FTP credentials in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.82] - 2025-02-23 | ||||
| ### Added | ||||
| - update Gitea release workflow to use variable interpolation for FTP credentials | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.82 | ||||
|  | ||||
|  | ||||
| ## [1.3.81] - 2025-02-23 | ||||
| ### Added | ||||
| - update Gitea release workflow to use environment variables for FTP credentials and version | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.81 | ||||
|  | ||||
|  | ||||
| ## [1.3.80] - 2025-02-23 | ||||
| ### Added | ||||
| - add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.80 | ||||
|  | ||||
|  | ||||
| ## [1.3.79] - 2025-02-23 | ||||
| ### Added | ||||
| - add FTP_USER input for firmware upload in Gitea release workflow | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.79 | ||||
|  | ||||
|  | ||||
| ## [1.3.78] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.78 | ||||
|  | ||||
| ### Fixed | ||||
| - change FTP protocol from FTPS to FTP for file upload in workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.77] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.77 | ||||
|  | ||||
| ### Fixed | ||||
| - replace ncftp with lftp for secure firmware upload | ||||
|  | ||||
|  | ||||
| ## [1.3.76] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.76 | ||||
|  | ||||
| ### Fixed | ||||
| - replace FTP action with curl for secure firmware upload and install ncftp | ||||
|  | ||||
|  | ||||
| ## [1.3.75] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.75 | ||||
|  | ||||
| ### Fixed | ||||
| - update FTP user and enhance SSL options in gitea-release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.74] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.74 | ||||
|  | ||||
| ### Fixed | ||||
| - update password syntax in gitea-release workflow | ||||
|  | ||||
|  | ||||
| ## [1.3.73] - 2025-02-23 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.73 | ||||
|   | ||||
							
								
								
									
										43
									
								
								README.de.md
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								README.de.md
									
									
									
									
									
								
							| @@ -6,10 +6,12 @@ Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/ | ||||
|  | ||||
|  | ||||
|  | ||||
| Weitere Bilder finden Sie im [img Ordner](/img/)   | ||||
| Weitere Bilder finden Sie im [img Ordner](/img/) | ||||
| oder auf meiner Website: [FilaMan Website](https://www.filaman.app)   | ||||
| Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU) | ||||
|  | ||||
| ### Es gibt jetzt auch ein Wiki, dort sind nochmal alle Funktionen beschrieben: [Wiki](https://github.com/ManuelW77/Filaman/wiki) | ||||
|  | ||||
| ### ESP32 Hardware-Funktionen | ||||
| - **Gewichtsmessung:** Verwendung einer Wägezelle mit HX711-Verstärker für präzise Gewichtsverfolgung. | ||||
| - **NFC-Tag Lesen/Schreiben:** PN532-Modul zum Lesen und Schreiben von Filamentdaten auf NFC-Tags. | ||||
| @@ -71,10 +73,15 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO | ||||
| | OLED SCL          | 22        | | ||||
| | PN532 IRQ         | 32        | | ||||
| | PN532 RESET       | 33        | | ||||
| | PN532 SCK         | 14        | | ||||
| | PN532 MOSI        | 13        | | ||||
| | PN532 MISO        | 12        | | ||||
| | PN532 CS/SS       | 15        | | ||||
| | PN532 SDA         | 21        | | ||||
| | PN532 SCL         | 22        | | ||||
|  | ||||
| **Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind** | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| ## Software-Abhängigkeiten | ||||
|  | ||||
| @@ -101,7 +108,31 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO | ||||
|   - PN532 NFC Modul | ||||
|   - Verbindungskabel | ||||
|  | ||||
| ### Schritt-für-Schritt Installation | ||||
| ## Wichtiger Hinweis | ||||
| Du musst Spoolman auf DEBUG Modus setzten, da man bisher in Spoolman keine CORS Domains setzen kann! | ||||
|  | ||||
| ``` | ||||
| # Enable debug mode | ||||
| # If enabled, the client will accept requests from any host | ||||
| # This can be useful when developing, but is also a security risk | ||||
| # Default: FALSE | ||||
| #SPOOLMAN_DEBUG_MODE=TRUE | ||||
| ``` | ||||
|  | ||||
| ## Schritt-für-Schritt Installation | ||||
| ### Einfache Installation | ||||
| 1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)** | ||||
|  | ||||
| 2. **Stecke dein ESP an den Rechner und klicke Connect** | ||||
|  | ||||
| 3. **Wähle dein Device Port und klicke Intall** | ||||
|  | ||||
| 4. **Ersteinrichtung:** | ||||
|     - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden. | ||||
|     - WLAN-Einstellungen über das Konfigurationsportal vornehmen. | ||||
|     - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen. | ||||
|  | ||||
| ### Compile by yourself | ||||
| 1. **Repository klonen:** | ||||
|     ```bash | ||||
|     git clone https://github.com/ManuelW77/Filaman.git | ||||
|   | ||||
							
								
								
									
										65
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										65
									
								
								README.md
									
									
									
									
									
								
							| @@ -13,6 +13,8 @@ More Images can be found in the [img Folder](/img/) | ||||
| or my website:[FilaMan Website](https://www.filaman.app)   | ||||
| german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU) | ||||
|  | ||||
| ### Now more detailed informations about the usage: [Wiki](https://github.com/ManuelW77/Filaman/wiki) | ||||
|  | ||||
| ### ESP32 Hardware Features | ||||
| - **Weight Measurement:** Using a load cell with HX711 amplifier for precise weight tracking. | ||||
| - **NFC Tag Reading/Writing:** PN532 module for reading and writing filament data to NFC tags. | ||||
| @@ -75,10 +77,15 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | ||||
| | OLED SCL          | 22        | | ||||
| | PN532 IRQ         | 32        | | ||||
| | PN532 RESET       | 33        | | ||||
| | PN532 SCK  	    | 14        | | ||||
| | PN532 MOSI    	| 13        | | ||||
| | PN532 MISO       	| 12        | | ||||
| | PN532 CS/SS       | 15        | | ||||
| | PN532 SDA         | 21        | | ||||
| | PN532 SCL         | 22        | | ||||
|  | ||||
| **Make sure that the DIP switches on the PN532 are set to I2C** | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| ## Software Dependencies | ||||
|  | ||||
| @@ -91,9 +98,9 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | ||||
| - `Adafruit_SSD1306`: OLED display control | ||||
| - `HX711`: Load cell communication | ||||
|  | ||||
| ## Installation | ||||
| ### Installation | ||||
|  | ||||
| ### Prerequisites | ||||
| ## Prerequisites | ||||
| - **Software:** | ||||
|   - [PlatformIO](https://platformio.org/) in VS Code | ||||
|   - [Spoolman](https://github.com/Donkie/Spoolman) instance | ||||
| @@ -105,7 +112,32 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | ||||
|   - PN532 NFC Module | ||||
|   - Connecting wires | ||||
|  | ||||
| ### Step-by-Step Installation | ||||
| ## Important Note | ||||
| You have to activate Spoolman in debug mode, because you are not able to set CORS Domains in Spoolman yet. | ||||
|  | ||||
| ``` | ||||
| # Enable debug mode | ||||
| # If enabled, the client will accept requests from any host | ||||
| # This can be useful when developing, but is also a security risk | ||||
| # Default: FALSE | ||||
| #SPOOLMAN_DEBUG_MODE=TRUE | ||||
| ``` | ||||
|  | ||||
|  | ||||
| ## Step-by-Step Installation | ||||
| ### Easy Installation | ||||
| 1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)** | ||||
|  | ||||
| 2. **Plug you device in and push Connect button** | ||||
|  | ||||
| 3. **Select your Device Port and push Intall** | ||||
|  | ||||
| 4. **Initial Setup:** | ||||
|     - Connect to the "FilaMan" WiFi access point. | ||||
|     - Configure WiFi settings through the captive portal. | ||||
|     - Access the web interface at `http://filaman.local` or the IP address. | ||||
|  | ||||
| ### Compile by yourself | ||||
| 1. **Clone the Repository:** | ||||
|     ```bash | ||||
|     git clone https://github.com/ManuelW77/Filaman.git | ||||
| @@ -124,25 +156,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | ||||
|     - Configure WiFi settings through the captive portal. | ||||
|     - Access the web interface at `http://filaman.local` or the IP address. | ||||
|  | ||||
| ## GitHub Actions Configuration | ||||
|  | ||||
| ### Required Secrets for Gitea Releases | ||||
|  | ||||
| When using Gitea as your repository host, you need to configure the following secrets in your repository: | ||||
|  | ||||
| - `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`) | ||||
| - `GITEA_TOKEN`: Your Gitea access token with permissions to create releases | ||||
| - `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`) | ||||
|  | ||||
| Example values: | ||||
| ``` | ||||
| GITEA_API_URL=https://git.example.com | ||||
| GITEA_TOKEN=abcdef1234567890 | ||||
| GITEA_REPOSITORY=username/filaman | ||||
| ``` | ||||
|  | ||||
| Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions. | ||||
|  | ||||
| ## Documentation | ||||
|  | ||||
| ### Relevant Links | ||||
|   | ||||
| @@ -1,7 +1,31 @@ | ||||
| { | ||||
|     "GFU99": "Generic TPU", | ||||
|     "GFN99": "Generic PA", | ||||
|     "GFN98": "Generic PA-CF", | ||||
|     "GFU99": "TPU", | ||||
|     "GFN99": "PA", | ||||
|     "GFN98": "PA-CF", | ||||
|     "GFL99": "PLA", | ||||
|     "GFL96": "PLA Silk", | ||||
|     "GFL98": "PLA-CF", | ||||
|     "GFL95": "PLA High Speed", | ||||
|     "GFG99": "PETG", | ||||
|     "GFG98": "PETG-CF", | ||||
|     "GFG97": "PCTG", | ||||
|     "GFB99": "ABS", | ||||
|     "GFC99": "PC", | ||||
|     "GFB98": "ASA", | ||||
|     "GFS99": "PVA", | ||||
|     "GFS98": "HIPS", | ||||
|     "GFT98": "PPS-CF", | ||||
|     "GFT97": "PPS", | ||||
|     "GFN97": "PPA-CF", | ||||
|     "GFN96": "PPA-GF", | ||||
|     "GFP99": "PE", | ||||
|     "GFP98": "PE-CF", | ||||
|     "GFP97": "PP", | ||||
|     "GFP96": "PP-CF", | ||||
|     "GFP95": "PP-GF", | ||||
|     "GFR99": "EVA", | ||||
|     "GFR98": "PHA", | ||||
|     "GFS97": "BVOH", | ||||
|     "GFA01": "Bambu PLA Matte", | ||||
|     "GFA00": "Bambu PLA Basic", | ||||
|     "GFA09": "Bambu PLA Tough", | ||||
| @@ -13,15 +37,11 @@ | ||||
|     "GFL03": "eSUN PLA+", | ||||
|     "GFL01": "PolyTerra PLA", | ||||
|     "GFL00": "PolyLite PLA", | ||||
|     "GFL99": "Generic PLA", | ||||
|     "GFL96": "Generic PLA Silk", | ||||
|     "GFL98": "Generic PLA-CF", | ||||
|     "GFA50": "Bambu PLA-CF", | ||||
|     "GFS02": "Bambu Support For PLA", | ||||
|     "GFA11": "Bambu PLA Aero", | ||||
|     "GFL04": "Overture PLA", | ||||
|     "GFL05": "Overture Matte PLA", | ||||
|     "GFL95": "Generic PLA High Speed", | ||||
|     "GFA12": "Bambu PLA Glow", | ||||
|     "GFA13": "Bambu PLA Dynamic", | ||||
|     "GFA15": "Bambu PLA Galaxy", | ||||
| @@ -30,41 +50,21 @@ | ||||
|     "GFU00": "Bambu TPU 95A HF", | ||||
|     "GFG00": "Bambu PETG Basic", | ||||
|     "GFT01": "Bambu PET-CF", | ||||
|     "GFG99": "Generic PETG", | ||||
|     "GFG98": "Generic PETG-CF", | ||||
|     "GFG50": "Bambu PETG-CF", | ||||
|     "GFG60": "PolyLite PETG", | ||||
|     "GFG01": "Bambu PETG Translucent", | ||||
|     "GFG97": "Generic PCTG", | ||||
|     "GFB00": "Bambu ABS", | ||||
|     "GFB99": "Generic ABS", | ||||
|     "GFB60": "PolyLite ABS", | ||||
|     "GFB50": "Bambu ABS-GF", | ||||
|     "GFC00": "Bambu PC", | ||||
|     "GFC99": "Generic PC", | ||||
|     "GFB98": "Generic ASA", | ||||
|     "GFB01": "Bambu ASA", | ||||
|     "GFB61": "PolyLite ASA", | ||||
|     "GFB02": "Bambu ASA-Aero", | ||||
|     "GFS99": "Generic PVA", | ||||
|     "GFS04": "Bambu PVA", | ||||
|     "GFS01": "Bambu Support G", | ||||
|     "GFN03": "Bambu PA-CF", | ||||
|     "GFN04": "Bambu PAHT-CF", | ||||
|     "GFS03": "Bambu Support For PA/PET", | ||||
|     "GFN05": "Bambu PA6-CF", | ||||
|     "GFN08": "Bambu PA6-GF", | ||||
|     "GFS98": "Generic HIPS", | ||||
|     "GFT98": "Generic PPS-CF", | ||||
|     "GFT97": "Generic PPS", | ||||
|     "GFN97": "Generic PPA-CF", | ||||
|     "GFN96": "Generic PPA-GF", | ||||
|     "GFP99": "Generic PE", | ||||
|     "GFP98": "Generic PE-CF", | ||||
|     "GFP97": "Generic PP", | ||||
|     "GFP96": "Generic PP-CF", | ||||
|     "GFP95": "Generic PP-GF", | ||||
|     "GFR99": "Generic EVA", | ||||
|     "GFR98": "Generic PHA", | ||||
|     "GFS97": "Generic BVOH" | ||||
|     "GFN08": "Bambu PA6-GF" | ||||
| } | ||||
| @@ -47,7 +47,7 @@ | ||||
|  | ||||
| <!-- head --> | ||||
|  | ||||
|     <div class="container"> | ||||
|     <div class="content"> | ||||
|         <h1>FilaMan</h1> | ||||
|         <p>Filament Management Tool</p> | ||||
|         <p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p> | ||||
| @@ -55,10 +55,11 @@ | ||||
|         <h2>About FilaMan</h2> | ||||
|         <p> | ||||
|             FilaMan is a tool designed to simplify filament spool management. It allows you to identify and weigh filament spools,  | ||||
|             automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform,  | ||||
|             and ensure compatibility with <a href="https://github.com/spuder/OpenSpool" target="_blank">OpenSpool</a> for Bambu printers. | ||||
|             automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform. | ||||
|         </p> | ||||
|  | ||||
|         <p>Get more information at <a href="https://www.filaman.app" target="_blank">https://www.filaman.app</a> and <a href="https://github.com/ManuelW77/Filaman" target="_blank">https://github.com/ManuelW77/Filaman</a>.</p> | ||||
|  | ||||
|         <div class="features"> | ||||
|             <div class="feature"> | ||||
|                 <h3>Spool Identification</h3> | ||||
| @@ -73,12 +74,6 @@ | ||||
|                 <p>Works with OpenSpool to recognize and activate spools on Bambu printers.</p> | ||||
|             </div> | ||||
|         </div> | ||||
|  | ||||
|         <h2>Future Plans</h2> | ||||
|         <p> | ||||
|             We are working on expanding compatibility to support smaller NFC tags like NTag213  | ||||
|             and developing custom software to enhance the OpenSpool experience. | ||||
|         </p> | ||||
|     </div> | ||||
| </body> | ||||
| </html> | ||||
|   | ||||
							
								
								
									
										31
									
								
								html/own_filaments.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								html/own_filaments.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,31 @@ | ||||
| { | ||||
|     "TPU": "GFU99", | ||||
|     "PA": "GFN99", | ||||
|     "PA-CF": "GFN98", | ||||
|     "PLA": "GFL99", | ||||
|     "PLA Silk": "GFL96", | ||||
|     "PLA-CF": "GFL98", | ||||
|     "PLA High Speed": "GFL95", | ||||
|     "PETG": "GFG99", | ||||
|     "PETG-CF": "GFG98", | ||||
|     "PCTG": "GFG97", | ||||
|     "ABS": "GFB99", | ||||
|     "ABS+HS": "GFB99", | ||||
|     "PC": "GFC99", | ||||
|     "PC/ABS": "GFC99", | ||||
|     "ASA": "GFB98", | ||||
|     "PVA": "GFS99", | ||||
|     "HIPS": "GFS98", | ||||
|     "PPS-CF": "GFT98", | ||||
|     "PPS": "GFT97", | ||||
|     "PPA-CF": "GFN97", | ||||
|     "PPA-GF": "GFN96", | ||||
|     "PE": "GFP99", | ||||
|     "PE-CF": "GFP98", | ||||
|     "PP": "GFP97", | ||||
|     "PP-CF": "GFP96", | ||||
|     "PP-GF": "GFP95", | ||||
|     "EVA": "GFR99", | ||||
|     "PHA": "GFR98", | ||||
|     "BVOH": "GFS97" | ||||
| } | ||||
							
								
								
									
										46
									
								
								html/rfid.js
									
									
									
									
									
								
							
							
						
						
									
										46
									
								
								html/rfid.js
									
									
									
									
									
								
							| @@ -150,6 +150,13 @@ function initWebSocket() { | ||||
|                     ramStatus.textContent = `${data.freeHeap}k`; | ||||
|                 } | ||||
|             } | ||||
|             else if (data.type === 'setSpoolmanSettings') { | ||||
|                 if (data.payload == 'success') { | ||||
|                     showNotification(`Spoolman Settings set successfully`, true); | ||||
|                 } else { | ||||
|                     showNotification(`Error setting Spoolman Settings`, false); | ||||
|                 } | ||||
|             } | ||||
|         }; | ||||
|     } catch (error) { | ||||
|         isConnected = false; | ||||
| @@ -285,6 +292,14 @@ function displayAmsData(amsData) { | ||||
|                     <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px; transform: rotate(180deg) scaleX(-1);"> | ||||
|                 </button>`; | ||||
|  | ||||
|             const spoolmanButtonHtml = ` | ||||
|                 <button class="spool-button" onclick="handleSpoolmanSettings('${tray.tray_info_idx}', '${tray.setting_id}', '${tray.cali_idx}', '${tray.nozzle_temp_min}', '${tray.nozzle_temp_max}')"  | ||||
|                         style="position: absolute; bottom: 0px; right: 0px;  | ||||
|                                background: none; border: none; padding: 0;  | ||||
|                                cursor: pointer; display: none;"> | ||||
|                     <img src="set_spoolman.png" alt="Spool In" style="width: 38px; height: 38px;"> | ||||
|                 </button>`; | ||||
|  | ||||
|             if (!hasAnyContent) { | ||||
|                 return ` | ||||
|                     <div class="tray"> | ||||
| @@ -348,6 +363,7 @@ function displayAmsData(amsData) { | ||||
|                         ${trayDetails} | ||||
|                         ${tempHTML} | ||||
|                         ${(ams.ams_id === 255 && tray.tray_type !== '') ? outButtonHtml : ''} | ||||
|                         ${(tray.setting_id != "" && tray.setting_id != "null") ? spoolmanButtonHtml : ''} | ||||
|                     </div> | ||||
|                      | ||||
|                 </div>`; | ||||
| @@ -373,6 +389,36 @@ function updateSpoolButtons(show) { | ||||
|     }); | ||||
| } | ||||
|  | ||||
| function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp_min, nozzle_temp_max) { | ||||
|     // Hole das ausgewählte Filament | ||||
|     const selectedText = document.getElementById("selected-filament").textContent; | ||||
|  | ||||
|     // Finde die ausgewählte Spule in den Daten | ||||
|     const selectedSpool = spoolsData.find(spool =>  | ||||
|         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText | ||||
|     ); | ||||
|  | ||||
|     const payload = { | ||||
|         type: 'setSpoolmanSettings', | ||||
|         payload: { | ||||
|             filament_id: selectedSpool.filament.id, | ||||
|             tray_info_idx: tray_info_idx, | ||||
|             setting_id: setting_id, | ||||
|             cali_idx: cali_idx, | ||||
|             temp_min: nozzle_temp_min, | ||||
|             temp_max: nozzle_temp_max | ||||
|         } | ||||
|     }; | ||||
|  | ||||
|     try { | ||||
|         socket.send(JSON.stringify(payload)); | ||||
|         showNotification(`Setting send to Spoolman`, true); | ||||
|     } catch (error) { | ||||
|         console.error("Error while sending settings to Spoolman:", error); | ||||
|         showNotification("Error while sending!", false); | ||||
|     } | ||||
| } | ||||
|  | ||||
| function handleSpoolOut() { | ||||
|     // Erstelle Payload | ||||
|     const payload = { | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								html/set_spoolman.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								html/set_spoolman.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 9.2 KiB | 
| @@ -74,8 +74,10 @@ | ||||
|             const ip = document.getElementById('bambuIp').value; | ||||
|             const serial = document.getElementById('bambuSerial').value; | ||||
|             const code = document.getElementById('bambuCode').value; | ||||
|             const autoSend = document.getElementById('autoSend').checked; | ||||
|             const autoSendTime = document.getElementById('autoSendTime').value; | ||||
|  | ||||
|             fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}`) | ||||
|             fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}&autoSendTime=${autoSendTime}`) | ||||
|                 .then(response => response.json()) | ||||
|                 .then(data => { | ||||
|                     if (data.healthy) { | ||||
| @@ -95,27 +97,47 @@ | ||||
|      | ||||
|     <div class="content"> | ||||
|         <h1>Spoolman API URL / Bambu Credentials</h1> | ||||
|         <label for="spoolmanUrl">Set URL/IP to your Spoolman-Instanz:</label> | ||||
|         <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port"> | ||||
|         <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button> | ||||
|         <p id="statusMessage"></p> | ||||
|  | ||||
|         <h2>Bambu Lab Printer Credentials</h2> | ||||
|         <div class="bambu-settings"> | ||||
|             <div class="input-group"> | ||||
|                 <label for="bambuIp">Bambu Drucker IP-Adresse:</label> | ||||
|                 <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}"> | ||||
|         <div class="card"> | ||||
|             <div class="card-body"> | ||||
|                 <h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5> | ||||
|                 <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port"> | ||||
|                 <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button> | ||||
|                 <p id="statusMessage"></p> | ||||
|             </div> | ||||
|             <div class="input-group"> | ||||
|                 <label for="bambuSerial">Drucker Seriennummer:</label> | ||||
|                 <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}"> | ||||
|         </div> | ||||
|  | ||||
|         <div class="card"> | ||||
|             <div class="card-body"> | ||||
|                 <h5 class="card-title">Bambu Lab Printer Credentials</h5> | ||||
|                 <div class="bambu-settings"> | ||||
|                     <div class="input-group"> | ||||
|                         <label for="bambuIp">Bambu Drucker IP-Adresse:</label> | ||||
|                         <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}"> | ||||
|                     </div> | ||||
|                     <div class="input-group"> | ||||
|                         <label for="bambuSerial">Drucker Seriennummer:</label> | ||||
|                         <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}"> | ||||
|                     </div> | ||||
|                     <div class="input-group"> | ||||
|                         <label for="bambuCode">Access Code:</label> | ||||
|                         <input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}"> | ||||
|                     </div> | ||||
|                     <hr> | ||||
|                     <p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p> | ||||
|                     <div class="input-group" style="display: flex; margin-bottom: 0;"> | ||||
|                         <label for="autoSend" style="width: 250px; margin-right: 5px;">Auto Send to Bambu:</label> | ||||
|                         <label for="autoSendTime" style="width: 250px; margin-right: 5px;">Wait time in Seconds:</label> | ||||
|                     </div> | ||||
|                     <div class="input-group" style="display: flex;"> | ||||
|                         <input type="checkbox" id="autoSend" {{autoSendToBambu}} style="width: 190px; margin-right: 10px;"> | ||||
|                         <input type="text" id="autoSendTime" placeholder="Time to wait for new Spool" value="{{autoSendTime}}" style="width: 100px;"> | ||||
|                     </div> | ||||
|  | ||||
|                     <button style="margin: 0;" onclick="saveBambuCredentials()">Save Bambu Credentials</button> | ||||
|                     <p id="bambuStatusMessage"></p> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="input-group"> | ||||
|                 <label for="bambuCode">Access Code:</label> | ||||
|                 <input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}"> | ||||
|             </div> | ||||
|             <button onclick="saveBambuCredentials()">Save Bambu Credentials</button> | ||||
|             <p id="bambuStatusMessage"></p> | ||||
|         </div> | ||||
|     </div> | ||||
| </body> | ||||
|   | ||||
| @@ -279,9 +279,10 @@ a:hover { | ||||
|  | ||||
| /* Karten-Stil für optische Trennung */ | ||||
| .card { | ||||
|     background: #f9f9f9; | ||||
|     background: var(--primary-color); | ||||
|     width: 500px; | ||||
|     padding: 15px; | ||||
|     margin: 20px 0; | ||||
|     margin: 20px auto; | ||||
|     border-radius: 8px; | ||||
|     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); | ||||
| } | ||||
| @@ -760,17 +761,19 @@ a:hover { | ||||
|     right: 20px; | ||||
|     padding: 15px 25px; | ||||
|     border-radius: 4px; | ||||
|     color: white; | ||||
|     color: black; | ||||
|     z-index: 1000; | ||||
|     animation: slideIn 0.3s ease-out; | ||||
| } | ||||
|  | ||||
| .notification.success { | ||||
|     background-color: #28a745; | ||||
|     color: black !important; | ||||
| } | ||||
|  | ||||
| .notification.error { | ||||
|     background-color: #dc3545; | ||||
|     color: white !important; | ||||
| } | ||||
|  | ||||
| .notification.fade-out { | ||||
| @@ -959,7 +962,6 @@ input[type="submit"]:disabled, | ||||
|  | ||||
| /* Bambu Settings Erweiterung */ | ||||
| .bambu-settings { | ||||
|     background: white; | ||||
|     padding: 20px; | ||||
|     border-radius: 8px; | ||||
|     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); | ||||
| @@ -1013,6 +1015,7 @@ input[type="submit"]:disabled, | ||||
|     color: #000; | ||||
|     vertical-align: middle; | ||||
|     margin-left: 0.5rem; | ||||
|     text-shadow: none !important; | ||||
| } | ||||
|  | ||||
| .progress-container { | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								img/ESP32-SPI-Pins.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/ESP32-SPI-Pins.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 143 KiB | 
							
								
								
									
										
											BIN
										
									
								
								img/IMG_2589.jpeg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/IMG_2589.jpeg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 136 KiB | 
							
								
								
									
										
											BIN
										
									
								
								img/IMG_2590.jpeg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/IMG_2590.jpeg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 143 KiB | 
							
								
								
									
										
											BIN
										
									
								
								img/Schaltplan.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/Schaltplan.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 283 KiB | 
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.73" | ||||
| version = "1.3.98" | ||||
| ## | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
| @@ -33,7 +33,8 @@ lib_deps = | ||||
|     digitaldragon/SSLClient @ ^1.3.2 | ||||
|      | ||||
| ; Enable SPIFFS upload | ||||
| board_build.filesystem = spiffs | ||||
| #board_build.filesystem = spiffs | ||||
| board_build.filesystem = littlefs | ||||
| ; Update partition settings | ||||
| board_build.partitions = partitions.csv | ||||
| board_upload.flash_size = 4MB | ||||
| @@ -44,13 +45,13 @@ build_flags = | ||||
|     -Os | ||||
|     -ffunction-sections | ||||
|     -fdata-sections | ||||
|     -DNDEBUG | ||||
|     #-DNDEBUG | ||||
|     -mtext-section-literals | ||||
|     -DVERSION=\"${common.version}\" | ||||
|     -DASYNCWEBSERVER_REGEX | ||||
|     -DCORE_DEBUG_LEVEL=3 | ||||
|     #-DCORE_DEBUG_LEVEL=3 | ||||
|     -DCONFIG_ARDUHAL_LOG_COLORS=1 | ||||
|     -DOTA_DEBUG=1 | ||||
|     #-DOTA_DEBUG=1 | ||||
|     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1 | ||||
|     -DBOOT_APP_PARTITION_OTA_0=1 | ||||
|     -DCONFIG_LWIP_TCP_MSL=60000 | ||||
|   | ||||
							
								
								
									
										189
									
								
								src/api.cpp
									
									
									
									
									
								
							
							
						
						
									
										189
									
								
								src/api.cpp
									
									
									
									
									
								
							| @@ -12,34 +12,9 @@ struct SendToApiParams { | ||||
|     String updatePayload; | ||||
| }; | ||||
|  | ||||
| /* | ||||
|     // Spoolman Data | ||||
|     { | ||||
|         "version":"1.0", | ||||
|         "protocol":"openspool", | ||||
|         "color_hex":"AF7933", | ||||
|         "type":"ABS", | ||||
|         "min_temp":175, | ||||
|         "max_temp":275, | ||||
|         "brand":"Overture" | ||||
|     } | ||||
|  | ||||
|     // FilaMan Data | ||||
|     { | ||||
|         "version":"1.0", | ||||
|         "protocol":"openspool", | ||||
|         "color_hex":"AF7933", | ||||
|         "type":"ABS", | ||||
|         "min_temp":175, | ||||
|         "max_temp":275, | ||||
|         "brand":"Overture", | ||||
|         "sm_id":  | ||||
|     } | ||||
| */ | ||||
|  | ||||
| JsonDocument fetchSpoolsForWebsite() { | ||||
| JsonDocument fetchSingleSpoolInfo(int spoolId) { | ||||
|     HTTPClient http; | ||||
|     String spoolsUrl = spoolmanUrl + apiUrl + "/spool"; | ||||
|     String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId; | ||||
|  | ||||
|     Serial.print("Rufe Spool-Daten von: "); | ||||
|     Serial.println(spoolsUrl); | ||||
| @@ -56,84 +31,45 @@ JsonDocument fetchSpoolsForWebsite() { | ||||
|             Serial.print("Fehler beim Parsen der JSON-Antwort: "); | ||||
|             Serial.println(error.c_str()); | ||||
|         } else { | ||||
|             JsonArray spools = doc.as<JsonArray>(); | ||||
|             JsonArray filteredSpools = filteredDoc.to<JsonArray>(); | ||||
|             String filamentType = doc["filament"]["material"].as<String>(); | ||||
|             String filamentBrand = doc["filament"]["vendor"]["name"].as<String>(); | ||||
|  | ||||
|             for (JsonObject spool : spools) { | ||||
|                 JsonObject filteredSpool = filteredSpools.add<JsonObject>(); | ||||
|                 filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"]; | ||||
|             int nozzle_temp_min = 0; | ||||
|             int nozzle_temp_max = 0; | ||||
|             if (doc["filament"]["extra"]["nozzle_temperature"].is<String>()) { | ||||
|                 String tempString = doc["filament"]["extra"]["nozzle_temperature"].as<String>(); | ||||
|                 tempString.replace("[", ""); | ||||
|                 tempString.replace("]", ""); | ||||
|                 int commaIndex = tempString.indexOf(','); | ||||
|                  | ||||
|                 if (commaIndex != -1) { | ||||
|                     nozzle_temp_min = tempString.substring(0, commaIndex).toInt(); | ||||
|                     nozzle_temp_max = tempString.substring(commaIndex + 1).toInt(); | ||||
|                 } | ||||
|             }  | ||||
|  | ||||
|                 JsonObject filament = filteredSpool["filament"].to<JsonObject>(); | ||||
|                 filament["sm_id"] = spool["id"]; | ||||
|                 filament["id"] = spool["filament"]["id"]; | ||||
|                 filament["name"] = spool["filament"]["name"]; | ||||
|                 filament["material"] = spool["filament"]["material"]; | ||||
|                 filament["color_hex"] = spool["filament"]["color_hex"]; | ||||
|                 filament["nozzle_temperature"] = spool["filament"]["extra"]["nozzle_temperature"]; // [190,230] | ||||
|                 filament["price_meter"] = spool["filament"]["extra"]["price_meter"]; | ||||
|                 filament["price_gramm"] = spool["filament"]["extra"]["price_gramm"]; | ||||
|             String filamentColor = doc["filament"]["color_hex"].as<String>(); | ||||
|             filamentColor.toUpperCase(); | ||||
|  | ||||
|                 JsonObject vendor = filament["vendor"].to<JsonObject>(); | ||||
|                 vendor["id"] = spool["filament"]["vendor"]["id"]; | ||||
|                 vendor["name"] = spool["filament"]["vendor"]["name"]; | ||||
|             } | ||||
|         } | ||||
|     } else { | ||||
|         Serial.print("Fehler beim Abrufen der Spool-Daten. HTTP-Code: "); | ||||
|         Serial.println(httpCode); | ||||
|     } | ||||
|             String tray_info_idx = doc["filament"]["extra"]["bambu_idx"].as<String>(); | ||||
|             tray_info_idx.replace("\"", ""); | ||||
|              | ||||
|             String cali_idx = doc["filament"]["extra"]["bambu_cali_id"].as<String>(); // "\"153\"" | ||||
|             cali_idx.replace("\"", ""); | ||||
|              | ||||
|             String bambu_setting_id = doc["filament"]["extra"]["bambu_setting_id"].as<String>(); // "\"PFUSf40e9953b40d3d\"" | ||||
|             bambu_setting_id.replace("\"", ""); | ||||
|  | ||||
|     http.end(); | ||||
|     return filteredDoc; | ||||
| } | ||||
|             doc.clear(); | ||||
|  | ||||
| JsonDocument fetchAllSpoolsInfo() { | ||||
|     HTTPClient http; | ||||
|     String spoolsUrl = spoolmanUrl + apiUrl + "/spool"; | ||||
|  | ||||
|     Serial.print("Rufe Spool-Daten von: "); | ||||
|     Serial.println(spoolsUrl); | ||||
|  | ||||
|     http.begin(spoolsUrl); | ||||
|     int httpCode = http.GET(); | ||||
|  | ||||
|     JsonDocument filteredDoc; | ||||
|     if (httpCode == HTTP_CODE_OK) { | ||||
|         String payload = http.getString(); | ||||
|         JsonDocument doc; | ||||
|         DeserializationError error = deserializeJson(doc, payload); | ||||
|         if (error) { | ||||
|             Serial.print("Fehler beim Parsen der JSON-Antwort: "); | ||||
|             Serial.println(error.c_str()); | ||||
|         } else { | ||||
|             JsonArray spools = doc.as<JsonArray>(); | ||||
|             JsonArray filteredSpools = filteredDoc.to<JsonArray>(); | ||||
|  | ||||
|             for (JsonObject spool : spools) { | ||||
|                 JsonObject filteredSpool = filteredSpools.add<JsonObject>(); | ||||
|                 filteredSpool["price"] = spool["price"]; | ||||
|                 filteredSpool["remaining_weight"] = spool["remaining_weight"]; | ||||
|                 filteredSpool["used_weight"] = spool["used_weight"]; | ||||
|                 filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"]; | ||||
|  | ||||
|                 JsonObject filament = filteredSpool["filament"].to<JsonObject>(); | ||||
|                 filament["id"] = spool["filament"]["id"]; | ||||
|                 filament["name"] = spool["filament"]["name"]; | ||||
|                 filament["material"] = spool["filament"]["material"]; | ||||
|                 filament["density"] = spool["filament"]["density"]; | ||||
|                 filament["diameter"] = spool["filament"]["diameter"]; | ||||
|                 filament["spool_weight"] = spool["filament"]["spool_weight"]; | ||||
|                 filament["color_hex"] = spool["filament"]["color_hex"]; | ||||
|  | ||||
|                 JsonObject vendor = filament["vendor"].to<JsonObject>(); | ||||
|                 vendor["id"] = spool["filament"]["vendor"]["id"]; | ||||
|                 vendor["name"] = spool["filament"]["vendor"]["name"]; | ||||
|  | ||||
|                 JsonObject extra = filament["extra"].to<JsonObject>(); | ||||
|                 extra["nozzle_temperature"] = spool["filament"]["extra"]["nozzle_temperature"]; | ||||
|                 extra["price_gramm"] = spool["filament"]["extra"]["price_gramm"]; | ||||
|                 extra["price_meter"] = spool["filament"]["extra"]["price_meter"]; | ||||
|             } | ||||
|             filteredDoc["color"] = filamentColor; | ||||
|             filteredDoc["type"] = filamentType; | ||||
|             filteredDoc["nozzle_temp_min"] = nozzle_temp_min; | ||||
|             filteredDoc["nozzle_temp_max"] = nozzle_temp_max; | ||||
|             filteredDoc["brand"] = filamentBrand; | ||||
|             filteredDoc["tray_info_idx"] = tray_info_idx; | ||||
|             filteredDoc["cali_idx"] = cali_idx; | ||||
|             filteredDoc["bambu_setting_id"] = bambu_setting_id; | ||||
|         } | ||||
|     } else { | ||||
|         Serial.print("Fehler beim Abrufen der Spool-Daten. HTTP-Code: "); | ||||
| @@ -161,9 +97,9 @@ void sendToApi(void *parameter) { | ||||
|     if (httpType == "PATCH") httpCode = http.PATCH(updatePayload); | ||||
|  | ||||
|     if (httpCode == HTTP_CODE_OK) { | ||||
|         Serial.println("Gewicht der Spule erfolgreich aktualisiert"); | ||||
|         Serial.println("Spoolman erfolgreich aktualisiert"); | ||||
|     } else { | ||||
|         Serial.println("Fehler beim Aktualisieren des Gewichts der Spule"); | ||||
|         Serial.println("Fehler beim Senden an Spoolman!"); | ||||
|         oledShowMessage("Spoolman update failed"); | ||||
|         vTaskDelay(2000 / portTICK_PERIOD_MS); | ||||
|     } | ||||
| @@ -262,6 +198,52 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) { | ||||
|     return 1; | ||||
| } | ||||
|  | ||||
| bool updateSpoolBambuData(String payload) { | ||||
|     JsonDocument doc; | ||||
|     DeserializationError error = deserializeJson(doc, payload); | ||||
|     if (error) { | ||||
|         Serial.print("Fehler beim JSON-Parsing: "); | ||||
|         Serial.println(error.c_str()); | ||||
|         return false; | ||||
|     } | ||||
|  | ||||
|     String spoolsUrl = spoolmanUrl + apiUrl + "/filament/" + doc["filament_id"].as<String>(); | ||||
|     Serial.print("Update Spule mit URL: "); | ||||
|     Serial.println(spoolsUrl); | ||||
|  | ||||
|     JsonDocument updateDoc; | ||||
|     updateDoc["extra"]["bambu_setting_id"] = "\"" + doc["setting_id"].as<String>() + "\""; | ||||
|     updateDoc["extra"]["bambu_cali_id"] = "\"" + doc["cali_idx"].as<String>() + "\""; | ||||
|     updateDoc["extra"]["bambu_idx"] = "\"" + doc["tray_info_idx"].as<String>() + "\""; | ||||
|     updateDoc["extra"]["nozzle_temperature"] = "[" + doc["temp_min"].as<String>() + "," + doc["temp_max"].as<String>() + "]"; | ||||
|  | ||||
|     String updatePayload; | ||||
|     serializeJson(updateDoc, updatePayload); | ||||
|     Serial.print("Update Payload: "); | ||||
|     Serial.println(updatePayload); | ||||
|  | ||||
|     SendToApiParams* params = new SendToApiParams(); | ||||
|     if (params == nullptr) { | ||||
|         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren."); | ||||
|         return false; | ||||
|     } | ||||
|     params->httpType = "PATCH"; | ||||
|     params->spoolsUrl = spoolsUrl; | ||||
|     params->updatePayload = updatePayload; | ||||
|  | ||||
|     // Erstelle die Task | ||||
|     BaseType_t result = xTaskCreate( | ||||
|         sendToApi,                // Task-Funktion | ||||
|         "SendToApiTask",          // Task-Name | ||||
|         4096,                     // Stackgröße in Bytes | ||||
|         (void*)params,            // Parameter | ||||
|         0,                        // Priorität | ||||
|         NULL                      // Task-Handle (nicht benötigt) | ||||
|     ); | ||||
|  | ||||
|     return true; | ||||
| } | ||||
|  | ||||
| // #### Spoolman init | ||||
| bool checkSpoolmanExtraFields() { | ||||
|     HTTPClient http; | ||||
| @@ -403,12 +385,13 @@ bool checkSpoolmanExtraFields() { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         http.end();   | ||||
|     } | ||||
|      | ||||
|     Serial.println("-------- ENDE Prüfe Felder --------"); | ||||
|     Serial.println(); | ||||
|  | ||||
|     http.end(); | ||||
|  | ||||
|     return true; | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -14,11 +14,10 @@ bool checkSpoolmanInstance(const String& url); | ||||
| bool saveSpoolmanUrl(const String& url); | ||||
| String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL | ||||
| bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder | ||||
| JsonDocument fetchSpoolsForWebsite(); // API-Funktion für die Webseite | ||||
| JsonDocument fetchAllSpoolsInfo(); | ||||
| void sendAmsData(AsyncWebSocketClient *client); // Neue Funktion zum Senden von AMS-Daten | ||||
| JsonDocument fetchSingleSpoolInfo(int spoolId); // API-Funktion für die Webseite | ||||
| bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools | ||||
| uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts | ||||
| bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman | ||||
| bool updateSpoolBambuData(String payload); // Neue Funktion zum Aktualisieren der Bambu-Daten | ||||
|  | ||||
| #endif | ||||
|   | ||||
							
								
								
									
										431
									
								
								src/bambu.cpp
									
									
									
									
									
								
							
							
						
						
									
										431
									
								
								src/bambu.cpp
									
									
									
									
									
								
							| @@ -23,14 +23,21 @@ const char* bambu_username = "bblp"; | ||||
| const char* bambu_ip = nullptr; | ||||
| const char* bambu_accesscode = nullptr; | ||||
| const char* bambu_serialnr = nullptr; | ||||
|  | ||||
| String g_bambu_ip = ""; | ||||
| String g_bambu_accesscode = ""; | ||||
| String g_bambu_serialnr = ""; | ||||
|  | ||||
| bool bambu_connected = false; | ||||
| bool autoSendToBambu = false; | ||||
| int autoSetToBambuSpoolId = 0; | ||||
|  | ||||
| // Globale Variablen für AMS-Daten | ||||
| int ams_count = 0; | ||||
| String amsJsonData;  // Speichert das fertige JSON für WebSocket-Clients | ||||
| AMSData ams_data[MAX_AMS];  // Definition des Arrays | ||||
| AMSData ams_data[MAX_AMS];  // Definition des Arrays; | ||||
|  | ||||
| bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode) { | ||||
| bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) { | ||||
|     if (BambuMqttTask) { | ||||
|         vTaskDelete(BambuMqttTask); | ||||
|     } | ||||
| @@ -39,6 +46,8 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String | ||||
|     doc["bambu_ip"] = ip; | ||||
|     doc["bambu_accesscode"] = accesscode; | ||||
|     doc["bambu_serialnr"] = serialnr; | ||||
|     doc["autoSendToBambu"] = autoSend; | ||||
|     doc["autoSendTime"] = (autoSendTime != "") ? autoSendTime.toInt() : autoSetBambuAmsCounter; | ||||
|  | ||||
|     if (!saveJsonValue("/bambu_credentials.json", doc)) { | ||||
|         Serial.println("Fehler beim Speichern der Bambu-Credentials."); | ||||
| @@ -49,6 +58,8 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String | ||||
|     bambu_ip = ip.c_str(); | ||||
|     bambu_accesscode = accesscode.c_str(); | ||||
|     bambu_serialnr = serialnr.c_str(); | ||||
|     autoSendToBambu = autoSend; | ||||
|     autoSetBambuAmsCounter = autoSendTime.toInt(); | ||||
|  | ||||
|     vTaskDelay(100 / portTICK_PERIOD_MS); | ||||
|     if (!setupMqtt()) return false; | ||||
| @@ -64,14 +75,21 @@ bool loadBambuCredentials() { | ||||
|         String code = doc["bambu_accesscode"].as<String>(); | ||||
|         String serial = doc["bambu_serialnr"].as<String>(); | ||||
|  | ||||
|         g_bambu_ip = ip; | ||||
|         g_bambu_accesscode = code; | ||||
|         g_bambu_serialnr = serial; | ||||
|  | ||||
|         if (doc["autoSendToBambu"].is<bool>()) autoSendToBambu = doc["autoSendToBambu"].as<bool>(); | ||||
|         if (doc["autoSendTime"].is<int>()) autoSetBambuAmsCounter = doc["autoSendTime"].as<int>(); | ||||
|  | ||||
|         ip.trim(); | ||||
|         code.trim(); | ||||
|         serial.trim(); | ||||
|  | ||||
|         // Dynamische Speicherallokation für die globalen Pointer | ||||
|         bambu_ip = strdup(ip.c_str()); | ||||
|         bambu_accesscode = strdup(code.c_str()); | ||||
|         bambu_serialnr = strdup(serial.c_str()); | ||||
|         bambu_ip = g_bambu_ip.c_str(); | ||||
|         bambu_accesscode = g_bambu_accesscode.c_str(); | ||||
|         bambu_serialnr = g_bambu_serialnr.c_str(); | ||||
|  | ||||
|         report_topic = "device/" + String(bambu_serialnr) + "/report"; | ||||
|         //request_topic = "device/" + String(bambu_serialnr) + "/request"; | ||||
| @@ -81,19 +99,49 @@ bool loadBambuCredentials() { | ||||
|     return false; | ||||
| } | ||||
|  | ||||
| String findFilamentIdx(String brand, String type) { | ||||
| struct FilamentResult { | ||||
|     String key; | ||||
|     String type; | ||||
| }; | ||||
|  | ||||
| FilamentResult findFilamentIdx(String brand, String type) { | ||||
|     // JSON-Dokument für die Filament-Daten erstellen | ||||
|     JsonDocument doc; | ||||
|      | ||||
|     // Laden der own_filaments.json | ||||
|     String ownFilament = ""; | ||||
|     if (!loadJsonValue("/own_filaments.json", doc))  | ||||
|     { | ||||
|         Serial.println("Fehler beim Laden der eigenen Filament-Daten"); | ||||
|     } | ||||
|     else | ||||
|     { | ||||
|         // Durchsuche direkt nach dem Type als Schlüssel | ||||
|         if (doc[type].is<String>()) { | ||||
|             ownFilament = doc[type].as<String>(); | ||||
|         } | ||||
|         doc.clear(); | ||||
|     } | ||||
|     doc.clear(); | ||||
|  | ||||
|     // Laden der bambu_filaments.json | ||||
|     if (!loadJsonValue("/bambu_filaments.json", doc)) { | ||||
|     if (!loadJsonValue("/bambu_filaments.json", doc))  | ||||
|     { | ||||
|         Serial.println("Fehler beim Laden der Filament-Daten"); | ||||
|         return "GFL99"; // Fallback auf Generic PLA | ||||
|         return {"GFL99", "PLA"}; // Fallback auf Generic PLA | ||||
|     } | ||||
|  | ||||
|     // Wenn eigener Typ | ||||
|     if (ownFilament != "") | ||||
|     { | ||||
|         if (doc[ownFilament].is<String>())  | ||||
|         { | ||||
|             return {ownFilament, doc[ownFilament].as<String>()}; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // 1. Erst versuchen wir die exakte Brand + Type Kombination zu finden | ||||
|     String searchKey; | ||||
|      | ||||
|     // 1. Suche nach Brand + Type Kombination | ||||
|     if (brand == "Bambu" || brand == "Bambulab") { | ||||
|         searchKey = "Bambu " + type; | ||||
|     } else if (brand == "PolyLite") { | ||||
| @@ -109,23 +157,46 @@ String findFilamentIdx(String brand, String type) { | ||||
|     // Durchsuche alle Einträge nach der Brand + Type Kombination | ||||
|     for (JsonPair kv : doc.as<JsonObject>()) { | ||||
|         if (kv.value().as<String>() == searchKey) { | ||||
|             return kv.key().c_str(); | ||||
|             return {kv.key().c_str(), kv.value().as<String>()}; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // 2. Wenn nicht gefunden, suche nach Generic + Type | ||||
|     searchKey = "Generic " + type; | ||||
|     // 2. Wenn nicht gefunden, zerlege den type String in Wörter und suche nach jedem Wort | ||||
|     // Sammle alle vorhandenen Filamenttypen aus der JSON | ||||
|     std::vector<String> knownTypes; | ||||
|     for (JsonPair kv : doc.as<JsonObject>()) { | ||||
|         if (kv.value().as<String>() == searchKey) { | ||||
|             return kv.key().c_str(); | ||||
|         String value = kv.value().as<String>(); | ||||
|         // Extrahiere den Typ ohne Markennamen | ||||
|         if (value.indexOf(" ") != -1) { | ||||
|             value = value.substring(value.indexOf(" ") + 1); | ||||
|         } | ||||
|         if (!value.isEmpty()) { | ||||
|             knownTypes.push_back(value); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // Zerlege den Input-Type in Wörter | ||||
|     String typeStr = type; | ||||
|     typeStr.trim(); | ||||
|      | ||||
|     // Durchsuche für jedes bekannte Filament, ob es im Input vorkommt | ||||
|     for (const String& knownType : knownTypes) { | ||||
|         if (typeStr.indexOf(knownType) != -1) { | ||||
|             // Suche nach diesem Typ in der Original-JSON | ||||
|             for (JsonPair kv : doc.as<JsonObject>()) { | ||||
|                 String value = kv.value().as<String>(); | ||||
|                 if (value.indexOf(knownType) != -1) { | ||||
|                     return {kv.key().c_str(), knownType}; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // 3. Wenn immer noch nichts gefunden, gebe GFL99 zurück (Generic PLA) | ||||
|     return "GFL99"; | ||||
|     return {"GFL99", "PLA"}; | ||||
| } | ||||
|  | ||||
| bool sendMqttMessage(String payload) { | ||||
| bool sendMqttMessage(const String& payload) { | ||||
|     Serial.println("Sending MQTT message"); | ||||
|     Serial.println(payload); | ||||
|     if (client.publish(report_topic.c_str(), payload.c_str()))  | ||||
| @@ -156,15 +227,22 @@ bool setBambuSpool(String payload) { | ||||
|     int minTemp = doc["nozzle_temp_min"]; | ||||
|     int maxTemp = doc["nozzle_temp_max"]; | ||||
|     String type = doc["type"].as<String>(); | ||||
|     (type == "PLA+") ? type = "PLA" : type; | ||||
|     String brand = doc["brand"].as<String>(); | ||||
|     String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : ""; | ||||
|     if (tray_info_idx == "") tray_info_idx = (brand != "" && type != "") ? findFilamentIdx(brand, type) : ""; | ||||
|     if (tray_info_idx == "") { | ||||
|         if (brand != "" && type != "") { | ||||
|             FilamentResult result = findFilamentIdx(brand, type); | ||||
|             tray_info_idx = result.key; | ||||
|             type = result.type;  // Aktualisiere den type mit dem gefundenen Basistyp | ||||
|         } | ||||
|     } | ||||
|     String setting_id = doc["bambu_setting_id"].as<String>(); | ||||
|     String cali_idx = doc["cali_idx"].as<String>(); | ||||
|  | ||||
|     doc.clear(); | ||||
|  | ||||
|     doc["print"]["sequence_id"] = 0; | ||||
|     doc["print"]["sequence_id"] = "0"; | ||||
|     doc["print"]["command"] = "ams_filament_setting"; | ||||
|     doc["print"]["ams_id"] = amsId < 200 ? amsId : 255; | ||||
|     doc["print"]["tray_id"] = trayId < 200 ? trayId : 254; | ||||
| @@ -172,10 +250,10 @@ bool setBambuSpool(String payload) { | ||||
|     doc["print"]["nozzle_temp_min"] = minTemp; | ||||
|     doc["print"]["nozzle_temp_max"] = maxTemp; | ||||
|     doc["print"]["tray_type"] = type; | ||||
|     doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : ""; | ||||
|     //doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : ""; | ||||
|     doc["print"]["tray_info_idx"] = tray_info_idx; | ||||
|     doc["print"]["setting_id"] = setting_id; | ||||
|  | ||||
|      | ||||
|     // Serialize the JSON | ||||
|     String output; | ||||
|     serializeJson(doc, output); | ||||
| @@ -194,13 +272,13 @@ bool setBambuSpool(String payload) { | ||||
|  | ||||
|     if (cali_idx != "") { | ||||
|         yield(); | ||||
|         doc["print"]["sequence_id"] = 0; | ||||
|         doc["print"]["sequence_id"] = "0"; | ||||
|         doc["print"]["command"] = "extrusion_cali_sel"; | ||||
|         doc["print"]["filament_id"] = tray_info_idx; | ||||
|         doc["print"]["nozzle_diameter"] = "0.4"; | ||||
|         doc["print"]["cali_idx"] = cali_idx.toInt(); | ||||
|         doc["print"]["tray_id"] = trayId < 200 ? trayId : 254; | ||||
|         doc["print"]["ams_id"] = amsId < 200 ? amsId : 255; | ||||
|         //doc["print"]["ams_id"] = amsId < 200 ? amsId : 255; | ||||
|  | ||||
|         // Serialize the JSON | ||||
|         String output; | ||||
| @@ -218,44 +296,120 @@ bool setBambuSpool(String payload) { | ||||
|         doc.clear(); | ||||
|         yield(); | ||||
|     } | ||||
| /* | ||||
|     if (setting_id != "") { | ||||
|         yield(); | ||||
|         doc["print"]["sequence_id"] = 0; | ||||
|         doc["print"]["command"] = "ams_filament_setting"; | ||||
|         doc["print"]["nozzle_temp_min"] = minTemp; | ||||
|         doc["print"]["nozzle_temp_max"] = maxTemp; | ||||
|         doc["print"]["setting_id"] = setting_id; | ||||
|         doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF"; | ||||
|         doc["print"]["ams_id"] = amsId < 200 ? amsId : 255; | ||||
|         doc["print"]["tray_id"] = trayId < 200 ? trayId : 254; | ||||
|         doc["print"]["tray_info_idx"] = tray_info_idx; | ||||
|         doc["print"]["tray_type"] = type; | ||||
|  | ||||
|         // Serialize the JSON | ||||
|         String output; | ||||
|         serializeJson(doc, output); | ||||
|     return true; | ||||
| } | ||||
|  | ||||
|         if (sendMqttMessage(output)) { | ||||
|             Serial.println("Filament Setting successfully set"); | ||||
| void autoSetSpool(int spoolId, uint8_t trayId) { | ||||
|     // wenn neue spule erkannt und autoSetToBambu > 0 | ||||
|     JsonDocument spoolInfo = fetchSingleSpoolInfo(spoolId); | ||||
|  | ||||
|     if (!spoolInfo.isNull()) | ||||
|     { | ||||
|         // AMS und TRAY id ergänzen | ||||
|         spoolInfo["amsId"] = 0; | ||||
|         spoolInfo["trayId"] = trayId; | ||||
|  | ||||
|         Serial.println("Auto set spool"); | ||||
|         Serial.println(spoolInfo.as<String>()); | ||||
|  | ||||
|         setBambuSpool(spoolInfo.as<String>()); | ||||
|  | ||||
|         oledShowMessage("Spool set"); | ||||
|     } | ||||
|  | ||||
|     // id wieder zurücksetzen damit abgeschlossen | ||||
|     autoSetToBambuSpoolId = 0; | ||||
| } | ||||
|  | ||||
| void updateAmsWsData(JsonDocument& doc, JsonArray& amsArray, int& ams_count, JsonObject& vtTray) { | ||||
|     // Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden | ||||
|     ams_count = amsArray.size(); | ||||
|          | ||||
|     for (int i = 0; i < ams_count && i < 16; i++) { | ||||
|         JsonObject amsObj = amsArray[i]; | ||||
|         JsonArray trayArray = amsObj["tray"].as<JsonArray>(); | ||||
|  | ||||
|         ams_data[i].ams_id = i; // Setze die AMS-ID | ||||
|         for (int j = 0; j < trayArray.size() && j < 4; j++) { // Annahme: Maximal 4 Trays pro AMS | ||||
|             JsonObject trayObj = trayArray[j]; | ||||
|  | ||||
|             ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>(); | ||||
|             ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>(); | ||||
|             ams_data[i].trays[j].tray_type = trayObj["tray_type"].as<String>(); | ||||
|             ams_data[i].trays[j].tray_sub_brands = trayObj["tray_sub_brands"].as<String>(); | ||||
|             ams_data[i].trays[j].tray_color = trayObj["tray_color"].as<String>(); | ||||
|             ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>(); | ||||
|             ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>(); | ||||
|             //ams_data[i].trays[j].setting_id = trayObj["setting_id"].as<String>(); | ||||
|             ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>(); | ||||
|         } | ||||
|     } | ||||
|      | ||||
|     // Setze ams_count auf die Anzahl der normalen AMS | ||||
|     ams_count = amsArray.size(); | ||||
|  | ||||
|     // Wenn externe Spule vorhanden, füge sie hinzu | ||||
|     if (doc["print"]["vt_tray"].is<JsonObject>()) { | ||||
|         //JsonObject vtTray = doc["print"]["vt_tray"]; | ||||
|         int extIdx = ams_count;  // Index für externe Spule | ||||
|         ams_data[extIdx].ams_id = 255;  // Spezielle ID für externe Spule | ||||
|         ams_data[extIdx].trays[0].id = 254;  // Spezielle ID für externes Tray | ||||
|         ams_data[extIdx].trays[0].tray_info_idx = vtTray["tray_info_idx"].as<String>(); | ||||
|         ams_data[extIdx].trays[0].tray_type = vtTray["tray_type"].as<String>(); | ||||
|         ams_data[extIdx].trays[0].tray_sub_brands = vtTray["tray_sub_brands"].as<String>(); | ||||
|         ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>(); | ||||
|         ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>(); | ||||
|         ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>(); | ||||
|  | ||||
|         if (doc["print"]["vt_tray"]["tray_type"].as<String>() != "") | ||||
|         { | ||||
|             //ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>(); | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             Serial.println("Failed to set Filament setting"); | ||||
|             return false; | ||||
|             ams_data[extIdx].trays[0].setting_id = ""; | ||||
|             ams_data[extIdx].trays[0].cali_idx = ""; | ||||
|         } | ||||
|  | ||||
|         doc.clear(); | ||||
|         yield(); | ||||
|         ams_count++;  // Erhöhe ams_count für die externe Spule | ||||
|     } | ||||
| */ | ||||
|  | ||||
|     return true; | ||||
|     // Erstelle JSON für WebSocket-Clients | ||||
|     JsonDocument wsDoc; | ||||
|     JsonArray wsArray = wsDoc.to<JsonArray>(); | ||||
|  | ||||
|     for (int i = 0; i < ams_count; i++) { | ||||
|         JsonObject amsObj = wsArray.add<JsonObject>(); | ||||
|         amsObj["ams_id"] = ams_data[i].ams_id; | ||||
|  | ||||
|         JsonArray trays = amsObj["tray"].to<JsonArray>(); | ||||
|         int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4; | ||||
|          | ||||
|         for (int j = 0; j < maxTrays; j++) { | ||||
|             JsonObject trayObj = trays.add<JsonObject>(); | ||||
|             trayObj["id"] = ams_data[i].trays[j].id; | ||||
|             trayObj["tray_info_idx"] = ams_data[i].trays[j].tray_info_idx; | ||||
|             trayObj["tray_type"] = ams_data[i].trays[j].tray_type; | ||||
|             trayObj["tray_sub_brands"] = ams_data[i].trays[j].tray_sub_brands; | ||||
|             trayObj["tray_color"] = ams_data[i].trays[j].tray_color; | ||||
|             trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min; | ||||
|             trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max; | ||||
|             trayObj["setting_id"] = ams_data[i].trays[j].setting_id; | ||||
|             trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     serializeJson(wsArray, amsJsonData); | ||||
|     wsDoc.clear(); | ||||
|     Serial.println("AMS data updated"); | ||||
|     sendAmsData(nullptr); | ||||
| } | ||||
|  | ||||
| // init | ||||
| void mqtt_callback(char* topic, byte* payload, unsigned int length) { | ||||
|     String message; | ||||
|      | ||||
|     for (int i = 0; i < length; i++) { | ||||
|         message += (char)payload[i]; | ||||
|     } | ||||
| @@ -263,16 +417,28 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) { | ||||
|     // JSON-Dokument parsen | ||||
|     JsonDocument doc; | ||||
|     DeserializationError error = deserializeJson(doc, message); | ||||
|     if (error) { | ||||
|     message = ""; | ||||
|     if (error)  | ||||
|     { | ||||
|         Serial.print("Fehler beim Parsen des JSON: "); | ||||
|         Serial.println(error.c_str()); | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     // Wenn bambu auto set spool aktiv und eine spule erkannt und mqtt meldung das neue spule im ams | ||||
|     if (autoSendToBambu && autoSetToBambuSpoolId > 0 &&  | ||||
|         doc["print"]["command"].as<String>() == "push_status" && doc["print"]["ams"]["tray_pre"].as<uint8_t>() | ||||
|         && !doc["print"]["ams"]["ams"].as<JsonArray>()) | ||||
|     { | ||||
|         autoSetSpool(autoSetToBambuSpoolId, doc["print"]["ams"]["tray_pre"].as<uint8_t>()); | ||||
|     } | ||||
|  | ||||
|     // Prüfen, ob "print->upgrade_state" und "print.ams.ams" existieren | ||||
|     if (doc["print"]["upgrade_state"].is<String>()) { | ||||
|     if (doc["print"]["upgrade_state"].is<JsonObject>())  | ||||
|     { | ||||
|         // Prüfen ob AMS-Daten vorhanden sind | ||||
|         if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) { | ||||
|         if (!doc["print"]["ams"].is<JsonObject>() || !doc["print"]["ams"]["ams"].is<JsonArray>())  | ||||
|         { | ||||
|             return; | ||||
|         } | ||||
|  | ||||
| @@ -304,9 +470,13 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) { | ||||
|             // Vergleiche die Trays | ||||
|             for (int j = 0; j < trayArray.size() && j < 4 && !hasChanges; j++) { | ||||
|                 JsonObject trayObj = trayArray[j]; | ||||
|  | ||||
|                 if (trayObj["tray_type"].as<String>() == "") ams_data[storedIndex].trays[j].setting_id = ""; | ||||
|                 if (trayObj["setting_id"].isNull()) trayObj["setting_id"] = ""; | ||||
|                 if (trayObj["tray_info_idx"].as<String>() != ams_data[storedIndex].trays[j].tray_info_idx || | ||||
|                     trayObj["tray_type"].as<String>() != ams_data[storedIndex].trays[j].tray_type || | ||||
|                     trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color || | ||||
|                     (trayObj["setting_id"].as<String>() != "" && trayObj["setting_id"].as<String>() != ams_data[storedIndex].trays[j].setting_id) || | ||||
|                     trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) { | ||||
|                     hasChanges = true; | ||||
|                     break; | ||||
| @@ -315,143 +485,55 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) { | ||||
|         } | ||||
|  | ||||
|         // Prüfe die externe Spule | ||||
|         if (!hasChanges && doc["print"]["vt_tray"].is<String>()) { | ||||
|             JsonObject vtTray = doc["print"]["vt_tray"]; | ||||
|             bool foundExternal = false; | ||||
|              | ||||
|         JsonObject vtTray = doc["print"]["vt_tray"]; | ||||
|         if (doc["print"]["vt_tray"].is<JsonObject>()) { | ||||
|             for (int i = 0; i < ams_count; i++) { | ||||
|                 if (ams_data[i].ams_id == 255) { | ||||
|                     foundExternal = true; | ||||
|                     if (vtTray["tray_type"].as<String>() == "") ams_data[i].trays[0].setting_id = ""; | ||||
|                     if (vtTray["setting_id"].isNull()) vtTray["setting_id"] = ""; | ||||
|                     if (vtTray["tray_info_idx"].as<String>() != ams_data[i].trays[0].tray_info_idx || | ||||
|                         vtTray["tray_type"].as<String>() != ams_data[i].trays[0].tray_type || | ||||
|                         vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color || | ||||
|                         vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx) { | ||||
|                         (vtTray["setting_id"].as<String>() != "" && vtTray["setting_id"].as<String>() != ams_data[i].trays[0].setting_id) || | ||||
|                         (vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) { | ||||
|                         hasChanges = true; | ||||
|                     } | ||||
|                     break; | ||||
|                 } | ||||
|             } | ||||
|             if (!foundExternal) hasChanges = true; | ||||
|         } | ||||
|  | ||||
|         if (!hasChanges) return; | ||||
|  | ||||
|         // Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden | ||||
|         ams_count = amsArray.size(); | ||||
|          | ||||
|         for (int i = 0; i < ams_count && i < 16; i++) { | ||||
|             JsonObject amsObj = amsArray[i]; | ||||
|             JsonArray trayArray = amsObj["tray"].as<JsonArray>(); | ||||
|  | ||||
|             ams_data[i].ams_id = i; // Setze die AMS-ID | ||||
|             for (int j = 0; j < trayArray.size() && j < 4; j++) { // Annahme: Maximal 4 Trays pro AMS | ||||
|                 JsonObject trayObj = trayArray[j]; | ||||
|  | ||||
|                 ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>(); | ||||
|                 ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>(); | ||||
|                 ams_data[i].trays[j].tray_type = trayObj["tray_type"].as<String>(); | ||||
|                 ams_data[i].trays[j].tray_sub_brands = trayObj["tray_sub_brands"].as<String>(); | ||||
|                 ams_data[i].trays[j].tray_color = trayObj["tray_color"].as<String>(); | ||||
|                 ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>(); | ||||
|                 ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>(); | ||||
|                 ams_data[i].trays[j].setting_id = trayObj["setting_id"].as<String>(); | ||||
|                 ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>(); | ||||
|             } | ||||
|         } | ||||
|          | ||||
|         // Setze ams_count auf die Anzahl der normalen AMS | ||||
|         ams_count = amsArray.size(); | ||||
|  | ||||
|         // Wenn externe Spule vorhanden, füge sie hinzu | ||||
|         if (doc["print"]["vt_tray"].is<String>()) { | ||||
|             JsonObject vtTray = doc["print"]["vt_tray"]; | ||||
|             int extIdx = ams_count;  // Index für externe Spule | ||||
|             ams_data[extIdx].ams_id = 255;  // Spezielle ID für externe Spule | ||||
|             ams_data[extIdx].trays[0].id = 254;  // Spezielle ID für externes Tray | ||||
|             ams_data[extIdx].trays[0].tray_info_idx = vtTray["tray_info_idx"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].tray_type = vtTray["tray_type"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].tray_sub_brands = vtTray["tray_sub_brands"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>(); | ||||
|             ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>(); | ||||
|             ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>(); | ||||
|             ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>(); | ||||
|             ams_count++;  // Erhöhe ams_count für die externe Spule | ||||
|         } | ||||
|  | ||||
|         // Sende die aktualisierten AMS-Daten | ||||
|         //sendAmsData(nullptr); | ||||
|  | ||||
|         // Erstelle JSON für WebSocket-Clients | ||||
|         JsonDocument wsDoc; | ||||
|         JsonArray wsArray = wsDoc.to<JsonArray>(); | ||||
|  | ||||
|         for (int i = 0; i < ams_count; i++) { | ||||
|             JsonObject amsObj = wsArray.add<JsonObject>(); | ||||
|             amsObj["ams_id"] = ams_data[i].ams_id; | ||||
|  | ||||
|             JsonArray trays = amsObj["tray"].to<JsonArray>(); | ||||
|             int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4; | ||||
|              | ||||
|             for (int j = 0; j < maxTrays; j++) { | ||||
|                 JsonObject trayObj = trays.add<JsonObject>(); | ||||
|                 trayObj["id"] = ams_data[i].trays[j].id; | ||||
|                 trayObj["tray_info_idx"] = ams_data[i].trays[j].tray_info_idx; | ||||
|                 trayObj["tray_type"] = ams_data[i].trays[j].tray_type; | ||||
|                 trayObj["tray_sub_brands"] = ams_data[i].trays[j].tray_sub_brands; | ||||
|                 trayObj["tray_color"] = ams_data[i].trays[j].tray_color; | ||||
|                 trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min; | ||||
|                 trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max; | ||||
|                 trayObj["setting_id"] = ams_data[i].trays[j].setting_id; | ||||
|                 trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         serializeJson(wsArray, amsJsonData); | ||||
|         sendAmsData(nullptr); | ||||
|         updateAmsWsData(doc, amsArray, ams_count, vtTray); | ||||
|     } | ||||
|      | ||||
|     // Neue Bedingung für ams_filament_setting | ||||
|     else if (doc["print"]["command"] == "ams_filament_setting") { | ||||
|     if (doc["print"]["command"] == "ams_filament_setting") { | ||||
|         int amsId = doc["print"]["ams_id"].as<int>(); | ||||
|         int trayId = doc["print"]["tray_id"].as<int>(); | ||||
|         String settingId = doc["print"]["setting_id"].as<String>(); | ||||
|          | ||||
|         String settingId = (doc["print"]["setting_id"].is<String>()) ? doc["print"]["setting_id"].as<String>() : ""; | ||||
|  | ||||
|         // Finde das entsprechende AMS und Tray | ||||
|         for (int i = 0; i < ams_count; i++) { | ||||
|             if (ams_data[i].ams_id == amsId) { | ||||
|                 // Update setting_id im entsprechenden Tray | ||||
|                 ams_data[i].trays[trayId].setting_id = settingId; | ||||
|                  | ||||
|                 // Erstelle neues JSON für WebSocket-Clients | ||||
|                 JsonDocument wsDoc; | ||||
|                 JsonArray wsArray = wsDoc.to<JsonArray>(); | ||||
|  | ||||
|                 for (int j = 0; j < ams_count; j++) { | ||||
|                     JsonObject amsObj = wsArray.add<JsonObject>(); | ||||
|                     amsObj["ams_id"] = ams_data[j].ams_id; | ||||
|  | ||||
|                     JsonArray trays = amsObj["tray"].to<JsonArray>(); | ||||
|                     int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4; | ||||
|                      | ||||
|                     for (int k = 0; k < maxTrays; k++) { | ||||
|                         JsonObject trayObj = trays.add<JsonObject>(); | ||||
|                         trayObj["id"] = ams_data[j].trays[k].id; | ||||
|                         trayObj["tray_info_idx"] = ams_data[j].trays[k].tray_info_idx; | ||||
|                         trayObj["tray_type"] = ams_data[j].trays[k].tray_type; | ||||
|                         trayObj["tray_sub_brands"] = ams_data[j].trays[k].tray_sub_brands; | ||||
|                         trayObj["tray_color"] = ams_data[j].trays[k].tray_color; | ||||
|                         trayObj["nozzle_temp_min"] = ams_data[j].trays[k].nozzle_temp_min; | ||||
|                         trayObj["nozzle_temp_max"] = ams_data[j].trays[k].nozzle_temp_max; | ||||
|                         trayObj["setting_id"] = ams_data[j].trays[k].setting_id; | ||||
|                         trayObj["cali_idx"] = ams_data[j].trays[k].cali_idx; | ||||
|                 if (trayId == 254) | ||||
|                 { | ||||
|                     // Suche AMS mit ID 255 (externe Spule) | ||||
|                     for (int j = 0; j < ams_count; j++) { | ||||
|                         if (ams_data[j].ams_id == 255) { | ||||
|                             ams_data[j].trays[0].setting_id = settingId; | ||||
|                             break; | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 // Aktualisiere das globale amsJsonData | ||||
|                 amsJsonData = ""; | ||||
|                 serializeJson(wsArray, amsJsonData); | ||||
|                  | ||||
|                 else | ||||
|                 { | ||||
|                     ams_data[i].trays[trayId].setting_id = settingId; | ||||
|                 } | ||||
|                 | ||||
|                 // Sende an WebSocket Clients | ||||
|                 Serial.println("Filament setting updated"); | ||||
|                 sendAmsData(nullptr); | ||||
|                 break; | ||||
|             } | ||||
| @@ -461,15 +543,16 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) { | ||||
|  | ||||
| void reconnect() { | ||||
|     // Loop until we're reconnected | ||||
|     uint8_t retries = 0; | ||||
|     while (!client.connected()) { | ||||
|         Serial.print("Attempting MQTT connection..."); | ||||
|         Serial.println("Attempting MQTT re/connection..."); | ||||
|         bambu_connected = false; | ||||
|         oledShowTopRow(); | ||||
|  | ||||
|         // Attempt to connect | ||||
|         if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) { | ||||
|             Serial.println("... re-connected"); | ||||
|             // ... and resubscribe | ||||
|             Serial.println("MQTT re/connected"); | ||||
|  | ||||
|             client.subscribe(report_topic.c_str()); | ||||
|             bambu_connected = true; | ||||
|             oledShowTopRow(); | ||||
| @@ -479,14 +562,23 @@ void reconnect() { | ||||
|             Serial.println(" try again in 5 seconds"); | ||||
|             bambu_connected = false; | ||||
|             oledShowTopRow(); | ||||
|             // Wait 5 seconds before retrying | ||||
|              | ||||
|             yield(); | ||||
|             vTaskDelay(5000 / portTICK_PERIOD_MS); | ||||
|             if (retries > 5) { | ||||
|                 Serial.println("Disable Bambu MQTT Task after 5 retries"); | ||||
|                 //vTaskSuspend(BambuMqttTask); | ||||
|                 vTaskDelete(BambuMqttTask); | ||||
|                 break; | ||||
|             } | ||||
|  | ||||
|             retries++; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| void mqtt_loop(void * parameter) { | ||||
|     Serial.println("Bambu MQTT Task gestartet"); | ||||
|     for(;;) { | ||||
|         if (pauseBambuMqttTask) { | ||||
|             vTaskDelay(10000); | ||||
| @@ -500,6 +592,7 @@ void mqtt_loop(void * parameter) { | ||||
|         } | ||||
|         client.loop(); | ||||
|         yield(); | ||||
|         esp_task_wdt_reset(); | ||||
|         vTaskDelay(100); | ||||
|     } | ||||
| } | ||||
| @@ -540,7 +633,7 @@ bool setupMqtt() { | ||||
|             xTaskCreatePinnedToCore( | ||||
|                 mqtt_loop, /* Function to implement the task */ | ||||
|                 "BambuMqtt", /* Name of the task */ | ||||
|                 10000,  /* Stack size in words */ | ||||
|                 8192,  /* Stack size in words */ | ||||
|                 NULL,  /* Task input parameter */ | ||||
|                 mqttTaskPrio,  /* Priority of the task */ | ||||
|                 &BambuMqttTask,  /* Task handle. */ | ||||
|   | ||||
| @@ -28,9 +28,11 @@ extern bool bambu_connected; | ||||
|  | ||||
| extern int ams_count; | ||||
| extern AMSData ams_data[MAX_AMS]; | ||||
| extern bool autoSendToBambu; | ||||
| extern int autoSetToBambuSpoolId; | ||||
|  | ||||
| bool loadBambuCredentials(); | ||||
| bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode); | ||||
| bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime); | ||||
| bool setupMqtt(); | ||||
| void mqtt_loop(void * parameter); | ||||
| bool setBambuSpool(String payload); | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| #include "commonFS.h" | ||||
| #include <SPIFFS.h> | ||||
| #include <LittleFS.h> | ||||
|  | ||||
| bool saveJsonValue(const char* filename, const JsonDocument& doc) { | ||||
|     File file = SPIFFS.open(filename, "w"); | ||||
|     File file = LittleFS.open(filename, "w"); | ||||
|     if (!file) { | ||||
|         Serial.print("Fehler beim Öffnen der Datei zum Schreiben: "); | ||||
|         Serial.println(filename); | ||||
| @@ -20,7 +20,7 @@ bool saveJsonValue(const char* filename, const JsonDocument& doc) { | ||||
| } | ||||
|  | ||||
| bool loadJsonValue(const char* filename, JsonDocument& doc) { | ||||
|     File file = SPIFFS.open(filename, "r"); | ||||
|     File file = LittleFS.open(filename, "r"); | ||||
|     if (!file) { | ||||
|         Serial.print("Fehler beim Öffnen der Datei zum Lesen: "); | ||||
|         Serial.println(filename); | ||||
| @@ -36,12 +36,12 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) { | ||||
|     return true; | ||||
| } | ||||
|  | ||||
| void initializeSPIFFS() { | ||||
|     if (!SPIFFS.begin(true, "/spiffs", 10, "spiffs")) { | ||||
|         Serial.println("SPIFFS Mount Failed"); | ||||
| void initializeFileSystem() { | ||||
|     if (!LittleFS.begin(true)) { | ||||
|         Serial.println("LittleFS Mount Failed"); | ||||
|         return; | ||||
|     } | ||||
|     Serial.printf("SPIFFS Total: %u bytes\n", SPIFFS.totalBytes()); | ||||
|     Serial.printf("SPIFFS Used: %u bytes\n", SPIFFS.usedBytes()); | ||||
|     Serial.printf("SPIFFS Free: %u bytes\n", SPIFFS.totalBytes() - SPIFFS.usedBytes()); | ||||
|     Serial.printf("LittleFS Total: %u bytes\n", LittleFS.totalBytes()); | ||||
|     Serial.printf("LittleFS Used: %u bytes\n", LittleFS.usedBytes()); | ||||
|     Serial.printf("LittleFS Free: %u bytes\n", LittleFS.totalBytes() - LittleFS.usedBytes()); | ||||
| } | ||||
| @@ -2,11 +2,11 @@ | ||||
| #define COMMONFS_H | ||||
|  | ||||
| #include <Arduino.h> | ||||
| #include <SPIFFS.h> | ||||
| #include <ArduinoJson.h> | ||||
| #include <LittleFS.h> | ||||
|  | ||||
| bool saveJsonValue(const char* filename, const JsonDocument& doc); | ||||
| bool loadJsonValue(const char* filename, JsonDocument& doc); | ||||
| void initializeSPIFFS(); | ||||
| void initializeFileSystem(); | ||||
|  | ||||
| #endif | ||||
|   | ||||
| @@ -40,6 +40,10 @@ const uint8_t webserverPort = 80; | ||||
| const char* apiUrl = "/api/v1"; | ||||
| // ***** API | ||||
|  | ||||
| // ***** Bambu Auto Set Spool | ||||
| uint8_t autoSetBambuAmsCounter = 60; | ||||
| // ***** Bambu Auto Set Spool | ||||
|  | ||||
| // ***** Task Prios | ||||
| uint8_t rfidTaskCore = 1; | ||||
| uint8_t rfidTaskPrio = 1; | ||||
|   | ||||
| @@ -23,6 +23,8 @@ extern const uint8_t OLED_DATA_END; | ||||
| extern const char* apiUrl; | ||||
| extern const uint8_t webserverPort; | ||||
|  | ||||
| extern uint8_t autoSetBambuAmsCounter; | ||||
|  | ||||
| extern const unsigned char wifi_on[]; | ||||
| extern const unsigned char wifi_off[]; | ||||
| extern const unsigned char cloud_on[]; | ||||
|   | ||||
| @@ -20,9 +20,9 @@ void setupDisplay() { | ||||
|     // the library initializes this with an Adafruit splash screen. | ||||
|     display.setTextColor(WHITE); | ||||
|     display.display(); | ||||
|     delay(1000); // Pause for 2 seconds | ||||
|     oledShowTopRow(); | ||||
|     delay(2000); | ||||
|     oledShowMessage("FilaMan v" + String(VERSION)); | ||||
|     vTaskDelay(2000 / portTICK_PERIOD_MS); | ||||
| } | ||||
|  | ||||
| void oledclearline() { | ||||
| @@ -117,7 +117,6 @@ std::vector<String> splitTextIntoLines(String text, uint8_t textSize) { | ||||
|         lines.push_back(currentLine); | ||||
|     } | ||||
|      | ||||
|     Serial.println(lines.size()); | ||||
|     return lines; | ||||
| } | ||||
|  | ||||
| @@ -140,8 +139,9 @@ void oledShowMultilineMessage(String message, uint8_t size) { | ||||
|     int totalHeight = lines.size() * lineHeight; | ||||
|     int startY = OLED_DATA_START + ((OLED_DATA_END - OLED_DATA_START - totalHeight) / 2); | ||||
|      | ||||
|     uint8_t lineDistance = (lines.size() == 2) ? 5 : 0; | ||||
|     for (size_t i = 0; i < lines.size(); i++) { | ||||
|         display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight)); | ||||
|         display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight) + (i == 1 ? lineDistance : 0)); | ||||
|         display.print(lines[i]); | ||||
|     } | ||||
|      | ||||
|   | ||||
							
								
								
									
										123
									
								
								src/main.cpp
									
									
									
									
									
								
							
							
						
						
									
										123
									
								
								src/main.cpp
									
									
									
									
									
								
							| @@ -1,6 +1,4 @@ | ||||
| #include <Arduino.h> | ||||
| #include <DNSServer.h> | ||||
| #include <ESPmDNS.h> | ||||
| #include <Wire.h> | ||||
| #include <WiFi.h> | ||||
|  | ||||
| @@ -26,7 +24,7 @@ void setup() { | ||||
|   Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes. | ||||
|  | ||||
|   // Initialize SPIFFS | ||||
|   initializeSPIFFS(); | ||||
|   initializeFileSystem(); | ||||
|  | ||||
|   // Start Display | ||||
|   setupDisplay(); | ||||
| @@ -35,7 +33,6 @@ void setup() { | ||||
|   initWiFi(); | ||||
|  | ||||
|   // Webserver | ||||
|   Serial.println("Starte Webserver"); | ||||
|   setupWebserver(server); | ||||
|  | ||||
|   // Spoolman API | ||||
| @@ -43,22 +40,27 @@ void setup() { | ||||
|   initSpoolman(); | ||||
|  | ||||
|   // Bambu MQTT | ||||
|   // bambu.cpp | ||||
|   setupMqtt(); | ||||
|  | ||||
|   // mDNS | ||||
|   Serial.println("Starte MDNS"); | ||||
|   if (!MDNS.begin("filaman")) {   // Set the hostname to "esp32.local" | ||||
|     Serial.println("Error setting up MDNS responder!"); | ||||
|     while(1) { | ||||
|       delay(1000); | ||||
|     } | ||||
|   } | ||||
|   Serial.println("mDNS responder started"); | ||||
|    | ||||
|   // NFC Reader | ||||
|   startNfc(); | ||||
|  | ||||
|   start_scale(); | ||||
|   uint8_t scaleCalibrated = start_scale(); | ||||
|   if (scaleCalibrated == 3) { | ||||
|     oledShowMessage("Scale not calibrated!"); | ||||
|     for (uint16_t i = 0; i < 50000; i++) { | ||||
|       yield(); | ||||
|       vTaskDelay(pdMS_TO_TICKS(1)); | ||||
|       esp_task_wdt_reset(); | ||||
|     } | ||||
|   } else if (scaleCalibrated == 0) { | ||||
|     oledShowMessage("HX711 not found"); | ||||
|     for (uint16_t i = 0; i < 50000; i++) { | ||||
|       yield(); | ||||
|       vTaskDelay(pdMS_TO_TICKS(1)); | ||||
|       esp_task_wdt_reset(); | ||||
|     } | ||||
|   } | ||||
|    | ||||
|   // WDT initialisieren mit 10 Sekunden Timeout | ||||
|   bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus | ||||
| @@ -72,45 +74,85 @@ void setup() { | ||||
| } | ||||
|  | ||||
|  | ||||
| /** | ||||
|  * Safe interval check that handles millis() overflow | ||||
|  * @param currentTime Current millis() value | ||||
|  * @param lastTime Last recorded time | ||||
|  * @param interval Desired interval in milliseconds | ||||
|  * @return True if interval has elapsed | ||||
|  */ | ||||
| bool intervalElapsed(unsigned long currentTime, unsigned long &lastTime, unsigned long interval) { | ||||
|   if (currentTime - lastTime >= interval || currentTime < lastTime) { | ||||
|     lastTime = currentTime; | ||||
|     return true; | ||||
|   } | ||||
|   return false; | ||||
| } | ||||
|  | ||||
| unsigned long lastWeightReadTime = 0; | ||||
| const unsigned long weightReadInterval = 1000; // 1 second | ||||
|  | ||||
| unsigned long lastAmsSendTime = 0; | ||||
| const unsigned long amsSendInterval = 60000; // 1 minute | ||||
| unsigned long lastAutoSetBambuAmsTime = 0; | ||||
| const unsigned long autoSetBambuAmsInterval = 1000; // 1 second | ||||
| uint8_t autoAmsCounter = 0; | ||||
|  | ||||
| uint8_t weightSend = 0; | ||||
| int16_t lastWeight = 0; | ||||
| uint8_t wifiErrorCounter = 0; | ||||
|  | ||||
| unsigned long lastWifiCheckTime = 0; | ||||
| const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms) | ||||
|  | ||||
| // ##### PROGRAM START ##### | ||||
| void loop() { | ||||
|  | ||||
|   /* | ||||
|   // Überprüfe den WLAN-Status | ||||
|   if (WiFi.status() != WL_CONNECTED) { | ||||
|     wifiErrorCounter++; | ||||
|     wifiOn = false; | ||||
|   } else { | ||||
|     wifiErrorCounter = 0; | ||||
|     wifiOn = true; | ||||
|   } | ||||
|   if (wifiErrorCounter > 20) ESP.restart(); | ||||
|   */ | ||||
|   | ||||
|   unsigned long currentMillis = millis(); | ||||
|  | ||||
|   // Send AMS Data min every Minute | ||||
|   if (currentMillis - lastAmsSendTime >= amsSendInterval) { | ||||
|     lastAmsSendTime = currentMillis; | ||||
|     sendAmsData(nullptr); | ||||
|   // Überprüfe regelmäßig die WLAN-Verbindung | ||||
|   if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) { | ||||
|     checkWiFiConnection(); | ||||
|   } | ||||
|  | ||||
|   // Ausgabe der Waage auf Display | ||||
|   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0) | ||||
|   { | ||||
|     (weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight); | ||||
|   // Wenn Bambu auto set Spool aktiv | ||||
|   if (autoSendToBambu && autoSetToBambuSpoolId > 0) { | ||||
|     if (intervalElapsed(currentMillis, lastAutoSetBambuAmsTime, autoSetBambuAmsInterval))  | ||||
|     { | ||||
|       if (hasReadRfidTag == 0) | ||||
|       { | ||||
|         lastAutoSetBambuAmsTime = currentMillis; | ||||
|         oledShowMessage("Auto Set         " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s"); | ||||
|         autoAmsCounter++; | ||||
|  | ||||
|         if (autoAmsCounter >= autoSetBambuAmsCounter)  | ||||
|         { | ||||
|           autoSetToBambuSpoolId = 0; | ||||
|           autoAmsCounter = 0; | ||||
|           oledShowWeight(weight); | ||||
|         } | ||||
|       } | ||||
|       else | ||||
|       { | ||||
|         autoAmsCounter = 0; | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   // Wenn Waage nicht Kalibriert | ||||
|   if (scaleCalibrated == 3)  | ||||
|   { | ||||
|     oledShowMessage("Scale not calibrated!"); | ||||
|     vTaskDelay(5000 / portTICK_PERIOD_MS); | ||||
|     yield(); | ||||
|     esp_task_wdt_reset(); | ||||
|      | ||||
|     return; | ||||
|   }  | ||||
|  | ||||
|   // Ausgabe der Waage auf Display | ||||
|   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0 && (!autoSendToBambu || autoSetToBambuSpoolId == 0)) | ||||
|   { | ||||
|     (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight); | ||||
|   } | ||||
|  | ||||
|  | ||||
|   // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird | ||||
|   if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag < 3) | ||||
|   { | ||||
| @@ -154,6 +196,7 @@ void loop() { | ||||
|       oledShowIcon("success"); | ||||
|       vTaskDelay(2000 / portTICK_PERIOD_MS); | ||||
|       weightSend = 1; | ||||
|       autoSetToBambuSpoolId = spoolId.toInt(); | ||||
|     } | ||||
|     else | ||||
|     { | ||||
|   | ||||
							
								
								
									
										12
									
								
								src/nfc.cpp
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/nfc.cpp
									
									
									
									
									
								
							| @@ -238,12 +238,14 @@ void writeJsonToTag(void *parameter) { | ||||
|  | ||||
|   hasReadRfidTag = 3; | ||||
|   vTaskSuspend(RfidReaderTask); | ||||
|   vTaskDelay(500 / portTICK_PERIOD_MS); | ||||
|   vTaskDelay(50 / portTICK_PERIOD_MS); | ||||
|  | ||||
|   //pauseBambuMqttTask = true; | ||||
|   // aktualisieren der Website wenn sich der Status ändert | ||||
|   sendNfcData(nullptr); | ||||
|   vTaskDelay(100 / portTICK_PERIOD_MS); | ||||
|   oledShowMessage("Waiting for NFC-Tag"); | ||||
|  | ||||
|    | ||||
|   // Wait 10sec for tag | ||||
|   uint8_t success = 0; | ||||
|   String uidString = ""; | ||||
| @@ -331,7 +333,7 @@ void startWriteJsonToTag(const char* payload) { | ||||
|     xTaskCreate( | ||||
|         writeJsonToTag,        // Task-Funktion | ||||
|         "WriteJsonToTagTask",       // Task-Name | ||||
|         4096,                        // Stackgröße in Bytes | ||||
|         5115,                        // Stackgröße in Bytes | ||||
|         (void*)payloadCopy,         // Parameter | ||||
|         rfidWriteTaskPrio,           // Priorität | ||||
|         NULL                         // Task-Handle (nicht benötigt) | ||||
| @@ -420,7 +422,7 @@ void scanRfidTask(void * parameter) { | ||||
|         //uidString = ""; | ||||
|         nfcJsonData = ""; | ||||
|         Serial.println("Tag entfernt"); | ||||
|         oledShowWeight(0); | ||||
|         if (!autoSendToBambu) oledShowWeight(weight); | ||||
|       } | ||||
|  | ||||
|       // aktualisieren der Website wenn sich der Status ändert | ||||
| @@ -456,7 +458,7 @@ void startNfc() { | ||||
|     BaseType_t result = xTaskCreatePinnedToCore( | ||||
|       scanRfidTask, /* Function to implement the task */ | ||||
|       "RfidReader", /* Name of the task */ | ||||
|       10000,  /* Stack size in words */ | ||||
|       5115,  /* Stack size in words */ | ||||
|       NULL,  /* Task input parameter */ | ||||
|       rfidTaskPrio,  /* Priority of the task */ | ||||
|       &RfidReaderTask,  /* Task handle. */ | ||||
|   | ||||
							
								
								
									
										205
									
								
								src/ota.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										205
									
								
								src/ota.cpp
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,205 @@ | ||||
| #include <Arduino.h> | ||||
| #include <website.h> | ||||
| #include <commonFS.h> | ||||
|  | ||||
| // Globale Variablen für Config Backups hinzufügen | ||||
| String bambuCredentialsBackup; | ||||
| String spoolmanUrlBackup; | ||||
|  | ||||
| // Globale Variable für den Update-Typ | ||||
| static int currentUpdateCommand = 0; | ||||
|  | ||||
| // Globale Update-Variablen | ||||
| static size_t updateTotalSize = 0; | ||||
| static size_t updateWritten = 0; | ||||
| static bool isSpiffsUpdate = false; | ||||
|  | ||||
|  | ||||
| void backupJsonConfigs() { | ||||
|     // Bambu Credentials backup | ||||
|     if (LittleFS.exists("/bambu_credentials.json")) { | ||||
|         File file = LittleFS.open("/bambu_credentials.json", "r"); | ||||
|         if (file) { | ||||
|             bambuCredentialsBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials backed up"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // Spoolman URL backup | ||||
|     if (LittleFS.exists("/spoolman_url.json")) { | ||||
|         File file = LittleFS.open("/spoolman_url.json", "r"); | ||||
|         if (file) { | ||||
|             spoolmanUrlBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL backed up"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| void restoreJsonConfigs() { | ||||
|     // Restore Bambu credentials | ||||
|     if (bambuCredentialsBackup.length() > 0) { | ||||
|         File file = LittleFS.open("/bambu_credentials.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(bambuCredentialsBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials restored"); | ||||
|         } | ||||
|         bambuCredentialsBackup = ""; // Clear backup | ||||
|     } | ||||
|  | ||||
|     // Restore Spoolman URL | ||||
|     if (spoolmanUrlBackup.length() > 0) { | ||||
|         File file = LittleFS.open("/spoolman_url.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(spoolmanUrlBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL restored"); | ||||
|         } | ||||
|         spoolmanUrlBackup = ""; // Clear backup | ||||
|     } | ||||
| } | ||||
|  | ||||
| void espRestart() { | ||||
|     yield(); | ||||
|     vTaskDelay(5000 / portTICK_PERIOD_MS); | ||||
|  | ||||
|     ESP.restart(); | ||||
| } | ||||
|  | ||||
|  | ||||
| void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) { | ||||
|     static int lastSentProgress = -1; | ||||
|      | ||||
|     // Verhindere zu häufige Updates | ||||
|     if (progress == lastSentProgress && !status && !message) { | ||||
|         return; | ||||
|     } | ||||
|      | ||||
|     String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress); | ||||
|     if (status) { | ||||
|         progressMsg += ",\"status\":\"" + String(status) + "\""; | ||||
|     } | ||||
|     if (message) { | ||||
|         progressMsg += ",\"message\":\"" + String(message) + "\""; | ||||
|     } | ||||
|     progressMsg += "}"; | ||||
|      | ||||
|     if (progress >= 100) { | ||||
|         // Sende die Nachricht nur einmal für den Abschluss | ||||
|         ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         delay(50); | ||||
|     } | ||||
|  | ||||
|     // Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates | ||||
|     if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) { | ||||
|         for (int i = 0; i < 2; i++) { | ||||
|             ws.textAll(progressMsg); | ||||
|             delay(100);  // Längerer Delay zwischen Nachrichten | ||||
|         } | ||||
|     } else { | ||||
|         ws.textAll(progressMsg); | ||||
|         delay(50); | ||||
|     } | ||||
|      | ||||
|     lastSentProgress = progress; | ||||
| } | ||||
|  | ||||
| void handleUpdate(AsyncWebServer &server) { | ||||
|     AsyncCallbackWebHandler* updateHandler = new AsyncCallbackWebHandler(); | ||||
|     updateHandler->setUri("/update"); | ||||
|     updateHandler->setMethod(HTTP_POST); | ||||
|      | ||||
|     updateHandler->onUpload([](AsyncWebServerRequest *request, String filename, | ||||
|                              size_t index, uint8_t *data, size_t len, bool final) { | ||||
|         if (!index) { | ||||
|             updateTotalSize = request->contentLength(); | ||||
|             updateWritten = 0; | ||||
|             isSpiffsUpdate = (filename.indexOf("website") > -1); | ||||
|              | ||||
|             if (isSpiffsUpdate) { | ||||
|                 // Backup vor dem Update | ||||
|                 sendUpdateProgress(0, "backup", "Backing up configurations..."); | ||||
|                 delay(200); | ||||
|                 backupJsonConfigs(); | ||||
|                 delay(200); | ||||
|                  | ||||
|                 const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL); | ||||
|                 if (!partition || !Update.begin(partition->size, U_SPIFFS)) { | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 sendUpdateProgress(5, "starting", "Starting SPIFFS update..."); | ||||
|                 delay(200); | ||||
|             } else { | ||||
|                 if (!Update.begin(updateTotalSize)) { | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 sendUpdateProgress(0, "starting", "Starting firmware update..."); | ||||
|                 delay(200); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (len) { | ||||
|             if (Update.write(data, len) != len) { | ||||
|                 request->send(400, "application/json", "{\"success\":false,\"message\":\"Write failed\"}"); | ||||
|                 return; | ||||
|             } | ||||
|              | ||||
|             updateWritten += len; | ||||
|             int currentProgress; | ||||
|              | ||||
|             // Berechne den Fortschritt basierend auf dem Update-Typ | ||||
|             if (isSpiffsUpdate) { | ||||
|                 // SPIFFS: 5-75% für Upload | ||||
|                 currentProgress = 6 + (updateWritten * 100) / updateTotalSize; | ||||
|             } else { | ||||
|                 // Firmware: 0-100% für Upload | ||||
|                 currentProgress = 1 + (updateWritten * 100) / updateTotalSize; | ||||
|             } | ||||
|              | ||||
|             static int lastProgress = -1; | ||||
|             if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) { | ||||
|                 sendUpdateProgress(currentProgress, "uploading"); | ||||
|                 oledShowMessage("Update: " + String(currentProgress) + "%"); | ||||
|                 delay(50); | ||||
|                 lastProgress = currentProgress; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (final) { | ||||
|             if (Update.end(true)) { | ||||
|                 if (isSpiffsUpdate) { | ||||
|                     restoreJsonConfigs(); | ||||
|                 } | ||||
|             } else { | ||||
|                 request->send(400, "application/json", "{\"success\":false,\"message\":\"Update finalization failed\"}"); | ||||
|             } | ||||
|         } | ||||
|     }); | ||||
|  | ||||
|     updateHandler->onRequest([](AsyncWebServerRequest *request) { | ||||
|         if (Update.hasError()) { | ||||
|             request->send(400, "application/json", "{\"success\":false,\"message\":\"Update failed\"}"); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         // Erste 100% Nachricht | ||||
|         ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         vTaskDelay(2000 / portTICK_PERIOD_MS); | ||||
|          | ||||
|         AsyncWebServerResponse *response = request->beginResponse(200, "application/json",  | ||||
|             "{\"success\":true,\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         response->addHeader("Connection", "close"); | ||||
|         request->send(response); | ||||
|          | ||||
|         // Zweite 100% Nachricht zur Sicherheit | ||||
|         ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}"); | ||||
|          | ||||
|         espRestart(); | ||||
|     }); | ||||
|  | ||||
|     server.addHandler(updateHandler); | ||||
| } | ||||
							
								
								
									
										9
									
								
								src/ota.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								src/ota.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| #ifndef OTA_H | ||||
| #define OTA_H | ||||
|  | ||||
| #include <ArduinoOTA.h> | ||||
| #include <ESPAsyncWebServer.h> | ||||
|  | ||||
| void handleUpdate(AsyncWebServer &server); | ||||
|  | ||||
| #endif | ||||
| @@ -16,6 +16,7 @@ int16_t weight = 0; | ||||
| uint8_t weigthCouterToApi = 0; | ||||
| uint8_t scale_tare_counter = 0; | ||||
| uint8_t pauseMainTask = 0; | ||||
| uint8_t scaleCalibrated = 1; | ||||
|  | ||||
| Preferences preferences; | ||||
| const char* NVS_NAMESPACE = "scale"; | ||||
| @@ -50,11 +51,11 @@ void scale_loop(void * parameter) { | ||||
|   } | ||||
| } | ||||
|  | ||||
| void start_scale() { | ||||
| uint8_t start_scale() { | ||||
|   Serial.println("Prüfe Calibration Value"); | ||||
|   long calibrationValue; | ||||
|  | ||||
|   // NVS | ||||
|   // NVS lesen | ||||
|   preferences.begin(NVS_NAMESPACE, true); // true = readonly | ||||
|   calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue); | ||||
|   preferences.end(); | ||||
| @@ -64,7 +65,10 @@ void start_scale() { | ||||
|  | ||||
|   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN); | ||||
|  | ||||
|   if (isnan(calibrationValue) || calibrationValue < 1) calibrationValue = defaultScaleCalibrationValue; | ||||
|   if (isnan(calibrationValue) || calibrationValue < 1) { | ||||
|     calibrationValue = defaultScaleCalibrationValue; | ||||
|     scaleCalibrated = 0; | ||||
|   } | ||||
|  | ||||
|   oledShowMessage("Scale Tare Please remove all"); | ||||
|   for (uint16_t i = 0; i < 2000; i++) { | ||||
| @@ -97,6 +101,8 @@ void start_scale() { | ||||
|   } else { | ||||
|       Serial.println("ScaleLoop-Task erfolgreich erstellt"); | ||||
|   } | ||||
|  | ||||
|   return (scaleCalibrated == 1) ? 1 : 3; | ||||
| } | ||||
|  | ||||
| uint8_t calibrate_scale() { | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
| #include "HX711.h" | ||||
|  | ||||
|  | ||||
| void start_scale(); | ||||
| uint8_t start_scale(); | ||||
| uint8_t calibrate_scale(); | ||||
| uint8_t tareScale(); | ||||
|  | ||||
| @@ -14,6 +14,7 @@ extern int16_t weight; | ||||
| extern uint8_t weigthCouterToApi; | ||||
| extern uint8_t scale_tare_counter; | ||||
| extern uint8_t pauseMainTask; | ||||
| extern uint8_t scaleCalibrated; | ||||
|  | ||||
| extern TaskHandle_t ScaleTask; | ||||
|  | ||||
|   | ||||
							
								
								
									
										270
									
								
								src/website.cpp
									
									
									
									
									
								
							
							
						
						
									
										270
									
								
								src/website.cpp
									
									
									
									
									
								
							| @@ -9,6 +9,7 @@ | ||||
| #include "esp_task_wdt.h" | ||||
| #include <Update.h> | ||||
| #include "display.h" | ||||
| #include "ota.h" | ||||
|  | ||||
| #ifndef VERSION | ||||
|   #define VERSION "1.1.0" | ||||
| @@ -23,48 +24,6 @@ AsyncWebSocket ws("/ws"); | ||||
| uint8_t lastSuccess = 0; | ||||
| uint8_t lastHasReadRfidTag = 0; | ||||
|  | ||||
| // Globale Variablen für Config Backups hinzufügen | ||||
| String bambuCredentialsBackup; | ||||
| String spoolmanUrlBackup; | ||||
|  | ||||
| // Globale Variable für den Update-Typ | ||||
| static int currentUpdateCommand = 0; | ||||
|  | ||||
| // Globale Update-Variablen | ||||
| static size_t updateTotalSize = 0; | ||||
| static size_t updateWritten = 0; | ||||
| static bool isSpiffsUpdate = false; | ||||
|  | ||||
| void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) { | ||||
|     static int lastSentProgress = -1; | ||||
|      | ||||
|     // Verhindere zu häufige Updates | ||||
|     if (progress == lastSentProgress && !status && !message) { | ||||
|         return; | ||||
|     } | ||||
|      | ||||
|     String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress); | ||||
|     if (status) { | ||||
|         progressMsg += ",\"status\":\"" + String(status) + "\""; | ||||
|     } | ||||
|     if (message) { | ||||
|         progressMsg += ",\"message\":\"" + String(message) + "\""; | ||||
|     } | ||||
|     progressMsg += "}"; | ||||
|      | ||||
|     // Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates | ||||
|     if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) { | ||||
|         for (int i = 0; i < 2; i++) { | ||||
|             ws.textAll(progressMsg); | ||||
|             delay(100);  // Längerer Delay zwischen Nachrichten | ||||
|         } | ||||
|     } else { | ||||
|         ws.textAll(progressMsg); | ||||
|         delay(50); | ||||
|     } | ||||
|      | ||||
|     lastSentProgress = progress; | ||||
| } | ||||
|  | ||||
| void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) { | ||||
|     if (type == WS_EVT_CONNECT) { | ||||
| @@ -84,7 +43,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
|         String message = String((char*)data); | ||||
|         JsonDocument doc; | ||||
|         deserializeJson(doc, message); | ||||
|          | ||||
|  | ||||
|         if (doc["type"] == "heartbeat") { | ||||
|             // Sende Heartbeat-Antwort | ||||
|             ws.text(client->id(), "{" | ||||
| @@ -96,7 +55,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
|         } | ||||
|  | ||||
|         else if (doc["type"] == "writeNfcTag") { | ||||
|             if (doc["payload"].is<String>()) { | ||||
|             if (doc["payload"].is<JsonObject>()) { | ||||
|                 // Versuche NFC-Daten zu schreiben | ||||
|                 String payloadString; | ||||
|                 serializeJson(doc["payload"], payloadString); | ||||
| @@ -136,6 +95,15 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
|             setBambuSpool(doc["payload"]); | ||||
|         } | ||||
|  | ||||
|         else if (doc["type"] == "setSpoolmanSettings") { | ||||
|             Serial.println(doc["payload"].as<String>()); | ||||
|             if (updateSpoolBambuData(doc["payload"].as<String>())) { | ||||
|                 ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"success\"}"); | ||||
|             } else { | ||||
|                 ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"error\"}"); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         else { | ||||
|             Serial.println("Unbekannter WebSocket-Typ: " + doc["type"].as<String>()); | ||||
|         } | ||||
| @@ -145,12 +113,12 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp | ||||
| // Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei | ||||
| String loadHtmlWithHeader(const char* filename) { | ||||
|     Serial.println("Lade HTML-Datei: " + String(filename)); | ||||
|     if (!SPIFFS.exists(filename)) { | ||||
|     if (!LittleFS.exists(filename)) { | ||||
|         Serial.println("Fehler: Datei nicht gefunden!"); | ||||
|         return "Fehler: Datei nicht gefunden!"; | ||||
|     } | ||||
|  | ||||
|     File file = SPIFFS.open(filename, "r"); | ||||
|     File file = LittleFS.open(filename, "r"); | ||||
|     String html = file.readString(); | ||||
|     file.close(); | ||||
|  | ||||
| @@ -207,105 +175,6 @@ void sendAmsData(AsyncWebSocketClient *client) { | ||||
|     } | ||||
| } | ||||
|  | ||||
| void handleUpdate(AsyncWebServer &server) { | ||||
|     AsyncCallbackWebHandler* updateHandler = new AsyncCallbackWebHandler(); | ||||
|     updateHandler->setUri("/update"); | ||||
|     updateHandler->setMethod(HTTP_POST); | ||||
|      | ||||
|     updateHandler->onUpload([](AsyncWebServerRequest *request, String filename, | ||||
|                              size_t index, uint8_t *data, size_t len, bool final) { | ||||
|         if (!index) { | ||||
|             updateTotalSize = request->contentLength(); | ||||
|             updateWritten = 0; | ||||
|             isSpiffsUpdate = (filename.indexOf("website") > -1); | ||||
|              | ||||
|             if (isSpiffsUpdate) { | ||||
|                 // Backup vor dem Update | ||||
|                 sendUpdateProgress(0, "backup", "Backing up configurations..."); | ||||
|                 delay(200); | ||||
|                 backupJsonConfigs(); | ||||
|                 delay(200); | ||||
|                  | ||||
|                 const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL); | ||||
|                 if (!partition || !Update.begin(partition->size, U_SPIFFS)) { | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 sendUpdateProgress(5, "starting", "Starting SPIFFS update..."); | ||||
|                 delay(200); | ||||
|             } else { | ||||
|                 if (!Update.begin(updateTotalSize)) { | ||||
|                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}"); | ||||
|                     return; | ||||
|                 } | ||||
|                 sendUpdateProgress(0, "starting", "Starting firmware update..."); | ||||
|                 delay(200); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (len) { | ||||
|             if (Update.write(data, len) != len) { | ||||
|                 request->send(400, "application/json", "{\"success\":false,\"message\":\"Write failed\"}"); | ||||
|                 return; | ||||
|             } | ||||
|              | ||||
|             updateWritten += len; | ||||
|             int currentProgress; | ||||
|              | ||||
|             // Berechne den Fortschritt basierend auf dem Update-Typ | ||||
|             if (isSpiffsUpdate) { | ||||
|                 // SPIFFS: 5-75% für Upload | ||||
|                 currentProgress = 5 + (updateWritten * 100) / updateTotalSize; | ||||
|             } else { | ||||
|                 // Firmware: 0-100% für Upload | ||||
|                 currentProgress = 1 + (updateWritten * 100) / updateTotalSize; | ||||
|             } | ||||
|              | ||||
|             static int lastProgress = -1; | ||||
|             if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) { | ||||
|                 sendUpdateProgress(currentProgress, "uploading"); | ||||
|                 oledShowMessage("Update: " + String(currentProgress) + "%"); | ||||
|                 delay(50); | ||||
|                 lastProgress = currentProgress; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (final) { | ||||
|             if (Update.end(true)) { | ||||
|                 if (isSpiffsUpdate) { | ||||
|                     restoreJsonConfigs(); | ||||
|                 } | ||||
|             } else { | ||||
|                 request->send(400, "application/json", "{\"success\":false,\"message\":\"Update finalization failed\"}"); | ||||
|             } | ||||
|         } | ||||
|     }); | ||||
|  | ||||
|     updateHandler->onRequest([](AsyncWebServerRequest *request) { | ||||
|         if (Update.hasError()) { | ||||
|             request->send(400, "application/json", "{\"success\":false,\"message\":\"Update failed\"}"); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         // Erste 100% Nachricht | ||||
|         ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         delay(2000);  // Längerer Delay für die erste Nachricht | ||||
|          | ||||
|         AsyncWebServerResponse *response = request->beginResponse(200, "application/json",  | ||||
|             "{\"success\":true,\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         response->addHeader("Connection", "close"); | ||||
|         request->send(response); | ||||
|          | ||||
|         // Zweite 100% Nachricht zur Sicherheit | ||||
|         ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}"); | ||||
|         delay(3000);  // Noch längerer Delay vor dem Neustart | ||||
|          | ||||
|         ESP.restart(); | ||||
|     }); | ||||
|  | ||||
|     server.addHandler(updateHandler); | ||||
| } | ||||
|  | ||||
| void setupWebserver(AsyncWebServer &server) { | ||||
|     // Deaktiviere alle Debug-Ausgaben | ||||
|     Serial.setDebugOutput(false); | ||||
| @@ -326,7 +195,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für about | ||||
|     server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /about erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.html.gz", "text/html"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html.gz", "text/html"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -335,7 +204,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für Waage | ||||
|     server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /waage erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/waage.html.gz", "text/html"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -344,24 +213,13 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für RFID | ||||
|     server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /rfid erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/rfid.html.gz", "text/html"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/rfid.html.gz", "text/html"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
|         Serial.println("RFID-Seite gesendet"); | ||||
|     }); | ||||
|  | ||||
|     /* | ||||
|     // Neue API-Route für das Abrufen der Spool-Daten | ||||
|     server.on("/api/spools", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("API-Aufruf: /api/spools"); | ||||
|         JsonDocument spoolsData = fetchSpoolsForWebsite(); | ||||
|         String response; | ||||
|         serializeJson(spoolsData, response); | ||||
|         request->send(200, "application/json", response); | ||||
|     }); | ||||
|     */ | ||||
|  | ||||
|     server.on("/api/url", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("API-Aufruf: /api/url"); | ||||
|         String jsonResponse = "{\"spoolman_url\": \"" + String(spoolmanUrl) + "\"}"; | ||||
| @@ -371,7 +229,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für WiFi | ||||
|     server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /wifi erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/wifi.html.gz", "text/html"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html.gz", "text/html"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -384,10 +242,12 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|         html.replace("{{spoolmanUrl}}", spoolmanUrl); | ||||
|  | ||||
|         JsonDocument doc; | ||||
|         if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) { | ||||
|         if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>())  | ||||
|         { | ||||
|             String bambuIp = doc["bambu_ip"].as<String>(); | ||||
|             String bambuSerial = doc["bambu_serialnr"].as<String>(); | ||||
|             String bambuCode = doc["bambu_accesscode"].as<String>(); | ||||
|             autoSendToBambu = doc["autoSendToBambu"].as<bool>(); | ||||
|             bambuIp.trim(); | ||||
|             bambuSerial.trim(); | ||||
|             bambuCode.trim(); | ||||
| @@ -395,7 +255,17 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|             html.replace("{{bambuIp}}", bambuIp ? bambuIp : "");             | ||||
|             html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : ""); | ||||
|             html.replace("{{bambuCode}}", bambuCode ? bambuCode : ""); | ||||
|         }    | ||||
|             html.replace("{{autoSendToBambu}}", autoSendToBambu ? "checked" : ""); | ||||
|             html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter)); | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             html.replace("{{bambuIp}}", ""); | ||||
|             html.replace("{{bambuSerial}}", ""); | ||||
|             html.replace("{{bambuCode}}", ""); | ||||
|             html.replace("{{autoSendToBambu}}", ""); | ||||
|             html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter)); | ||||
|         } | ||||
|  | ||||
|         request->send(200, "text/html", html); | ||||
|     }); | ||||
| @@ -426,16 +296,20 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|         String bambu_ip = request->getParam("bambu_ip")->value(); | ||||
|         String bambu_serialnr = request->getParam("bambu_serialnr")->value(); | ||||
|         String bambu_accesscode = request->getParam("bambu_accesscode")->value(); | ||||
|         bool autoSend = (request->getParam("autoSend")->value() == "true") ? true : false; | ||||
|         String autoSendTime = request->getParam("autoSendTime")->value(); | ||||
|          | ||||
|         bambu_ip.trim(); | ||||
|         bambu_serialnr.trim(); | ||||
|         bambu_accesscode.trim(); | ||||
|         autoSendTime.trim(); | ||||
|  | ||||
|         if (bambu_ip.length() == 0 || bambu_serialnr.length() == 0 || bambu_accesscode.length() == 0) { | ||||
|             request->send(400, "application/json", "{\"success\": false, \"error\": \"Empty parameter\"}"); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode); | ||||
|         bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode, autoSend, autoSendTime); | ||||
|  | ||||
|         request->send(200, "application/json", "{\"healthy\": " + String(success ? "true" : "false") + "}"); | ||||
|     }); | ||||
| @@ -448,7 +322,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     // Route für das Laden der CSS-Datei | ||||
|     server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Lade style.css"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/style.css.gz", "text/css"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css.gz", "text/css"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -457,7 +331,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|     // Route für das Logo | ||||
|     server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/logo.png.gz", "image/png"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png.gz", "image/png"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -466,7 +340,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|     // Route für Favicon | ||||
|     server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/favicon.ico", "image/x-icon"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/favicon.ico", "image/x-icon"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
|         Serial.println("favicon.ico gesendet"); | ||||
| @@ -474,17 +348,26 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|     // Route für spool_in.png | ||||
|     server.on("/spool_in.png", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/spool_in.png.gz", "image/png"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/spool_in.png.gz", "image/png"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
|         Serial.println("spool_in.png gesendet"); | ||||
|     }); | ||||
|  | ||||
|     // Route für set_spoolman.png | ||||
|     server.on("/set_spoolman.png", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/set_spoolman.png.gz", "image/png"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
|         Serial.println("set_spoolman.png gesendet"); | ||||
|     }); | ||||
|  | ||||
|     // Route für JavaScript Dateien | ||||
|     server.on("/spoolman.js", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /spoolman.js erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/spoolman.js.gz", "text/javascript"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/spoolman.js.gz", "text/javascript"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -493,7 +376,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|     server.on("/rfid.js", HTTP_GET, [](AsyncWebServerRequest *request){ | ||||
|         Serial.println("Anfrage für /rfid.js erhalten"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS,"/rfid.js.gz", "text/javascript"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS,"/rfid.js.gz", "text/javascript"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", CACHE_CONTROL); | ||||
|         request->send(response); | ||||
| @@ -502,7 +385,7 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|  | ||||
|     // Vereinfachter Update-Handler | ||||
|     server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) { | ||||
|         AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/upgrade.html.gz", "text/html"); | ||||
|         AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html.gz", "text/html"); | ||||
|         response->addHeader("Content-Encoding", "gzip"); | ||||
|         response->addHeader("Cache-Control", "no-store"); | ||||
|         request->send(response); | ||||
| @@ -533,50 +416,3 @@ void setupWebserver(AsyncWebServer &server) { | ||||
|     server.begin(); | ||||
|     Serial.println("Webserver gestartet"); | ||||
| } | ||||
|  | ||||
|  | ||||
| void backupJsonConfigs() { | ||||
|     // Bambu Credentials backup | ||||
|     if (SPIFFS.exists("/bambu_credentials.json")) { | ||||
|         File file = SPIFFS.open("/bambu_credentials.json", "r"); | ||||
|         if (file) { | ||||
|             bambuCredentialsBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials backed up"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // Spoolman URL backup | ||||
|     if (SPIFFS.exists("/spoolman_url.json")) { | ||||
|         File file = SPIFFS.open("/spoolman_url.json", "r"); | ||||
|         if (file) { | ||||
|             spoolmanUrlBackup = file.readString(); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL backed up"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| void restoreJsonConfigs() { | ||||
|     // Restore Bambu credentials | ||||
|     if (bambuCredentialsBackup.length() > 0) { | ||||
|         File file = SPIFFS.open("/bambu_credentials.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(bambuCredentialsBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Bambu credentials restored"); | ||||
|         } | ||||
|         bambuCredentialsBackup = ""; // Clear backup | ||||
|     } | ||||
|  | ||||
|     // Restore Spoolman URL | ||||
|     if (spoolmanUrlBackup.length() > 0) { | ||||
|         File file = SPIFFS.open("/spoolman_url.json", "w"); | ||||
|         if (file) { | ||||
|             file.print(spoolmanUrlBackup); | ||||
|             file.close(); | ||||
|             Serial.println("Spoolman URL restored"); | ||||
|         } | ||||
|         spoolmanUrlBackup = ""; // Clear backup | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -19,7 +19,6 @@ extern AsyncWebSocket ws; | ||||
|  | ||||
| // Server-Initialisierung und Handler | ||||
| void initWebServer(); | ||||
| void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); | ||||
| void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total); | ||||
| void setupWebserver(AsyncWebServer &server); | ||||
|  | ||||
| @@ -29,8 +28,4 @@ void sendNfcData(AsyncWebSocketClient *client); | ||||
| void foundNfcTag(AsyncWebSocketClient *client, uint8_t success); | ||||
| void sendWriteResult(AsyncWebSocketClient *client, uint8_t success); | ||||
|  | ||||
| // Upgrade-Funktionen | ||||
| void backupJsonConfigs(); | ||||
| void restoreJsonConfigs(); | ||||
|  | ||||
| #endif | ||||
|   | ||||
							
								
								
									
										134
									
								
								src/wlan.cpp
									
									
									
									
									
								
							
							
						
						
									
										134
									
								
								src/wlan.cpp
									
									
									
									
									
								
							| @@ -3,16 +3,20 @@ | ||||
| #include <WiFi.h> | ||||
| #include <esp_wifi.h> | ||||
| #include <WiFiManager.h> | ||||
| #include <DNSServer.h> | ||||
| #include <ESPmDNS.h> | ||||
| #include "display.h" | ||||
| #include "config.h" | ||||
|  | ||||
| WiFiManager wm; | ||||
| bool wm_nonblocking = false; | ||||
| uint8_t wifiErrorCounter = 0; | ||||
|  | ||||
| void initWiFi() { | ||||
| void wifiSettings() { | ||||
|     // Optimierte WiFi-Einstellungen | ||||
|     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP | ||||
|     WiFi.setSleep(false); // disable sleep mode | ||||
|     WiFi.setHostname("FilaMan"); | ||||
|     esp_wifi_set_ps(WIFI_PS_NONE); | ||||
|      | ||||
|     // Maximale Sendeleistung | ||||
| @@ -23,33 +27,103 @@ void initWiFi() { | ||||
|      | ||||
|     // Aktiviere WiFi-Roaming für bessere Stabilität | ||||
|     esp_wifi_set_rssi_threshold(-80); | ||||
|    | ||||
|     if(wm_nonblocking) wm.setConfigPortalBlocking(false); | ||||
|     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen | ||||
|    | ||||
|     oledShowTopRow(); | ||||
|     oledShowMessage("WiFi Setup"); | ||||
|      | ||||
|     bool res; | ||||
|     // res = wm.autoConnect(); // auto generated AP name from chipid | ||||
|     res = wm.autoConnect("FilaMan"); // anonymous ap | ||||
|     // res = wm.autoConnect("spoolman","password"); // password protected ap | ||||
|    | ||||
|     if(!res) { | ||||
|       Serial.println("Failed to connect or hit timeout"); | ||||
|       // ESP.restart(); | ||||
|       oledShowTopRow(); | ||||
|       oledShowMessage("WiFi not connected Check Portal"); | ||||
|     }  | ||||
|     else { | ||||
|       wifiOn = true; | ||||
|    | ||||
|       //if you get here you have connected to the WiFi     | ||||
|       Serial.println("connected...yeey :)"); | ||||
|       Serial.print("IP address: "); | ||||
|       Serial.println(WiFi.localIP()); | ||||
|    | ||||
|       oledShowTopRow(); | ||||
|       display.display(); | ||||
| } | ||||
|  | ||||
| void startMDNS() { | ||||
|   if (!MDNS.begin("filaman")) { | ||||
|     Serial.println("Error setting up MDNS responder!"); | ||||
|     while(1) { | ||||
|       vTaskDelay(1000 / portTICK_PERIOD_MS); | ||||
|     } | ||||
|   } | ||||
|   } | ||||
|   Serial.println("mDNS responder started"); | ||||
| } | ||||
|  | ||||
| void configModeCallback (WiFiManager *myWiFiManager) { | ||||
|   Serial.println("Entered config mode"); | ||||
|   oledShowTopRow(); | ||||
|   oledShowMessage("WiFi Config Mode"); | ||||
| } | ||||
|  | ||||
| void initWiFi() { | ||||
|   // load Wifi settings | ||||
|   wifiSettings(); | ||||
|  | ||||
|   wm.setAPCallback(configModeCallback); | ||||
|  | ||||
|   wm.setSaveConfigCallback([]() { | ||||
|     Serial.println("Configurations updated"); | ||||
|     ESP.restart(); | ||||
|   }); | ||||
|  | ||||
|   if(wm_nonblocking) wm.setConfigPortalBlocking(false); | ||||
|   //wm.setConfigPortalTimeout(320); // Portal nach 5min schließen | ||||
|   wm.setWiFiAutoReconnect(true); | ||||
|   wm.setConnectTimeout(5); | ||||
|  | ||||
|   oledShowTopRow(); | ||||
|   oledShowMessage("WiFi Setup"); | ||||
|    | ||||
|   //bool res = wm.autoConnect("FilaMan"); // anonymous ap | ||||
|   if(!wm.autoConnect("FilaMan")) { | ||||
|     Serial.println("Failed to connect or hit timeout"); | ||||
|     // ESP.restart(); | ||||
|     oledShowTopRow(); | ||||
|     oledShowMessage("WiFi not connected Check Portal"); | ||||
|   }  | ||||
|   else { | ||||
|     wifiOn = true; | ||||
|  | ||||
|     //if you get here you have connected to the WiFi     | ||||
|     Serial.println("connected...yeey :)"); | ||||
|     Serial.print("IP address: "); | ||||
|     Serial.println(WiFi.localIP()); | ||||
|  | ||||
|     oledShowTopRow(); | ||||
|     display.display(); | ||||
|  | ||||
|     vTaskDelay(500 / portTICK_PERIOD_MS); | ||||
|  | ||||
|     // mDNS | ||||
|     startMDNS(); | ||||
|   } | ||||
| } | ||||
|  | ||||
| void checkWiFiConnection() { | ||||
|   if (WiFi.status() != WL_CONNECTED)  | ||||
|   { | ||||
|     Serial.println("WiFi connection lost. Reconnecting..."); | ||||
|     wifiOn = false; | ||||
|     oledShowTopRow(); | ||||
|     oledShowMessage("WiFi reconnecting"); | ||||
|     WiFi.reconnect(); // Versuche, die Verbindung wiederherzustellen | ||||
|     vTaskDelay(5000 / portTICK_PERIOD_MS); // Warte 5 Sekunden, bevor erneut geprüft wird | ||||
|     if (WiFi.status() != WL_CONNECTED)  | ||||
|     { | ||||
|       Serial.println("Failed to reconnect. Restarting WiFi..."); | ||||
|       WiFi.disconnect(); | ||||
|       Serial.println("WiFi disconnected."); | ||||
|       vTaskDelay(1000 / portTICK_PERIOD_MS); | ||||
|       wifiErrorCounter++; | ||||
|  | ||||
|       //wifiSettings(); | ||||
|       WiFi.reconnect(); | ||||
|       Serial.println("WiFi reconnecting..."); | ||||
|       WiFi.waitForConnectResult(); | ||||
|     }  | ||||
|     else  | ||||
|     { | ||||
|       Serial.println("WiFi reconnected."); | ||||
|       wifiErrorCounter = 0; | ||||
|       wifiOn = true; | ||||
|       oledShowTopRow(); | ||||
|       startMDNS(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   if (wifiErrorCounter >= 5)  | ||||
|   { | ||||
|     Serial.println("Too many WiFi errors. Restarting..."); | ||||
|     ESP.restart(); | ||||
|   } | ||||
| } | ||||
| @@ -4,5 +4,6 @@ | ||||
| #include <Arduino.h> | ||||
|  | ||||
| void initWiFi(); | ||||
| void checkWiFiConnection(); | ||||
|  | ||||
| #endif | ||||
		Reference in New Issue
	
	Block a user