- RFID-Reader-Task optimized

-RFID SPI Pins angepasst
- NFC-Tag verbessert
2026-07-09 18:02:48 +02:00 · 2025-03-18 11:54:56 +01:00 · 2025-03-18 11:36:10 +01:00 · 2025-03-17 11:19:28 +01:00 · 2025-03-17 09:31:26 +01:00 · 2025-03-16 19:40:05 +01:00
51 changed files with 49655 additions and 711 deletions
@@ -41,16 +41,16 @@ jobs:
      run: |
        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
        
-        # Build firmware and SPIFFS
-        echo "Building firmware and SPIFFS..."
+        # Build firmware and LittleFS
+        echo "Building firmware and LittleFS..."
        pio run -e esp32dev
        pio run -t buildfs
        
        # Copy firmware binary
        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
        
-        # Create SPIFFS binary - direct copy without header
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create LittleFS binary - direct copy without header
+        cp .pio/build/esp32dev/littlefs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
        
        # Create full binary
        (cd .pio/build/esp32dev && 
@@ -63,7 +63,7 @@ jobs:
          0x1000 bootloader.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin)
+          0x3D0000 littlefs.bin)
        
        # Verify file sizes
        echo "File sizes:"
@@ -39,16 +39,16 @@ jobs:
      run: |
        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
        
-        # Always build firmware and SPIFFS
-        echo "Building firmware and SPIFFS..."
+        # Always build firmware and LittleFS
+        echo "Building firmware and LittleFS..."
        pio run -e esp32dev
        pio run -t buildfs
        
        # Copy firmware binary
        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
        
-        # Create SPIFFS binary - direct copy without header
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create LittleFS binary - direct copy without header
+        cp .pio/build/esp32dev/littlefs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
        
        # Create full binary (always)
        (cd .pio/build/esp32dev && 
@@ -61,7 +61,7 @@ jobs:
          0x1000 bootloader.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin)
+          0x3D0000 littlefs.bin)
        
        # Verify file sizes
        echo "File sizes:"
@@ -131,7 +131,7 @@ jobs:
          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
        fi
        
-        # Add SPIFFS and full binary only if they exist
+        # Add LittleFS and full binary only if they exist
        if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
        fi
@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
@@ -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"
-    }
-}
@@ -1,5 +1,106 @@
 # Changelog

+## [1.4.1] - 2025-03-10
+### Added
+- added new .step, now with correct individual parts
+- added changelog
+- Add files via upload
+- added .stp files of modifications
+- added merged picture
+- added pictures of components bought from AliE
+- Add files via upload
+- added pictures for heat insert location
+- added pictures showing heat insert location
+- remove unnecessary delay in MQTT setup and add delay before restart
+- add new 3D print file for Filaman scale
+- added Discord Server
+
+### Changed
+- update platformio.ini for version v1.4.1
+- refactor length calculation to convert total length to meters before formatting
+- Merge pull request #16 from spitzbirne32/main
+- improved housing to show display better
+- removed CAD, as they were all duplicates
+- typo in AliE link
+- Delete usermod/spitzbirne32/STL/README.md
+- Update README.md
+- moved pictures of parts into dedicated folders
+- Update README.md
+- Update README.md
+- Update README.md
+- Delete usermod/spitzbirne32/STL/ScaleTop_Heatinsert_Location_usermod_spitzbirne32_.png
+- Delete usermod/spitzbirne32/STL/Housing_Heatinsert_Location_usermod_spitzbirne32_.png
+- created folders
+- Update README.md
+- Update README.md
+- Create README.md
+- Update README.md
+- Update README.md
+- Create README.md
+- Merge pull request #15 from ManuelW77/main
+- Merge pull request #14 from janecker/scale-calibration-rework
+- Reworks the scale calibration handling
+- remove redundant scale calibration checks and enhance task management
+- enhance AMS data handling and streamline spool auto-setting logic
+- adjust stack size and improve scale calibration logic
+- update labels and input types for better clarity and functionality
+- update documentation for clarity and accuracy
+
+### Fixed
+- correct typo in console log for total length
+
+
+## [1.4.0] - 2025-03-01
+### Added
+- add support for Spoolman Octoprint Plugin in README files
+- add OctoPrint integration with configurable fields and update functionality
+- add version comparison function and check for outdated versions before updates
+- remove unused version and protocol fields from JSON output; add error message for insufficient memory
+
+### Changed
+- update NFC tag references to include NTAG213 and clarify storage capacity
+- bump version to 1.4.0
+- remove unused version and protocol fields from NFC data packet
+- sort vendors alphabetically in the dropdown list
+- Merge pull request #10 from janecker/nfc-improvements
+- Improves NFC Tag handling
+
+
+## [1.3.99] - 2025-02-28
+### Changed
+- update platformio.ini for version v1.3.99
+- update workflows to build firmware with LittleFS instead of SPIFFS
+
+
+## [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
@@ -1,30 +1,32 @@
 # FilaMan - Filament Management System

 FilaMan ist ein Filament-Managementsystem für den 3D-Druck. Es verwendet ESP32-Hardware für Gewichtsmessungen und NFC-Tag-Management. 
-Benutzer können Filamentspulen verwalten, den Status des Automatic Material System (AMS) von Bablulab Druckern überwachen und Einstellungen über eine Weboberfläche vornehmen. 
-Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/Spoolman) Filamentverwaltung, zusätzlich mit [Bambulab](https://bambulab.com/en-us) 3D-Druckern und sowie dem [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG Format.
+Benutzer können Filamentspulen verwalten, den Status des Automatic Material System (AMS) von Bambu Lab Druckern überwachen und Einstellungen über eine Weboberfläche vornehmen. 
+Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/Spoolman) Filamentverwaltung, zusätzlich mit [Bambu Lab](https://bambulab.com/en-us) 3D-Druckern.

 ![Scale](./img/scale_trans.png)

-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)
+Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)  
+Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
+
+### 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.
- **OLED-Display:** Zeigt aktuelles Gewicht, Verbindungsstatus (WiFi, Bambu Lab, Spoolman).
+- **OLED-Display:** Zeigt aktuelles Gewicht, Verbindungsstatus (WiFi, BambuLab, Spoolman).
 - **WLAN-Konnektivität:** WiFiManager für einfache Netzwerkkonfiguration.
 - **MQTT-Integration:** Verbindet sich mit Bambu Lab Drucker für AMS-Steuerung.
- **NFC-Tag NTAG215:** Verwendung von NTAG215 wegen ausreichendem Speicherplatz auf dem Tag
+- **NFC-Tag NTAG213 NTAG215:** Verwendung von NTAG213 (144 Bytes - Kapazität), besser NTAG215 (540 Bytes - Kapazität) wegen ausreichendem Speicherplatz auf dem Tag

 ### Weboberflächen-Funktionen
 - **Echtzeit-Updates:** WebSocket-Verbindung für Live-Daten-Updates.
 - **NFC-Tag-Verwaltung:** 
    - Filamentdaten auf NFC-Tags schreiben.
-    - Verwendet das NFC-Tag-Format von [Openspool](https://github.com/spuder/OpenSpool)
-    - Ermöglicht automatische Spulenerkennung im AMS
- **Bambulab AMS-Integration:** 
+    - Ermöglicht automatische Spulenerkennung im AMS.
+- **Bambu Lab AMS-Integration:** 
  - Anzeige der aktuellen AMS-Fachbelegung.
  - Zuordnung von Filamenten zu AMS-Slots.
  - Unterstützung für externe Spulenhalter.
@@ -33,6 +35,7 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
  - Filtern und Auswählen von Filamenten.
  - Automatische Aktualisierung der Spulengewichte.
  - Verfolgung von NFC-Tag-Zuweisungen.
+  - Unterstützt das Spoolman Octoprint Plugin.

 ### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
 <a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
@@ -59,7 +62,7 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 [Amazon Link](https://amzn.eu/d/0AuBp2c)
 - **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
 [Amazon Link](https://amzn.eu/d/jfIuQXb)
- **NFC Tags Ntag215:** RFID Tag
+- **NFC Tags NTAG213 NTA215:** RFID Tag
 [Amazon Link](https://amzn.eu/d/9Z6mXc1)

 ### Pin-Konfiguration
@@ -118,7 +121,7 @@ Du musst Spoolman auf DEBUG Modus setzten, da man bisher in Spoolman keine CORS
 ```

 ## Schritt-für-Schritt Installation
-### Einfache Installation
+### Einfache Installation (Google Chrome oder Microsoft Edge)
 1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**

 2. **Stecke dein ESP an den Rechner und klicke Connect**
@@ -181,4 +184,4 @@ Dieses Projekt ist unter der MIT-Lizenz lizenziert. Siehe [LICENSE](LICENSE) Dat
 Der Code kann getestet und die Anwendung kann vom [GitHub Repository](https://github.com/ManuelW77/Filaman) heruntergeladen werden.

 ### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
-<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
@@ -4,14 +4,18 @@

 FilaMan is a filament management system for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management. 
 Users can manage filament spools, monitor the status of the Automatic Material System (AMS) and make settings via a web interface. 
-The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D printers and [Spoolman](https://github.com/Donkie/Spoolman) filament management as well as the [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG format.
+The system integrates seamlessly with [Bambu Lab](https://bambulab.com/en-us) 3D printers and [Spoolman](https://github.com/Donkie/Spoolman) filament management.
+

 ![Scale](./img/scale_trans.png)


 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)
+or my website: [FilaMan Website](https://www.filaman.app)  
+german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)  
+Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
+
+### 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.
@@ -19,13 +23,12 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 - **OLED Display:** Shows current weight, connection status (WiFi, Bambu Lab, Spoolman).
 - **WiFi Connectivity:** WiFiManager for easy network configuration.
 - **MQTT Integration:** Connects to Bambu Lab printer for AMS control.
- **NFC-Tag NTAG215:** Use NTAG215 because of enaught space on the Tag
+- **NFC-Tag NTAG213 NTAG215:** Use NTAG213 (Capacity of 144 bytes), better NTAG215 (Capacity of 540 bytes) because of enaught space on the Tag.

 ### Web Interface Features
 - **Real-time Updates:** WebSocket connection for live data updates.
 - **NFC Tag Management:** 
 	- Write filament data to NFC tags.
-	- uses NFC-Tag Format of [Openspool](https://github.com/spuder/OpenSpool)
 	- so you can use it with automatic Spool detection in AMS
 - **Bambulab AMS Integration:** 
  - Display current AMS tray contents.
@@ -36,6 +39,7 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
  - Filter and select filaments.
  - Update spool weights automatically.
  - Track NFC tag assignments.
+  - Supports Spoolman Octoprint Plugin.

 ### If you want to support my work, i would be happy to get a coffe
 <a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
@@ -62,7 +66,7 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 [Amazon Link](https://amzn.eu/d/0AuBp2c)
 - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
 [Amazon Link](https://amzn.eu/d/jfIuQXb)
- **NFC Tags Ntag215:** RFID Tag
+- **NFC Tags NTAG213 NTAG215:** RFID Tag
 [Amazon Link](https://amzn.eu/d/9Z6mXc1)


@@ -123,7 +127,7 @@ You have to activate Spoolman in debug mode, because you are not able to set COR


 ## Step-by-Step Installation
-### Easy Installation
+### Easy Installation (Google Chrome or Microsoft Edge)
 1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**

 2. **Plug you device in and push Connect button**
@@ -186,4 +190,4 @@ This project is licensed under the MIT License. See the [LICENSE](LICENSE) file
 The code can be tested and the application can be downloaded from the [GitHub repository](https://github.com/ManuelW77/Filaman).

 ### If you want to support my work, i would be happy to get a coffe
-<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
+<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
@@ -11,7 +11,7 @@ let reconnectTimer = null;
 // WebSocket Funktionen
 function startHeartbeat() {
    if (heartbeatTimer) clearInterval(heartbeatTimer);
-    
+
    heartbeatTimer = setInterval(() => {
        // Prüfe ob zu lange keine Antwort kam
        if (Date.now() - lastHeartbeatResponse > HEARTBEAT_TIMEOUT) {
@@ -29,7 +29,7 @@ function startHeartbeat() {
            updateConnectionStatus();
            return;
        }
-        
+
        try {
            // Sende Heartbeat
            socket.send(JSON.stringify({ type: 'heartbeat' }));
@@ -59,18 +59,18 @@ function initWebSocket() {

    try {
        socket = new WebSocket('ws://' + window.location.host + '/ws');
-        
-        socket.onopen = function() {
+
+        socket.onopen = function () {
            isConnected = true;
            updateConnectionStatus();
            startHeartbeat(); // Starte Heartbeat nach erfolgreicher Verbindung
        };
-        
-        socket.onclose = function() {
+
+        socket.onclose = function () {
            isConnected = false;
            updateConnectionStatus();
            if (heartbeatTimer) clearInterval(heartbeatTimer);
-            
+
            // Nur neue Verbindung versuchen, wenn kein Timer läuft
            if (!reconnectTimer) {
                reconnectTimer = setTimeout(() => {
@@ -78,22 +78,22 @@ function initWebSocket() {
                }, RECONNECT_INTERVAL);
            }
        };
-        
-        socket.onerror = function(error) {
+
+        socket.onerror = function (error) {
            isConnected = false;
            updateConnectionStatus();
            if (heartbeatTimer) clearInterval(heartbeatTimer);
-            
+
            // Bei Fehler Verbindung schließen und neu aufbauen
            if (socket) {
                socket.close();
                socket = null;
            }
        };
-        
-        socket.onmessage = function(event) {
+
+        socket.onmessage = function (event) {
            lastHeartbeatResponse = Date.now(); // Aktualisiere Zeitstempel bei jeder Server-Antwort
-            
+
            const data = JSON.parse(event.data);
            if (data.type === 'amsData') {
                displayAmsData(data.payload);
@@ -109,13 +109,13 @@ function initWebSocket() {
                const bambuDot = document.getElementById('bambuDot');
                const spoolmanDot = document.getElementById('spoolmanDot');
                const ramStatus = document.getElementById('ramStatus');
-                
+
                if (bambuDot) {
                    bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
                    // Add click handler only when offline
                    if (!data.bambu_connected) {
                        bambuDot.style.cursor = 'pointer';
-                        bambuDot.onclick = function() {
+                        bambuDot.onclick = function () {
                            if (socket && socket.readyState === WebSocket.OPEN) {
                                socket.send(JSON.stringify({
                                    type: 'reconnect',
@@ -133,7 +133,7 @@ function initWebSocket() {
                    // Add click handler only when offline
                    if (!data.spoolman_connected) {
                        spoolmanDot.style.cursor = 'pointer';
-                        spoolmanDot.onclick = function() {
+                        spoolmanDot.onclick = function () {
                            if (socket && socket.readyState === WebSocket.OPEN) {
                                socket.send(JSON.stringify({
                                    type: 'reconnect',
@@ -161,7 +161,7 @@ function initWebSocket() {
    } catch (error) {
        isConnected = false;
        updateConnectionStatus();
-        
+
        // Nur neue Verbindung versuchen, wenn kein Timer läuft
        if (!reconnectTimer) {
            reconnectTimer = setTimeout(() => {
@@ -189,26 +189,26 @@ function updateConnectionStatus() {
 }

 // Event Listeners
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
    initWebSocket();
-    
+
    // Event Listener für Checkbox
-    document.getElementById("onlyWithoutSmId").addEventListener("change", function() {
+    document.getElementById("onlyWithoutSmId").addEventListener("change", function () {
        const spoolsData = window.getSpoolData();
        window.populateVendorDropdown(spoolsData);
    });
 });

 // Event Listener für Spoolman Events
-document.addEventListener('spoolDataLoaded', function(event) {
+document.addEventListener('spoolDataLoaded', function (event) {
    window.populateVendorDropdown(event.detail);
 });

-document.addEventListener('spoolmanError', function(event) {
+document.addEventListener('spoolmanError', function (event) {
    showNotification(`Spoolman Error: ${event.detail.message}`, false);
 });

-document.addEventListener('filamentSelected', function(event) {
+document.addEventListener('filamentSelected', function (event) {
    updateNfcInfo();
    // Zeige Spool-Buttons wenn ein Filament ausgewählt wurde
    const selectedText = document.getElementById("selected-filament").textContent;
@@ -218,13 +218,13 @@ document.addEventListener('filamentSelected', function(event) {
 // Hilfsfunktion für kontrastreiche Textfarbe
 function getContrastColor(hexcolor) {
    // Konvertiere Hex zu RGB
-    const r = parseInt(hexcolor.substr(0,2),16);
-    const g = parseInt(hexcolor.substr(2,2),16);
-    const b = parseInt(hexcolor.substr(4,2),16);
-    
+    const r = parseInt(hexcolor.substr(0, 2), 16);
+    const g = parseInt(hexcolor.substr(2, 2), 16);
+    const b = parseInt(hexcolor.substr(4, 2), 16);
+
    // Berechne Helligkeit (YIQ Formel)
-    const yiq = ((r*299)+(g*587)+(b*114))/1000;
-    
+    const yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
+
    // Return schwarz oder weiß basierend auf Helligkeit
    return (yiq >= 128) ? '#000000' : '#FFFFFF';
 }
@@ -242,7 +242,7 @@ function updateNfcInfo() {
    }

    // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool => 
+    const selectedSpool = spoolsData.find(spool =>
        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
    );

@@ -255,18 +255,18 @@ function updateNfcInfo() {

 function displayAmsData(amsData) {
    const amsDataContainer = document.getElementById('amsData');
-    amsDataContainer.innerHTML = ''; 
+    amsDataContainer.innerHTML = '';

    amsData.forEach((ams) => {
        // Bestimme den Anzeigenamen für das AMS
        const amsDisplayName = ams.ams_id === 255 ? 'External Spool' : `AMS ${ams.ams_id}`;
-        
+
        const trayHTML = ams.tray.map(tray => {
            // Prüfe ob überhaupt Daten vorhanden sind
            const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id', 'cali_idx'];
-            const hasAnyContent = relevantFields.some(field => 
-                tray[field] !== null && 
-                tray[field] !== undefined && 
+            const hasAnyContent = relevantFields.some(field =>
+                tray[field] !== null &&
+                tray[field] !== undefined &&
                tray[field] !== '' &&
                tray[field] !== 'null'
            );
@@ -282,8 +282,8 @@ function displayAmsData(amsData) {
                               cursor: pointer; display: none;">
                    <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px;">
                </button>`;
-            
-                        // Nur für nicht-leere Trays den Button-HTML erstellen
+
+            // Nur für nicht-leere Trays den Button-HTML erstellen
            const outButtonHtml = `
                <button class="spool-button" onclick="handleSpoolOut()" 
                        style="position: absolute; top: -35px; right: -15px; 
@@ -313,7 +313,7 @@ function displayAmsData(amsData) {
            }

            // Generiere den Type mit Color-Box zusammen
-            const typeWithColor = tray.tray_type ? 
+            const typeWithColor = tray.tray_type ?
                `<p>Typ: ${tray.tray_type} ${tray.tray_color ? `<span style="
                    background-color: #${tray.tray_color}; 
                    width: 20px; 
@@ -334,9 +334,9 @@ function displayAmsData(amsData) {

            // Nur gültige Felder anzeigen
            const trayDetails = trayProperties
-                .filter(prop => 
-                    tray[prop.key] !== null && 
-                    tray[prop.key] !== undefined && 
+                .filter(prop =>
+                    tray[prop.key] !== null &&
+                    tray[prop.key] !== undefined &&
                    tray[prop.key] !== '' &&
                    tray[prop.key] !== 'null'
                )
@@ -350,7 +350,7 @@ function displayAmsData(amsData) {
                .join('');

            // Temperaturen nur anzeigen, wenn beide nicht 0 sind
-            const tempHTML = (tray.nozzle_temp_min > 0 && tray.nozzle_temp_max > 0) 
+            const tempHTML = (tray.nozzle_temp_min > 0 && tray.nozzle_temp_max > 0)
                ? `<p>Nozzle Temp: ${tray.nozzle_temp_min}°C - ${tray.nozzle_temp_max}°C</p>`
                : '';

@@ -376,7 +376,7 @@ function displayAmsData(amsData) {
                    ${trayHTML}
                </div>
            </div>`;
-        
+
        amsDataContainer.innerHTML += amsInfo;
    });
 }
@@ -394,7 +394,7 @@ function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp
    const selectedText = document.getElementById("selected-filament").textContent;

    // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool => 
+    const selectedSpool = spoolsData.find(spool =>
        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
    );

@@ -460,7 +460,7 @@ function handleSpoolIn(amsId, trayId) {
    }

    // Finde die ausgewählte Spule in den Daten
-    const selectedSpool = spoolsData.find(spool => 
+    const selectedSpool = spoolsData.find(spool =>
        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
    );

@@ -473,7 +473,7 @@ function handleSpoolIn(amsId, trayId) {
    let minTemp = "175";
    let maxTemp = "275";

-    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) &&
        selectedSpool.filament.nozzle_temperature.length >= 2) {
        minTemp = selectedSpool.filament.nozzle_temperature[0];
        maxTemp = selectedSpool.filament.nozzle_temperature[1];
@@ -490,7 +490,7 @@ function handleSpoolIn(amsId, trayId) {
            nozzle_temp_max: parseInt(maxTemp),
            type: selectedSpool.filament.material,
            brand: selectedSpool.filament.vendor.name,
-            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
+            tray_info_idx: selectedSpool.filament.extra.bambu_idx?.replace(/['"]+/g, '').trim() || '',
            cali_idx: "-1"  // Default-Wert setzen
        }
    };
@@ -518,7 +518,7 @@ function handleSpoolIn(amsId, trayId) {

 function updateNfcStatusIndicator(data) {
    const indicator = document.getElementById('nfcStatusIndicator');
-    
+
    if (data.found === 0) {
        // Kein NFC Tag gefunden
        indicator.className = 'status-circle';
@@ -534,7 +534,7 @@ function updateNfcStatusIndicator(data) {
 function updateNfcData(data) {
    // Den Container für den NFC Status finden
    const nfcStatusContainer = document.querySelector('.nfc-status-display');
-    
+
    // Bestehende Daten-Anzeige entfernen falls vorhanden
    const existingData = nfcStatusContainer.querySelector('.nfc-data');
    if (existingData) {
@@ -593,7 +593,7 @@ function updateNfcData(data) {
        if (matchingSpool) {
            // Zuerst Hersteller-Dropdown aktualisieren
            document.getElementById("vendorSelect").value = matchingSpool.filament.vendor.id;
-            
+
            // Dann Filament-Dropdown aktualisieren und Spule auswählen
            updateFilamentDropdown();
            setTimeout(() => {
@@ -606,7 +606,7 @@ function updateNfcData(data) {
    html += '</div>';
    nfcDataDiv.innerHTML = html;

-    
+
    // Neues div zum Container hinzufügen
    nfcStatusContainer.appendChild(nfcDataDiv);
 }
@@ -619,7 +619,7 @@ function writeNfcTag() {
    }

    const spoolsData = window.getSpoolData();
-    const selectedSpool = spoolsData.find(spool => 
+    const selectedSpool = spoolsData.find(spool =>
        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
    );

@@ -631,8 +631,8 @@ function writeNfcTag() {
    // Temperaturwerte korrekt extrahieren
    let minTemp = "175";
    let maxTemp = "275";
-    
-    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
+
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) &&
        selectedSpool.filament.nozzle_temperature.length >= 2) {
        minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
        maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
@@ -640,8 +640,6 @@ function writeNfcTag() {

    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
    const nfcData = {
-        version: "2.0",
-        protocol: "openspool",
        color_hex: selectedSpool.filament.color_hex || "FFFFFF",
        type: selectedSpool.filament.material,
        min_temp: minTemp,
@@ -688,4 +686,4 @@ function showNotification(message, isSuccess) {
            notification.remove();
        }, 300);
    }, 3000);
-}
+}
@@ -52,11 +52,18 @@
            if (spoolmanUrl && spoolmanUrl.trim() !== "") {
                document.getElementById('spoolmanUrl').value = spoolmanUrl;
            }
+            
+            // Initialize OctoPrint fields visibility
+            toggleOctoFields();
        };

        function checkSpoolmanInstance() {
            const url = document.getElementById('spoolmanUrl').value;
-            fetch(`/api/checkSpoolman?url=${encodeURIComponent(url)}`)
+            const spoolmanOctoEnabled = document.getElementById('spoolmanOctoEnabled').checked;
+            const spoolmanOctoUrl = document.getElementById('spoolmanOctoUrl').value;
+            const spoolmanOctoToken = document.getElementById('spoolmanOctoToken').value;
+            
+            fetch(`/api/checkSpoolman?url=${encodeURIComponent(url)}&octoEnabled=${spoolmanOctoEnabled}&octoUrl=${spoolmanOctoUrl}&octoToken=${spoolmanOctoToken}`)
                .then(response => response.json())
                .then(data => {
                    if (data.healthy) {
@@ -90,6 +97,15 @@
                    document.getElementById('bambuStatusMessage').innerText = 'Error while saving: ' + error.message;
                });
        }
+
+        /**
+         * Controls visibility of OctoPrint configuration fields based on checkbox state
+         * Called on page load and when checkbox changes
+         */
+        function toggleOctoFields() {
+            const octoEnabled = document.getElementById('spoolmanOctoEnabled').checked;
+            document.getElementById('octoFields').style.display = octoEnabled ? 'block' : 'none';
+        }
    </script>
    <script>
        var spoolmanUrl = "{{spoolmanUrl}}";
@@ -102,6 +118,17 @@
            <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">
+                <h5 class="card-title">If you want to enable sending Spool to Spoolman Octoprint Plugin:</h5>
+                <p>
+                    <input type="checkbox" id="spoolmanOctoEnabled" {{spoolmanOctoEnabled}} onchange="toggleOctoFields()"> Send to Octo-Plugin
+                </p>
+                <div id="octoFields" style="display: none;">
+                    <p>
+                        <input type="text" id="spoolmanOctoUrl" placeholder="http://ip-or-url-of-your-octoprint-instanz:port" value="{{spoolmanOctoUrl}}">
+                        <input type="text" id="spoolmanOctoToken" placeholder="Your Octoprint Token" value="{{spoolmanOctoToken}}">
+                    </p>
+                </div>
+                
                <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
                <p id="statusMessage"></p>
            </div>
@@ -127,11 +154,11 @@
                    <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>
+                        <label for="autoSendTime" style="width: 250px; margin-right: 5px;">Wait for Spool in Sec:</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;">
+                        <input type="number" min="60" id="autoSendTime" placeholder="Time to wait" value="{{autoSendTime}}" style="width: 100px;">
                    </div>

                    <button style="margin: 0;" onclick="saveBambuCredentials()">Save Bambu Credentials</button>
@@ -86,10 +86,10 @@ function populateVendorDropdown(data, selectedSmId = null) {
    });

    // Nach der Schleife: Formatierung der Gesamtlänge
-    console.log("Total Lenght: ", totalLength);
-    const formattedLength = totalLength > 1000 
-        ? (totalLength / 1000).toFixed(2) + " km" 
-        : totalLength.toFixed(2) + " m";
+    const lengthInM = totalLength / 1000;  // erst in m umrechnen
+    const formattedLength = lengthInM > 1000 
+        ? (lengthInM / 1000).toFixed(2) + " km" 
+        : lengthInM.toFixed(2) + " m";

    // Formatierung des Gesamtgewichts (von g zu kg zu t)
    const weightInKg = totalWeight / 1000;  // erst in kg umrechnen
@@ -97,13 +97,15 @@ function populateVendorDropdown(data, selectedSmId = null) {
        ? (weightInKg / 1000).toFixed(2) + " t" 
        : weightInKg.toFixed(2) + " kg";

-    // Dropdown mit gefilterten Herstellern befüllen
-    Object.entries(filteredVendors).forEach(([id, name]) => {
-        const option = document.createElement("option");
-        option.value = id;
-        option.textContent = name;
-        vendorSelect.appendChild(option);
-    });
+    // Dropdown mit gefilterten Herstellern befüllen - alphabetisch sortiert
+    Object.entries(filteredVendors)
+        .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB)) // Sort vendors alphabetically by name
+        .forEach(([id, name]) => {
+            const option = document.createElement("option");
+            option.value = id;
+            option.textContent = name;
+            vendorSelect.appendChild(option);
+        });

    document.getElementById("totalSpools").textContent = totalSpools;
    document.getElementById("spoolsWithoutTag").textContent = spoolsWithoutTag;
@@ -188,14 +188,18 @@ label {
    font-weight: bold; 
 }

-input[type="text"], input[type="submit"] { 
+input[type="text"], input[type="submit"], input[type="number"] { 
    padding: 10px; 
    border: 1px solid #ccc; 
    border-radius: 5px; 
    font-size: 16px; 
 }

-input[type="text"]:focus { 
+input[type="number"] { 
+    width: 108px !important; 
+}
+
+input[type="text"]:focus, input[type="number"]:focus { 
    border-color: #007bff; 
    outline: none; 
 }
@@ -1015,7 +1019,7 @@ input[type="submit"]:disabled,
    color: #000;
    vertical-align: middle;
    margin-left: 0.5rem;
-    text-shadow: 0 !important;
+    text-shadow: none !important;
 }

 .progress-container {
@@ -9,7 +9,9 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.3.96"
+version = "1.4.1"
+to_old_version = "1.4.0"
+
 ##
 [env:esp32dev]
 platform = espressif32
@@ -33,7 +35,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 +47,14 @@ build_flags =
    -Os
    -ffunction-sections
    -fdata-sections
-    -DNDEBUG
+    #-DNDEBUG
    -mtext-section-literals
    -DVERSION=\"${common.version}\"
+    -DTOOLDVERSION=\"${common.to_old_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
@@ -5,38 +5,17 @@

 bool spoolman_connected = false;
 String spoolmanUrl = "";
+bool octoEnabled = false;
+String octoUrl = "";
+String octoToken = "";

 struct SendToApiParams {
    String httpType;
    String spoolsUrl;
    String updatePayload;
+    String octoToken;
 };

-/*
-    // 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 fetchSingleSpoolInfo(int spoolId) {
    HTTPClient http;
    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
@@ -112,14 +91,16 @@ void sendToApi(void *parameter) {
    String httpType = params->httpType;
    String spoolsUrl = params->spoolsUrl;
    String updatePayload = params->updatePayload;
-    
+    String octoToken = params->octoToken;    

    HTTPClient http;
    http.begin(spoolsUrl);
    http.addHeader("Content-Type", "application/json");
+    if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken);

    int httpCode = http.PUT(updatePayload);
    if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
+    if (httpType == "POST") httpCode = http.POST(updatePayload);

    if (httpCode == HTTP_CODE_OK) {
        Serial.println("Spoolman erfolgreich aktualisiert");
@@ -223,6 +204,43 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
    return 1;
 }

+bool updateSpoolOcto(int spoolId) {
+    String spoolsUrl = octoUrl + "/plugin/Spoolman/selectSpool";
+    Serial.print("Update Spule in Octoprint mit URL: ");
+    Serial.println(spoolsUrl);
+
+    JsonDocument updateDoc;
+    updateDoc["spool_id"] = spoolId;
+    updateDoc["tool"] = "tool0";
+
+    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 = "POST";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = updatePayload;
+    params->octoToken = octoToken;
+
+    // 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;
+}
+
 bool updateSpoolBambuData(String payload) {
    JsonDocument doc;
    DeserializationError error = deserializeJson(doc, payload);
@@ -410,12 +428,13 @@ bool checkSpoolmanExtraFields() {
                }
            }
        }
-        http.end();  
    }
    
    Serial.println("-------- ENDE Prüfe Felder --------");
    Serial.println();

+    http.end();
+
    return true;
 }

@@ -459,17 +478,24 @@ bool checkSpoolmanInstance(const String& url) {
    return false;
 }

-bool saveSpoolmanUrl(const String& url) {
+bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk) {
    if (!checkSpoolmanInstance(url)) return false;

    JsonDocument doc;
    doc["url"] = url;
-    Serial.print("Speichere URL in Datei: ");
-    Serial.println(url);
+    doc["octoEnabled"] = octoOn;
+    doc["octoUrl"] = octoWh;
+    doc["octoToken"] = octoTk;
+    Serial.print("Speichere Spoolman Data in Datei: ");
+    Serial.println(doc.as<String>());
    if (!saveJsonValue("/spoolman_url.json", doc)) {
        Serial.println("Fehler beim Speichern der Spoolman-URL.");
+        return false;
    }
    spoolmanUrl = url;
+    octoEnabled = octoOn;
+    octoUrl = octoWh;
+    octoToken = octoTk;

    return true;
 }
@@ -477,6 +503,13 @@ bool saveSpoolmanUrl(const String& url) {
 String loadSpoolmanUrl() {
    JsonDocument doc;
    if (loadJsonValue("/spoolman_url.json", doc) && doc["url"].is<String>()) {
+        octoEnabled = (doc["octoEnabled"].is<bool>()) ? doc["octoEnabled"].as<bool>() : false;
+        if (octoEnabled && doc["octoToken"].is<String>() && doc["octoUrl"].is<String>())
+        {
+            octoUrl = doc["octoUrl"].as<String>();
+            octoToken = doc["octoToken"].as<String>();
+        }
+
        return doc["url"].as<String>();
    }
    Serial.println("Keine gültige Spoolman-URL gefunden.");
@@ -9,9 +9,12 @@

 extern bool spoolman_connected;
 extern String spoolmanUrl;
+extern bool octoEnabled;
+extern String octoUrl;
+extern String octoToken;

 bool checkSpoolmanInstance(const String& url);
-bool saveSpoolmanUrl(const String& url);
+bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
 String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
 bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder
 JsonDocument fetchSingleSpoolInfo(int spoolId); // API-Funktion für die Webseite
@@ -19,5 +22,6 @@ bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion z
 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
+bool updateSpoolOcto(int spoolId); // Neue Funktion zum Aktualisieren der Octo-Daten

 #endif
@@ -18,11 +18,16 @@ PubSubClient client(sslClient);
 TaskHandle_t BambuMqttTask;

 String report_topic = "";
-//String request_topic = "";
+String request_topic = "";
 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;
@@ -69,6 +74,11 @@ bool loadBambuCredentials() {
        String ip = doc["bambu_ip"].as<String>();
        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>();

@@ -77,12 +87,12 @@ bool loadBambuCredentials() {
        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";
+        request_topic = "device/" + String(bambu_serialnr) + "/request";
        return true;
    }
    Serial.println("Keine gültigen Bambu-Credentials gefunden.");
@@ -112,6 +122,7 @@ FilamentResult findFilamentIdx(String brand, String type) {
        }
        doc.clear();
    }
+    doc.clear();

    // Laden der bambu_filaments.json
    if (!loadJsonValue("/bambu_filaments.json", doc)) 
@@ -185,19 +196,70 @@ FilamentResult findFilamentIdx(String brand, String type) {
    return {"GFL99", "PLA"};
 }

-bool sendMqttMessage(String payload) {
-    Serial.println("Sending MQTT message");
-    Serial.println(payload);
-    if (client.publish(report_topic.c_str(), payload.c_str())) 
-    {
-        return true;
+bool sendMqttMessage(const String& payload) {
+    // Check MQTT client state first
+    if (!client.connected()) {
+        Serial.println("Error: MQTT client not connected when trying to send message");
+        Serial.print("MQTT client state: ");
+        Serial.println(client.state());
+        return false;
    }
+
+    // Check if request_topic is empty
+    if (request_topic.isEmpty()) {
+        Serial.println("Error: request_topic is empty!");
+        return false;
+    }
+
+    // Check payload
+    if (payload.isEmpty()) {
+        Serial.println("Error: Empty payload!");
+        return false;
+    }
+
+    Serial.println("Attempting to send MQTT message:");
+    Serial.println("Topic: " + request_topic);
+    Serial.println("Payload: " + payload);
+    Serial.println("Payload length: " + String(payload.length()));
    
-    return false;
+    // Try to publish with QoS 1 and retain flag false
+    bool published = client.publish(request_topic.c_str(), payload.c_str(), false);
+    
+    if (published) {
+        Serial.println("MQTT message published successfully");
+        return true;
+    } else {
+        Serial.println("Failed to publish MQTT message");
+        Serial.print("MQTT client state after publish attempt: ");
+        Serial.println(client.state());
+        
+        // Additional error information
+        switch(client.state()) {
+            case -4:
+                Serial.println("Reason: Connection timeout");
+                break;
+            case -3:
+                Serial.println("Reason: Connection lost");
+                break;
+            case -2:
+                Serial.println("Reason: Connect failed");
+                break;
+            case -1:
+                Serial.println("Reason: Disconnected");
+                break;
+            case 0:
+                Serial.println("Reason: Connected but publish failed");
+                break;
+            default:
+                Serial.println("Reason: Unknown error");
+                break;
+        }
+        return false;
+    }
 }

 bool setBambuSpool(String payload) {
-    Serial.println("Spool settings in");
+    Serial.println("Spool settings received from WebSocket");
    Serial.println(payload);

    // Parse the JSON
@@ -209,21 +271,28 @@ bool setBambuSpool(String payload) {
        return false;
    }

-    int amsId = doc["amsId"];
-    int trayId = doc["trayId"];
+    // Check if we have all required fields
+    if (!doc["amsId"].is<int>() || !doc["trayId"].is<int>()) {
+        Serial.println("Error: Missing or invalid required fields in payload");
+        return false;
+    }
+
+    int amsId = doc["amsId"].as<int>();
+    int trayId = doc["trayId"].as<int>();
    String color = doc["color"].as<String>();
    color.toUpperCase();
-    int minTemp = doc["nozzle_temp_min"];
-    int maxTemp = doc["nozzle_temp_max"];
-    String type = doc["type"].as<String>();
+    int minTemp = doc["nozzle_temp_min"] | 0;  // Default to 0 if not present
+    int maxTemp = doc["nozzle_temp_max"] | 0;  // Default to 0 if not present
+    String type = doc["type"] | "";  // Default to empty string if not present
    (type == "PLA+") ? type = "PLA" : type;
-    String brand = doc["brand"].as<String>();
+    String brand = doc["brand"] | "";  // Default to empty string if not present
    String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
    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
+            Serial.println("Found filament idx: " + tray_info_idx + " for type: " + type);
        }
    }
    String setting_id = doc["bambu_setting_id"].as<String>();
@@ -231,6 +300,7 @@ bool setBambuSpool(String payload) {

    doc.clear();

+    // Create MQTT message
    doc["print"]["sequence_id"] = "0";
    doc["print"]["command"] = "ams_filament_setting";
    doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
@@ -239,26 +309,25 @@ 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"]["tray_info_idx"] = tray_info_idx;
    doc["print"]["setting_id"] = setting_id;
    
-    // Serialize the JSON
+    // Serialize and send MQTT message
    String output;
    serializeJson(doc, output);
+    Serial.println("Sending to Bambu printer:");
+    Serial.println(output);

-    if (sendMqttMessage(output)) {
-        Serial.println("Spool successfully set");
-    }
-    else
-    {
-        Serial.println("Failed to set spool");
+    if (!sendMqttMessage(output)) {
+        Serial.println("Failed to send filament settings to printer");
        return false;
    }
    
+    Serial.println("Filament settings sent successfully");
    doc.clear();
    yield();

+    // Send calibration if available
    if (cali_idx != "") {
        yield();
        doc["print"]["sequence_id"] = "0";
@@ -267,21 +336,18 @@ bool setBambuSpool(String payload) {
        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;

-        // Serialize the JSON
        String output;
        serializeJson(doc, output);
+        Serial.println("Sending calibration to printer:");
+        Serial.println(output);

-        if (sendMqttMessage(output)) {
-            Serial.println("Extrusion calibration successfully set");
-        }
-        else
-        {
-            Serial.println("Failed to set extrusion calibration");
+        if (!sendMqttMessage(output)) {
+            Serial.println("Failed to send calibration settings to printer");
            return false;
        }

+        Serial.println("Calibration settings sent successfully");
        doc.clear();
        yield();
    }
@@ -303,16 +369,102 @@ void autoSetSpool(int spoolId, uint8_t trayId) {
        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>();
+            if (trayObj["tray_type"].as<String>() == "") ams_data[i].trays[j].setting_id = "";
+            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
+        {
+            ams_data[extIdx].trays[0].setting_id = "";
+            ams_data[extIdx].trays[0].cali_idx = "";
+        }
+        ams_count++;  // Erhöhe ams_count für die externe Spule
+    }
+
+    // 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];
    }
@@ -320,6 +472,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
    // JSON-Dokument parsen
    JsonDocument doc;
    DeserializationError error = deserializeJson(doc, message);
+    message = "";
    if (error) 
    {
        Serial.print("Fehler beim Parsen des JSON: ");
@@ -327,16 +480,8 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        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<JsonObject>()) 
+    if (doc["print"]["upgrade_state"].is<JsonObject>() || (doc["print"]["command"].is<String>() && doc["print"]["command"] == "push_status")) 
    {
        // Prüfen ob AMS-Daten vorhanden sind
        if (!doc["print"]["ams"].is<JsonObject>() || !doc["print"]["ams"]["ams"].is<JsonArray>()) 
@@ -345,7 +490,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
        }

        JsonArray amsArray = doc["print"]["ams"]["ams"].as<JsonArray>();
-        
+
        // Prüfe ob sich die AMS-Daten geändert haben
        bool hasChanges = false;
        
@@ -372,161 +517,79 @@ 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;
+
+                    if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
+                    {
+                        autoSetSpool(autoSetToBambuSpoolId, ams_data[storedIndex].trays[j].id);
+                    }
+
                    break;
                }
            }
        }

        // Prüfe die externe Spule
-        if (!hasChanges && doc["print"]["vt_tray"].is<JsonObject>()) {
-            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["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;
+
+                        if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
+                        {
+                            autoSetSpool(autoSetToBambuSpoolId, 254);
+                        }
                    }
                    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<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
-            {
-                ams_data[extIdx].trays[0].setting_id = "";
-                ams_data[extIdx].trays[0].cali_idx = "";
-            }
-            ams_count++;  // Erhöhe ams_count für die externe Spule
-        }
-
-        // 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);
-        Serial.println("AMS data updated");
-        sendAmsData(nullptr);
+        updateAmsWsData(doc, amsArray, ams_count, vtTray);
    }
    
    // Neue Bedingung für 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);
@@ -538,45 +601,96 @@ 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.println("Attempting MQTT connection...");
+        Serial.println("Attempting MQTT re/connection...");
+        Serial.print("State before connect: ");
+        Serial.println(client.state());
        bambu_connected = false;
        oledShowTopRow();

-        // Attempt to connect
-        if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) {
-            Serial.println("... re-connected");
-            // ... and resubscribe
-            client.subscribe(report_topic.c_str());
+        // Generate a random client ID suffix
+        String clientId = String(bambu_serialnr) + "_" + String(random(0xffff), HEX);
+        Serial.print("Reconnecting with client ID: ");
+        Serial.println(clientId);
+
+        // Attempt to connect with clean session and will message
+        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode, nullptr, 0, true, nullptr)) {
+            Serial.println("MQTT re/connected");
+            
+            // Subscribe with QoS 1
+            if (client.subscribe(report_topic.c_str(), 1)) {
+                Serial.println("Successfully subscribed to topic with QoS 1: " + report_topic);
+            } else {
+                Serial.println("Failed to subscribe to topic: " + report_topic);
+            }
            bambu_connected = true;
            oledShowTopRow();
        } else {
+            int state = client.state();
            Serial.print("failed, rc=");
-            Serial.print(client.state());
-            Serial.println(" try again in 5 seconds");
+            Serial.print(state);
+            Serial.print(" (");
+            // Print detailed error message
+            switch(state) {
+                case -4: Serial.print("MQTT_CONNECTION_TIMEOUT"); break;
+                case -3: Serial.print("MQTT_CONNECTION_LOST"); break;
+                case -2: Serial.print("MQTT_CONNECT_FAILED"); break;
+                case -1: Serial.print("MQTT_DISCONNECTED"); break;
+                case 1: Serial.print("MQTT_CONNECT_BAD_PROTOCOL"); break;
+                case 2: Serial.print("MQTT_CONNECT_BAD_CLIENT_ID"); break;
+                case 3: Serial.print("MQTT_CONNECT_UNAVAILABLE"); break;
+                case 4: Serial.print("MQTT_CONNECT_BAD_CREDENTIALS"); break;
+                case 5: Serial.print("MQTT_CONNECT_UNAUTHORIZED"); break;
+                default: Serial.print("UNKNOWN"); break;
+            }
+            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");
+                vTaskDelete(BambuMqttTask);
+                break;
+            }
+            retries++;
        }
    }
 }

 void mqtt_loop(void * parameter) {
+    Serial.println("Bambu MQTT Task gestartet");
+    unsigned long lastCheck = 0;
+    
    for(;;) {
        if (pauseBambuMqttTask) {
            vTaskDelay(10000);
+            continue;
        }

+        unsigned long now = millis();
+        
        if (!client.connected()) {
+            Serial.println("Connection lost, attempting reconnect...");
            reconnect();
            yield();
            esp_task_wdt_reset();
            vTaskDelay(100);
+            continue;
        }
+
+        // Periodically check connection status
+        if (now - lastCheck > 30000) {  // Check every 30 seconds
+            Serial.print("MQTT Status Check - Connected: ");
+            Serial.println(client.connected() ? "Yes" : "No");
+            lastCheck = now;
+        }
+
        client.loop();
        yield();
+        esp_task_wdt_reset();
        vTaskDelay(100);
    }
 }
@@ -584,7 +698,6 @@ void mqtt_loop(void * parameter) {
 bool setupMqtt() {
    // Wenn Bambu Daten vorhanden
    bool success = loadBambuCredentials();
-    vTaskDelay(100 / portTICK_PERIOD_MS);

    if (!success) {
        Serial.println("Failed to load Bambu credentials");
@@ -599,15 +712,30 @@ bool setupMqtt() {
        sslClient.setInsecure();
        client.setServer(bambu_ip, 8883);

+        // Generate a random client ID suffix
+        String clientId = String(bambu_serialnr) + "_" + String(random(0xffff), HEX);
+        
+        // MQTT Connection Options
+        client.setKeepAlive(60);
+        client.setSocketTimeout(60);  // Increase socket timeout
+        
+        Serial.print("Connecting with client ID: ");
+        Serial.println(clientId);
+
        // Verbinden mit dem MQTT-Server
        bool connected = true;
-        if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) 
+        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode, nullptr, 0, true, nullptr)) 
        {
            client.setCallback(mqtt_callback);
-            client.setBufferSize(5120);
-            // Optional: Topic abonnieren
-            client.subscribe(report_topic.c_str());
-            //client.subscribe(request_topic.c_str());
+            client.setBufferSize(16384);  // Increased to 16KB to handle larger JSON
+            
+            // Subscribe with QoS 1
+            if (client.subscribe(report_topic.c_str(), 1)) {
+                Serial.println("Successfully subscribed to topic with QoS 1: " + report_topic);
+            } else {
+                Serial.println("Failed to subscribe to topic: " + report_topic);
+            }
+            
            Serial.println("MQTT-Client initialisiert");

            oledShowMessage("Bambu Connected");
@@ -617,7 +745,7 @@ bool setupMqtt() {
            xTaskCreatePinnedToCore(
                mqtt_loop, /* Function to implement the task */
                "BambuMqtt", /* Name of the task */
-                10000,  /* Stack size in words */
+                16384,  /* Stack size in words */
                NULL,  /* Task input parameter */
                mqttTaskPrio,  /* Priority of the task */
                &BambuMqttTask,  /* Task handle. */
@@ -648,6 +776,7 @@ bool setupMqtt() {
 void bambu_restart() {
    if (BambuMqttTask) {
        vTaskDelete(BambuMqttTask);
+        delay(10);
    }
    setupMqtt();
 }
@@ -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
@@ -6,8 +6,6 @@
 //#define PN532_MOSI  23
 //#define PN532_SS    5
 //#define PN532_MISO  19
-const uint8_t PN532_IRQ = 32;
-const uint8_t PN532_RESET = 33;
 // ***** PN532

 // ***** HX711 (Waage)
@@ -1,10 +1,13 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once

 #include <Arduino.h>

-extern const uint8_t PN532_IRQ;
-extern const uint8_t PN532_RESET;
+// ***** PN532 (RFID)
+//#define PN532_SCK   18
+//#define PN532_MOSI  23
+//#define PN532_SS    5
+//#define PN532_MISO  19
+// ***** PN532

 extern const uint8_t LOADCELL_DOUT_PIN;
 extern const uint8_t LOADCELL_SCK_PIN;
@@ -47,4 +50,9 @@ extern uint8_t scaleTaskCore;
 extern uint8_t scaleTaskPrio;

 extern uint16_t defaultScaleCalibrationValue;
-#endif
+
+#define PN532_SCK  (18)
+#define PN532_MISO (19)
+#define PN532_MOSI (23)
+#define PN532_CS1  (5)
+#define PN532_CS2  (4)
@@ -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() {
@@ -139,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]);
    }
    
@@ -1,6 +1,4 @@
 #include <Arduino.h>
-#include <DNSServer.h>
-#include <ESPmDNS.h>
 #include <Wire.h>
 #include <WiFi.h>

@@ -15,6 +13,9 @@
 #include "esp_task_wdt.h"
 #include "commonFS.h"

+bool mainTaskWasPaused = 0;
+uint8_t scaleTareCounter = 0;
+
 // ##### SETUP #####
 void setup() {
  Serial.begin(115200);
@@ -26,7 +27,7 @@ void setup() {
  Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.

  // Initialize SPIFFS
-  initializeSPIFFS();
+  initializeFileSystem();

  // Start Display
  setupDisplay();
@@ -35,7 +36,6 @@ void setup() {
  initWiFi();

  // Webserver
-  Serial.println("Starte Webserver");
  setupWebserver(server);

  // Spoolman API
@@ -43,50 +43,37 @@ 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();

-  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();
-    }
-  }
-  
+  start_scale();
+
  // WDT initialisieren mit 10 Sekunden Timeout
  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
-  esp_task_wdt_init(10, panic); 
+  esp_task_wdt_init(10, panic);

  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
  esp_task_wdt_add(NULL);
-
-  // Optional: Andere Tasks zum Watchdog hinzufügen, falls nötig
-  // esp_task_wdt_add(task_handle);
 }


+/**
+ * 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

@@ -94,46 +81,44 @@ unsigned long lastAutoSetBambuAmsTime = 0;
 const unsigned long autoSetBambuAmsInterval = 1000; // 1 second
 uint8_t autoAmsCounter = 0;

-unsigned long lastAmsSendTime = 0;
-const unsigned long amsSendInterval = 60000; // 1 minute
-
 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() {
  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();
  }

  // Wenn Bambu auto set Spool aktiv
-  if (autoSendToBambu && autoSetToBambuSpoolId > 0 && currentMillis - lastAutoSetBambuAmsTime >= autoSetBambuAmsInterval) 
-  {
-    if (hasReadRfidTag == 0)
+  if (autoSendToBambu && autoSetToBambuSpoolId > 0) {
+    if (intervalElapsed(currentMillis, lastAutoSetBambuAmsTime, autoSetBambuAmsInterval)) 
    {
-      lastAutoSetBambuAmsTime = currentMillis;
-      oledShowMessage("Auto Set         " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s");
-      autoAmsCounter++;
-
-      if (autoAmsCounter >= autoSetBambuAmsCounter) 
+      if (hasReadRfidTag == 0)
+      {
+        lastAutoSetBambuAmsTime = currentMillis;
+        oledShowMessage("Auto Set         " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s");
+        autoAmsCounter++;
+
+        if (autoAmsCounter >= autoSetBambuAmsCounter) 
+        {
+          autoSetToBambuSpoolId = 0;
+          autoAmsCounter = 0;
+          oledShowWeight(weight);
+        }
+      }
+      else
      {
-        autoSetToBambuSpoolId = 0;
        autoAmsCounter = 0;
-        oledShowWeight(weight);
      }
    }
-    else
-    {
-      autoAmsCounter = 0;
-    }
  }
-  

  // Wenn Waage nicht Kalibriert
  if (scaleCalibrated == 3) 
@@ -147,9 +132,17 @@ void loop() {
  } 

  // Ausgabe der Waage auf Display
-  if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0 && (!autoSendToBambu || autoSetToBambuSpoolId == 0))
+  if(pauseMainTask == 0)
  {
-    (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+    if (mainTaskWasPaused || (weight != lastWeight && hasReadRfidTag == 0 && (!autoSendToBambu || autoSetToBambuSpoolId == 0)))
+    {
+      (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+    }
+    mainTaskWasPaused = false;
+  }
+  else
+  {
+    mainTaskWasPaused = true;
  }


@@ -161,11 +154,20 @@ void loop() {
    // Prüfen ob die Waage korrekt genullt ist
    if ((weight > 0 && weight < 5) || weight < 0)
    {
-      scale_tare_counter++;
+      if(scaleTareCounter < 5)
+      {
+        scaleTareCounter++;
+      }
+      else
+      {
+        scaleTareRequest = true;
+        scaleTareCounter = 0;
+      }
+      
    }
    else
    {
-      scale_tare_counter = 0;
+      scaleTareCounter = 0;
    }

    // Prüfen ob das Gewicht gleich bleibt und dann senden
@@ -197,6 +199,11 @@ void loop() {
      vTaskDelay(2000 / portTICK_PERIOD_MS);
      weightSend = 1;
      autoSetToBambuSpoolId = spoolId.toInt();
+
+      if (octoEnabled) 
+      {
+        updateSpoolOcto(autoSetToBambuSpoolId);
+      }
    }
    else
    {
@@ -204,7 +211,6 @@ void loop() {
      vTaskDelay(2000 / portTICK_PERIOD_MS);
    }
  }
-
-  yield();
+  
  esp_task_wdt_reset();
 }
@@ -7,9 +7,23 @@
 #include "api.h"
 #include "esp_task_wdt.h"
 #include "scale.h"
+#include <SPI.h>

-//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
-Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
+// Pin definitions for both PN532 chips
+#define PN532_SCK  (18)  // SPI SCK
+#define PN532_MISO (19)  // SPI MISO
+#define PN532_MOSI (23)  // SPI MOSI
+
+// CS pins for each PN532
+#define PN532_CS1  (5)   // CS for first PN532
+#define PN532_CS2  (4)   // CS for second PN532
+
+// Mifare authentication key
+uint8_t keyA[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
+// Create two PN532 instances
+Adafruit_PN532 nfc1(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_CS1);
+Adafruit_PN532 nfc2(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_CS2);

 TaskHandle_t RfidReaderTask;

@@ -28,6 +42,165 @@ volatile uint8_t hasReadRfidTag = 0;
 // 6 = reading
 // ***** PN532

+// Buffer for reading data
+uint8_t data[32];
+
+// Function to initialize a specific PN532
+bool initPN532(Adafruit_PN532 &pn532) {
+    pn532.begin();
+    uint32_t versiondata = pn532.getFirmwareVersion();
+    if (!versiondata) {
+        Serial.println("Didn't find PN532 board");
+        return false;
+    }
+    
+    // Got valid data, print it out!
+    Serial.print("Found chip PN5"); Serial.println((versiondata >> 24) & 0xFF, HEX);
+    Serial.print("Firmware ver. "); Serial.print((versiondata >> 16) & 0xFF, DEC);
+    Serial.print('.'); Serial.println((versiondata >> 8) & 0xFF, DEC);
+    
+    // Configure board to read RFID tags
+    pn532.SAMConfig();
+    Serial.println("Waiting for an ISO14443A Card ...");
+    return true;
+}
+
+void initNfc() {
+    // Configure CS pins as outputs
+    pinMode(PN532_CS1, OUTPUT);
+    pinMode(PN532_CS2, OUTPUT);
+    digitalWrite(PN532_CS1, HIGH);  // Deselect both chips initially
+    digitalWrite(PN532_CS2, HIGH);
+
+    // Initialize SPI
+    SPI.begin(PN532_SCK, PN532_MISO, PN532_MOSI);
+    SPI.setFrequency(1000000); // 1MHz SPI clock
+    
+    // Initialize both PN532 chips
+    if (!initPN532(nfc1)) {
+        Serial.println("Failed to initialize PN532 #1");
+        return;
+    }
+    if (!initPN532(nfc2)) {
+        Serial.println("Failed to initialize PN532 #2");
+        return;
+    }
+    
+    Serial.println("Both PN532 chips initialized successfully");
+}
+
+// Function to read a specific PN532
+bool readPN532(Adafruit_PN532 &pn532, uint8_t *uid, uint8_t *uidLength) {
+    uint8_t success;
+    success = pn532.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, uidLength);
+    return success;
+}
+
+// Function to write to a specific PN532
+bool writePN532(Adafruit_PN532 &pn532, uint8_t *uid, uint8_t uidLength, uint8_t *data, uint8_t dataLen) {
+    if (!pn532.mifareclassic_AuthenticateBlock(uid, uidLength, 4, 1, keyA)) {
+        Serial.println("Failed to authenticate block");
+        return false;
+    }
+    
+    if (!pn532.mifareclassic_WriteDataBlock(4, data)) {
+        Serial.println("Failed to write block");
+        return false;
+    }
+    
+    return true;
+}
+
+void loopNfc() {
+    uint8_t uid1[] = {0, 0, 0, 0, 0, 0, 0};
+    uint8_t uid2[] = {0, 0, 0, 0, 0, 0, 0};
+    uint8_t uidLength1 = 0;
+    uint8_t uidLength2 = 0;
+    
+    // Try to read from both PN532 chips
+    bool success1 = readPN532(nfc1, uid1, &uidLength1);
+    bool success2 = readPN532(nfc2, uid2, &uidLength2);
+    
+    if (success1 || success2) {
+        // Process the first tag if found
+        if (success1) {
+            processTag(uid1, uidLength1, 1);
+        }
+        
+        // Process the second tag if found
+        if (success2) {
+            processTag(uid2, uidLength2, 2);
+        }
+    }
+}
+
+void processTag(uint8_t *uid, uint8_t uidLength, uint8_t readerNumber) {
+    Adafruit_PN532 &pn532 = (readerNumber == 1) ? nfc1 : nfc2;
+    
+    Serial.print("Reader "); Serial.print(readerNumber); Serial.println(" found tag:");
+    Serial.print("UID Length: "); Serial.println(uidLength);
+    Serial.print("UID Value: ");
+    for (uint8_t i = 0; i < uidLength; i++) {
+        Serial.print(" 0x"); Serial.print(uid[i], HEX);
+    }
+    Serial.println("");
+
+    if (uidLength == 7) {
+        uint16_t tagSize = readTagSize(pn532);
+        if(tagSize > 0) {
+            Serial.print("Tag size: "); Serial.println(tagSize);
+            uint8_t* data = (uint8_t*)malloc(tagSize);
+            memset(data, 0, tagSize);
+            
+            // Mehrere Leseversuche
+            bool readSuccess = false;
+            for(int attempt = 0; attempt < 3 && !readSuccess; attempt++) {
+                readSuccess = true;
+                uint8_t numPages = tagSize / 4;
+                for (uint8_t i = 4; i < 4 + numPages; i++) {
+                    if (!pn532.ntag2xx_ReadPage(i, data + (i - 4) * 4)) {
+                        Serial.print("Failed to read page "); Serial.println(i);
+                        readSuccess = false;
+                        break;
+                    }
+                    delay(5);  // Kleine Pause zwischen den Seiten
+                }
+                if (!readSuccess) {
+                    delay(50);  // Pause vor erneutem Versuch
+                }
+            }
+
+            if (readSuccess) {
+                Serial.println("Successfully read tag data.");
+                processNfcData(data, createTagId(uid, uidLength));
+            } else {
+                Serial.println("Failed to read tag data after 3 attempts");
+                oledShowMessage("Read Error");
+            }
+            free(data);
+        }
+    }
+}
+
+void processNfcData(uint8_t *data, String tagId) {
+    // Process the data and send it via WebSocket
+    if (decodeNdefAndReturnJson(data)) {
+        hasReadRfidTag = 1;
+        sendNfcData(nullptr);
+    } else {
+        hasReadRfidTag = 2;
+        oledShowMessage("NFC-Tag unknown");
+        vTaskDelay(2000 / portTICK_PERIOD_MS);
+    }
+}
+
+// Function to write to a specific tag
+bool writeNfcTag(uint8_t *uid, uint8_t uidLength, uint8_t *data, uint8_t dataLen, uint8_t readerNumber) {
+    // Select the appropriate PN532 based on reader number
+    Adafruit_PN532 &pn532 = (readerNumber == 1) ? nfc1 : nfc2;
+    
+    return writePN532(pn532, uid, uidLength, data, dataLen);
+}

 // ##### Funktionen für RFID #####
 void payloadToJson(uint8_t *data) {
@@ -44,8 +217,6 @@ void payloadToJson(uint8_t *data) {
      DeserializationError error = deserializeJson(doc, jsonString);
  
      if (!error) {
-        const char* version = doc["version"];
-        const char* protocol = doc["protocol"];
        const char* color_hex = doc["color_hex"];
        const char* type = doc["type"];
        int min_temp = doc["min_temp"];
@@ -55,8 +226,6 @@ void payloadToJson(uint8_t *data) {
        Serial.println();
        Serial.println("-----------------");
        Serial.println("JSON-Parsed Data:");
-        Serial.println(version);
-        Serial.println(protocol);
        Serial.println(color_hex);
        Serial.println(type);
        Serial.println(min_temp);
@@ -84,7 +253,7 @@ bool formatNdefTag() {
  
    // Schreibe die Initialisierungsnachricht auf die ersten Seiten
    for (int i = 0; i < sizeof(ndefInit); i += 4) {
-      if (!nfc.ntag2xx_WritePage(pageOffset + (i / 4), &ndefInit[i])) {
+      if (!nfc1.ntag2xx_WritePage(pageOffset + (i / 4), &ndefInit[i])) {
          success = false;
          break;
      }
@@ -93,8 +262,15 @@ bool formatNdefTag() {
    return success;
  }

-uint8_t ntag2xx_WriteNDEF(const char *payload) {
-  uint8_t tagSize = 240; // 144 bytes is maximum for NTAG213
+uint16_t readTagSize(Adafruit_PN532 &pn532) {
+    uint8_t buffer[4];
+    memset(buffer, 0, 4);
+    pn532.ntag2xx_ReadPage(3, buffer);
+    return buffer[2] * 8;
+}
+
+uint8_t ntag2xx_WriteNDEF(const char *payload, Adafruit_PN532 &pn532) {
+  uint16_t tagSize = readTagSize(pn532);
  Serial.print("Tag Size: ");Serial.println(tagSize);

  uint8_t pageBuffer[4] = {0, 0, 0, 0};
@@ -136,6 +312,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
  if (combinedData == NULL) 
  {
    Serial.println("Fehler: Nicht genug Speicher vorhanden.");
+    oledShowMessage("Tag too small");
+    vTaskDelay(2000 / portTICK_PERIOD_MS);
    return 0;
  }

@@ -151,11 +329,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
    int bytesToWrite = (totalSize < 4) ? totalSize : 4;
    memcpy(pageBuffer, combinedData + a, bytesToWrite);

-    //uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-    //uint8_t uidLength;
-    //nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 100);
-
-    if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
+    if (!(pn532.ntag2xx_WritePage(4+i, pageBuffer))) 
    {
      Serial.println("Fehler beim Schreiben der Seite.");
      free(combinedData);
@@ -163,8 +337,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
    }

    yield();
-    //esp_task_wdt_reset();
-
    i++;
    a += 4;
    totalSize -= bytesToWrite;
@@ -173,7 +345,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
  // Ensure the NDEF message is properly terminated
  memset(pageBuffer, 0, 4);
  pageBuffer[0] = 0xFE; // NDEF record footer
-  if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
+  if (!(pn532.ntag2xx_WritePage(4+i, pageBuffer))) 
  {
    Serial.println("Fehler beim Schreiben des End-Bits.");
    free(combinedData);
@@ -232,30 +404,43 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
 void writeJsonToTag(void *parameter) {
  const char* payload = (const char*)parameter;

-  // Gib die erstellte NDEF-Message aus
  Serial.println("Erstelle NDEF-Message...");
  Serial.println(payload);

  hasReadRfidTag = 3;
  vTaskSuspend(RfidReaderTask);
-  vTaskDelay(500 / portTICK_PERIOD_MS);
-  //pauseBambuMqttTask = true;
-  // aktualisieren der Website wenn sich der Status ändert
-  sendNfcData(nullptr);
-  oledShowMessage("Waiting for NFC-Tag");
+  vTaskDelay(50 / portTICK_PERIOD_MS);

-  // Wait 10sec for tag
+  sendNfcData(nullptr);
+  vTaskDelay(100 / portTICK_PERIOD_MS);
+  oledShowMessage("Waiting for NFC-Tag");
+  
+  // Try both readers
  uint8_t success = 0;
  String uidString = "";
+  Adafruit_PN532* activeReader = nullptr;
+  
  for (uint16_t i = 0; i < 20; i++) {
-    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+    // Try first reader
+    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
    uint8_t uidLength;
-    success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
+    success = nfc1.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 250);
+    
+    if (!success) {
+      // Try second reader
+      success = nfc2.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 250);
+      if (success) {
+        activeReader = &nfc2;
+      }
+    } else {
+      activeReader = &nfc1;
+    }
+
    if (success) {
      for (uint8_t i = 0; i < uidLength; i++) {
        uidString += String(uid[i], HEX);
        if (i < uidLength - 1) {
-            uidString += ":"; // Optional: Trennzeichen hinzufügen
+            uidString += ":";
        }
      }
      foundNfcTag(nullptr, success);
@@ -269,44 +454,36 @@ void writeJsonToTag(void *parameter) {
    vTaskDelay(pdMS_TO_TICKS(1));
  }

-  if (success)
-  {
+  if (success && activeReader != nullptr) {
    oledShowIcon("transfer");
    // Schreibe die NDEF-Message auf den Tag
-    success = ntag2xx_WriteNDEF(payload);
-    if (success) 
-    {
+    success = ntag2xx_WriteNDEF(payload, *activeReader);
+    if (success) {
        Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
-        //oledShowMessage("NFC-Tag written");
        oledShowIcon("success");
        vTaskDelay(1000 / portTICK_PERIOD_MS);
        hasReadRfidTag = 5;
-        // aktualisieren der Website wenn sich der Status ändert
        sendNfcData(nullptr);
        pauseBambuMqttTask = false;
        
        if (updateSpoolTagId(uidString, payload)) {
-          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
          uint8_t uidLength;
          oledShowIcon("success");
-          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+          while (activeReader->readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
            yield();
          }
        }
          
        vTaskResume(RfidReaderTask);
        vTaskDelay(500 / portTICK_PERIOD_MS);        
-    } 
-    else 
-    {
+    } else {
        Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
        oledShowIcon("failed");
        vTaskDelay(2000 / portTICK_PERIOD_MS);
        hasReadRfidTag = 4;
    }
-  }
-  else
-  {
+  } else {
    Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
    oledShowMessage("No NFC-Tag found");
    vTaskDelay(2000 / portTICK_PERIOD_MS);
@@ -331,7 +508,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)
@@ -340,132 +517,110 @@ void startWriteJsonToTag(const char* payload) {
 }

 void scanRfidTask(void * parameter) {
-  Serial.println("RFID Task gestartet");
-  for(;;) {
-    // Wenn geschrieben wird Schleife aussetzen
-    if (hasReadRfidTag != 3)
-    {
-      yield();
-
-      uint8_t success;
-      uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-      uint8_t uidLength;
-
-      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 1000);
-
-      foundNfcTag(nullptr, success);
-      
-      if (success && hasReadRfidTag != 1)
-      {
-        // Display some basic information about the card
-        Serial.println("Found an ISO14443A card");
-
-        hasReadRfidTag = 6;
-
-        oledShowIcon("transfer");
-        vTaskDelay(500 / portTICK_PERIOD_MS);
-
-        if (uidLength == 7)
-        {
-          uint8_t data[256];
-
-          // We probably have an NTAG2xx card (though it could be Ultralight as well)
-          Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
-          
-          for (uint8_t i = 0; i < 45; i++) {
-            /*
-            if (i < uidLength) {
-              uidString += String(uid[i], HEX);
-              if (i < uidLength - 1) {
-                  uidString += ":"; // Optional: Trennzeichen hinzufügen
-              }
-            }
-            */
-            if (!nfc.mifareclassic_ReadDataBlock(i, data + (i - 4) * 4)) 
-            {
-              break; // Stop if reading fails
-            }
-            // Check for NDEF message end
-            if (data[(i - 4) * 4] == 0xFE) 
-            {
-              break; // End of NDEF message
-            }
-
+    Serial.println("RFID Task gestartet");
+    for(;;) {
+        if (hasReadRfidTag != 3) {
            yield();
-            esp_task_wdt_reset();
-            vTaskDelay(pdMS_TO_TICKS(1));
-          }

-          if (!decodeNdefAndReturnJson(data)) 
-          {
-            oledShowMessage("NFC-Tag unknown");
-            vTaskDelay(2000 / portTICK_PERIOD_MS);
-            hasReadRfidTag = 2;
-          }
-          else 
-          {
-            hasReadRfidTag = 1;
-          }
-         
+            uint8_t success = 0;
+            uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
+            uint8_t uidLength;
+            Adafruit_PN532* activeReader = nullptr;
+
+            // Try first reader with increased timeout
+            success = nfc1.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 150);
+            if (success) {
+                activeReader = &nfc1;
+            } else {
+                delay(50); // Small delay between readers
+                // Try second reader with increased timeout
+                success = nfc2.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 150);
+                if (success) {
+                    activeReader = &nfc2;
+                }
+            }
+
+            foundNfcTag(nullptr, success);
+            
+            if (success && hasReadRfidTag != 1 && activeReader != nullptr) {
+                Serial.println("Found an ISO14443A card");
+
+                hasReadRfidTag = 6;
+                oledShowIcon("transfer");
+                vTaskDelay(500 / portTICK_PERIOD_MS);
+
+                if (uidLength == 7) {
+                    uint16_t tagSize = readTagSize(*activeReader);
+                    if(tagSize > 0) {
+                        uint8_t* data = (uint8_t*)malloc(tagSize);
+                        memset(data, 0, tagSize);
+
+                        Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
+                        
+                        uint8_t numPages = readTagSize(*activeReader)/4;
+                        for (uint8_t i = 4; i < 4+numPages; i++) {
+                            if (!activeReader->ntag2xx_ReadPage(i, data+(i-4) * 4)) {
+                                break;
+                            }
+                            if (data[(i - 4) * 4] == 0xFE) {
+                                break;
+                            }
+
+                            yield();
+                            esp_task_wdt_reset();
+                            vTaskDelay(pdMS_TO_TICKS(5)); // Increased delay between page reads
+                        }
+
+                        if (!decodeNdefAndReturnJson(data)) {
+                            oledShowMessage("NFC-Tag unknown");
+                            vTaskDelay(2000 / portTICK_PERIOD_MS);
+                            hasReadRfidTag = 2;
+                        } else {
+                            hasReadRfidTag = 1;
+                        }
+
+                        free(data);
+                    } else {
+                        oledShowMessage("NFC-Tag read error");
+                        hasReadRfidTag = 2;
+                    }
+                } else {
+                    Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
+                }
+            }
+
+            if (!success && hasReadRfidTag > 0) {
+                hasReadRfidTag = 0;
+                nfcJsonData = "";
+                Serial.println("Tag entfernt");
+                if (!autoSendToBambu) oledShowWeight(weight);
+            }
+
+            sendNfcData(nullptr);
+            delay(100); // Add small delay at end of loop
        }
-        else
-        {
-          Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
-        }
-      }
-
-      if (!success && hasReadRfidTag > 0)
-      {
-        hasReadRfidTag = 0;
-        //uidString = "";
-        nfcJsonData = "";
-        Serial.println("Tag entfernt");
-        if (!autoSendToBambu) oledShowWeight(weight);
-      }
-
-      // aktualisieren der Website wenn sich der Status ändert
-      sendNfcData(nullptr);
+        yield();
    }
-    yield();
-  }
 }

 void startNfc() {
-  nfc.begin();                                           // Beginne Kommunikation mit RFID Leser
-  delay(1000);
-  unsigned long versiondata = nfc.getFirmwareVersion();  // Lese Versionsnummer der Firmware aus
-  if (! versiondata) {                                   // Wenn keine Antwort kommt
-    Serial.println("Kann kein RFID Board finden !");            // Sende Text "Kann kein..." an seriellen Monitor
-    //delay(5000);
-    //ESP.restart();
-    oledShowMessage("No RFID Board found");
-    delay(2000);
+  initNfc();
+  BaseType_t result = xTaskCreatePinnedToCore(
+    scanRfidTask, /* Function to implement the task */
+    "RfidReader", /* Name of the task */
+    5115,  /* Stack size in words */
+    NULL,  /* Task input parameter */
+    rfidTaskPrio,  /* Priority of the task */
+    &RfidReaderTask,  /* Task handle. */
+    rfidTaskCore); /* Core where the task should run */
+
+  if (result != pdPASS) {
+    Serial.println("Fehler beim Erstellen des RFID Tasks");
+  } else {
+    Serial.println("RFID Task erfolgreich erstellt");
  }
-  else {
-    Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen
-    Serial.print("Firmware ver. "); Serial.print((versiondata >> 16) & 0xFF, DEC);      // Monitor, wenn Antwort vom Board kommt
-    Serial.print('.'); Serial.println((versiondata >> 8) & 0xFF, DEC);                  // 
+}

-    nfc.SAMConfig();
-    // Set the max number of retry attempts to read from a card
-    // This prevents us from waiting forever for a card, which is
-    // the default behaviour of the PN532.
-    //nfc.setPassiveActivationRetries(0x7F);
-    //nfc.setPassiveActivationRetries(0xFF);
-
-    BaseType_t result = xTaskCreatePinnedToCore(
-      scanRfidTask, /* Function to implement the task */
-      "RfidReader", /* Name of the task */
-      10000,  /* Stack size in words */
-      NULL,  /* Task input parameter */
-      rfidTaskPrio,  /* Priority of the task */
-      &RfidReaderTask,  /* Task handle. */
-      rfidTaskCore); /* Core where the task should run */
-
-      if (result != pdPASS) {
-        Serial.println("Fehler beim Erstellen des RFID Tasks");
-    } else {
-        Serial.println("RFID Task erfolgreich erstellt");
-    }
-  }
+String createTagId(uint8_t *uid, uint8_t uidLength) {
+    // Implementierung der Funktion
 }
@@ -1,11 +1,15 @@
-#ifndef NFC_H
-#define NFC_H
+#pragma once

 #include <Arduino.h>
+#include <Adafruit_PN532.h>

 void startNfc();
-void scanRfidTask(void * parameter);
 void startWriteJsonToTag(const char* payload);
+void writeJsonToTag(void *parameter);
+void scanRfidTask(void * parameter);
+void processTag(uint8_t *uid, uint8_t uidLength, uint8_t readerNumber);
+void processNfcData(uint8_t *data, String tagId);
+bool decodeNdefAndReturnJson(const byte* encodedMessage);

 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
@@ -13,4 +17,6 @@ extern String spoolId;
 extern volatile uint8_t hasReadRfidTag;
 extern volatile bool pauseBambuMqttTask;

-#endif
+// Function declarations
+uint16_t readTagSize(Adafruit_PN532 &pn532);
+String createTagId(uint8_t *uid, uint8_t uidLength);
@@ -14,11 +14,39 @@ static size_t updateTotalSize = 0;
 static size_t updateWritten = 0;
 static bool isSpiffsUpdate = false;

+/**
+ * Compares two version strings and determines if version1 is less than version2
+ * 
+ * @param version1 First version string (format: x.y.z)
+ * @param version2 Second version string (format: x.y.z)
+ * @return true if version1 is less than version2
+ */
+bool isVersionLessThan(const String& version1, const String& version2) {
+    int major1 = 0, minor1 = 0, patch1 = 0;
+    int major2 = 0, minor2 = 0, patch2 = 0;
+    
+    // Parse version1
+    sscanf(version1.c_str(), "%d.%d.%d", &major1, &minor1, &patch1);
+    
+    // Parse version2
+    sscanf(version2.c_str(), "%d.%d.%d", &major2, &minor2, &patch2);
+    
+    // Compare major version
+    if (major1 < major2) return true;
+    if (major1 > major2) return false;
+    
+    // Major versions equal, compare minor
+    if (minor1 < minor2) return true;
+    if (minor1 > minor2) return false;
+    
+    // Minor versions equal, compare patch
+    return patch1 < patch2;
+}

 void backupJsonConfigs() {
    // Bambu Credentials backup
-    if (SPIFFS.exists("/bambu_credentials.json")) {
-        File file = SPIFFS.open("/bambu_credentials.json", "r");
+    if (LittleFS.exists("/bambu_credentials.json")) {
+        File file = LittleFS.open("/bambu_credentials.json", "r");
        if (file) {
            bambuCredentialsBackup = file.readString();
            file.close();
@@ -27,8 +55,8 @@ void backupJsonConfigs() {
    }

    // Spoolman URL backup
-    if (SPIFFS.exists("/spoolman_url.json")) {
-        File file = SPIFFS.open("/spoolman_url.json", "r");
+    if (LittleFS.exists("/spoolman_url.json")) {
+        File file = LittleFS.open("/spoolman_url.json", "r");
        if (file) {
            spoolmanUrlBackup = file.readString();
            file.close();
@@ -40,7 +68,7 @@ void backupJsonConfigs() {
 void restoreJsonConfigs() {
    // Restore Bambu credentials
    if (bambuCredentialsBackup.length() > 0) {
-        File file = SPIFFS.open("/bambu_credentials.json", "w");
+        File file = LittleFS.open("/bambu_credentials.json", "w");
        if (file) {
            file.print(bambuCredentialsBackup);
            file.close();
@@ -51,7 +79,7 @@ void restoreJsonConfigs() {

    // Restore Spoolman URL
    if (spoolmanUrlBackup.length() > 0) {
-        File file = SPIFFS.open("/spoolman_url.json", "w");
+        File file = LittleFS.open("/spoolman_url.json", "w");
        if (file) {
            file.print(spoolmanUrlBackup);
            file.close();
@@ -111,6 +139,16 @@ void handleUpdate(AsyncWebServer &server) {
    updateHandler->setUri("/update");
    updateHandler->setMethod(HTTP_POST);
    
+    // Check if current version is less than defined TOOLVERSION before proceeding with update
+    if (isVersionLessThan(VERSION, TOOLDVERSION)) {
+        updateHandler->onRequest([](AsyncWebServerRequest *request) {
+            request->send(400, "application/json", 
+                "{\"success\":false,\"message\":\"Your current version is too old. Please perform a full upgrade.\"}");
+        });
+        server.addHandler(updateHandler);
+        return;
+    }
+
    updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
                             size_t index, uint8_t *data, size_t len, bool final) {
        if (!index) {
@@ -14,7 +14,7 @@ TaskHandle_t ScaleTask;
 int16_t weight = 0;

 uint8_t weigthCouterToApi = 0;
-uint8_t scale_tare_counter = 0;
+bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
 uint8_t scaleCalibrated = 1;

@@ -34,30 +34,32 @@ void scale_loop(void * parameter) {
  Serial.println("++++++++++++++++++++++++++++++");
  Serial.println("Scale Loop started");
  Serial.println("++++++++++++++++++++++++++++++");
+
  for(;;) {
    if (scale.is_ready()) 
    {
      // Waage nochmal Taren, wenn zu lange Abweichung
-      if (scale_tare_counter >= 5) 
+      if (scaleTareRequest == true) 
      {
+        Serial.println("Re-Tare scale");
        scale.tare();
-        scale_tare_counter = 0;
+        scaleTareRequest = false;
      }

      weight = round(scale.get_units());
    }
    
-    vTaskDelay(pdMS_TO_TICKS(100)); // Verzögerung, um die CPU nicht zu überlasten
+    vTaskDelay(pdMS_TO_TICKS(100));
  }
 }

-uint8_t start_scale() {
+void start_scale() {
  Serial.println("Prüfe Calibration Value");
-  long calibrationValue;
+  float calibrationValue;

  // NVS lesen
  preferences.begin(NVS_NAMESPACE, true); // true = readonly
-  calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
  preferences.end();

  Serial.print("Read Scale Calibration Value ");
@@ -68,6 +70,13 @@ uint8_t start_scale() {
  if (isnan(calibrationValue) || calibrationValue < 1) {
    calibrationValue = defaultScaleCalibrationValue;
    scaleCalibrated = 0;
+
+    oledShowMessage("Scale not calibrated!");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
  }

  oledShowMessage("Scale Tare Please remove all");
@@ -90,7 +99,7 @@ uint8_t start_scale() {
  BaseType_t result = xTaskCreatePinnedToCore(
    scale_loop, /* Function to implement the task */
    "ScaleLoop", /* Name of the task */
-    10000,  /* Stack size in words */
+    2048,  /* Stack size in words */
    NULL,  /* Task input parameter */
    scaleTaskPrio,  /* Priority of the task */
    &ScaleTask,  /* Task handle. */
@@ -101,20 +110,21 @@ uint8_t start_scale() {
  } else {
      Serial.println("ScaleLoop-Task erfolgreich erstellt");
  }
-
-  return (scaleCalibrated == 1) ? 1 : 3;
 }

 uint8_t calibrate_scale() {
-  long newCalibrationValue;
+  uint8_t returnState = 0;
+  float newCalibrationValue;
+
+  vTaskSuspend(RfidReaderTask);
+  vTaskSuspend(ScaleTask);

-  //vTaskSuspend(RfidReaderTask);
-  vTaskDelete(RfidReaderTask);
  pauseBambuMqttTask = true;
  pauseMainTask = 1;
-
+  
  if (scale.wait_ready_timeout(1000))
  {
+    
    scale.set_scale();
    oledShowMessage("Step 1 empty Scale");

@@ -136,7 +146,7 @@ uint8_t calibrate_scale() {
      esp_task_wdt_reset();
    }
    
-    long newCalibrationValue = scale.get_units(10);
+    float newCalibrationValue = scale.get_units(10);
    Serial.print("Result: ");
    Serial.println(newCalibrationValue);

@@ -149,28 +159,33 @@ uint8_t calibrate_scale() {

      // Speichern mit NVS
      preferences.begin(NVS_NAMESPACE, false); // false = readwrite
-      preferences.putLong(NVS_KEY_CALIBRATION, newCalibrationValue);
+      preferences.putFloat(NVS_KEY_CALIBRATION, newCalibrationValue);
      preferences.end();

      // Verifizieren
      preferences.begin(NVS_NAMESPACE, true);
-      long verifyValue = preferences.getLong(NVS_KEY_CALIBRATION, 0);
+      float verifyValue = preferences.getFloat(NVS_KEY_CALIBRATION, 0);
      preferences.end();

      Serial.print("Verified stored value: ");
      Serial.println(verifyValue);

-      Serial.println("End calibration, revome weight");
+      Serial.println("End calibration, remove weight");

      oledShowMessage("Remove weight");

+      scale.set_scale(newCalibrationValue);
      for (uint16_t i = 0; i < 2000; i++) {
        yield();
        vTaskDelay(pdMS_TO_TICKS(1));
        esp_task_wdt_reset();
      }
+      
+      oledShowMessage("Scale calibrated");

-      oledShowMessage("Calibration done");
+      // For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
+      //scale.tare();
+      scaleTareRequest = true;

      for (uint16_t i = 0; i < 2000; i++) {
        yield();
@@ -178,8 +193,9 @@ uint8_t calibrate_scale() {
        esp_task_wdt_reset();
      }

-      //ESP.restart();
+      returnState = 1;
    }
+   
    else
    {
      {
@@ -192,10 +208,10 @@ uint8_t calibrate_scale() {
          vTaskDelay(pdMS_TO_TICKS(1));
          esp_task_wdt_reset();
        }
-        return 0;
+        returnState = 0;
      }
-    }
-  } 
+    } 
+  }
  else 
  {
    Serial.println("HX711 not found.");
@@ -207,17 +223,13 @@ uint8_t calibrate_scale() {
      vTaskDelay(pdMS_TO_TICKS(1));
      esp_task_wdt_reset();
    }
-    return 0;
+    returnState = 0;
  }

-  oledShowMessage("Scale Ready");
-
-  
-  Serial.println("starte Scale Task");
-  start_scale();
-
+  vTaskResume(RfidReaderTask);
+  vTaskResume(ScaleTask);
  pauseBambuMqttTask = false;
  pauseMainTask = 0;

-  return 1;
+  return returnState;
 }
@@ -12,7 +12,7 @@ uint8_t tareScale();
 extern HX711 scale;
 extern int16_t weight;
 extern uint8_t weigthCouterToApi;
-extern uint8_t scale_tare_counter;
+extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
 extern uint8_t scaleCalibrated;

@@ -113,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();

@@ -195,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);
@@ -204,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);
@@ -213,7 +213,7 @@ 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);
@@ -229,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);
@@ -239,7 +239,10 @@ void setupWebserver(AsyncWebServer &server) {
    server.on("/spoolman", HTTP_GET, [](AsyncWebServerRequest *request){
        Serial.println("Anfrage für /spoolman erhalten");
        String html = loadHtmlWithHeader("/spoolman.html");
-        html.replace("{{spoolmanUrl}}", spoolmanUrl);
+        html.replace("{{spoolmanUrl}}", (spoolmanUrl != "") ? spoolmanUrl : "");
+        html.replace("{{spoolmanOctoEnabled}}", octoEnabled ? "checked" : "");
+        html.replace("{{spoolmanOctoUrl}}", (octoUrl != "") ? octoUrl : "");
+        html.replace("{{spoolmanOctoToken}}", (octoToken != "") ? octoToken : "");

        JsonDocument doc;
        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) 
@@ -277,10 +280,21 @@ void setupWebserver(AsyncWebServer &server) {
            return;
        }

+        if (request->getParam("octoEnabled")->value() == "true" && (!request->hasParam("octoUrl") || !request->hasParam("octoToken"))) {
+            request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing OctoPrint URL or Token parameter\"}");
+            return;
+        }
+
        String url = request->getParam("url")->value();
+        bool octoEnabled = (request->getParam("octoEnabled")->value() == "true") ? true : false;
+        String octoUrl = request->getParam("octoUrl")->value();
+        String octoToken = (request->getParam("octoToken")->value() != "") ? request->getParam("octoToken")->value() : "";
+
        url.trim();
+        octoUrl.trim();
+        octoToken.trim();
        
-        bool healthy = saveSpoolmanUrl(url);
+        bool healthy = saveSpoolmanUrl(url, octoEnabled, octoUrl, octoToken);
        String jsonResponse = "{\"healthy\": " + String(healthy ? "true" : "false") + "}";

        request->send(200, "application/json", jsonResponse);
@@ -322,7 +336,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);
@@ -331,7 +345,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);
@@ -340,7 +354,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");
@@ -348,7 +362,7 @@ 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);
@@ -357,7 +371,7 @@ void setupWebserver(AsyncWebServer &server) {

    // Route für set_spoolman.png
    server.on("/set_spoolman.png", HTTP_GET, [](AsyncWebServerRequest *request){
-        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/set_spoolman.png.gz", "image/png");
+        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);
@@ -367,7 +381,7 @@ void setupWebserver(AsyncWebServer &server) {
    // 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);
@@ -376,7 +390,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);
@@ -385,7 +399,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);
@@ -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
@@ -0,0 +1,12 @@
+## **Heat insert location**
+
+Housing: 
+- every hole is made to fit a heat insert
+![](./Housing_Heatinsert_Location_usermod_spitzbirne32_.png)
+
+---
+Scale top: 
+- two heat inserts for the NFC Reader
+![](./ScaleTop_Heatinsert_Location_usermod_spitzbirne32_.png)
+  
+
@@ -0,0 +1,69 @@
+## Modifications
+
+To reduce costs, components were sourced from AliExpress instead of Amazon. However, differences in dimensions and mounting hole spacing necessitated adjustments to the 3D-printed parts. Additionally M3 heat inserts were used to limit M4 screws to a minimum.
+![](./Images/Showcase_usermod_spitzbirne32.gif)
+---
+
+List of parts that were used:
+- Display: https://aliexpress.com/item/1005007389730469.html
+- Scale(5KG with HX711): https://aliexpress.com/item/1005006827930173.html
+- NFC Reader: https://aliexpress.com/item/1005005973913526.html
+- NFC Chips: https://aliexpress.com/item/1005006332360160.html
+- [VORON](https://vorondesign.com/) Heat Inserts M3 OD5mm L4mm: https://aliexpress.com/item/1005003582355741.html  - make sure to select the correct size
+
+---
+
+- **Parts are designed to be printed in ABS/ASA.** Shrinking compensation not needed.
+
+- **Display and Scale Adjustments:** The AliExpress-sourced display and scale had different dimensions and hole spacings compared to the Amazon versions. The 3D models were modified to accommodate these differences, ensuring proper fit and functionality.
+   -  measurement of my Display & Scale to check if your parts will fit can be found in the images folder
+
+- **Screw Size and Heat Inserts:** All holes originally designed for M4 screws were resized to fit M3 screws. Standard VORON heat inserts were incorporated to provide durable threading. This change standardizes the hardware and simplifies assembly.
+
+- **Display Mounting:** The display is now mounted using M3 screws with VORON heat inserts. The display's mounting holes need to be drilled to 3mm to accommodate the M3 screws.
+
+- **Scale Top Surface:** The top surface of the scale was modified to allow M3 socket head cap screws to sit flush with the 3D-printed part. This design ensures that the filament spool rests flat without interference.
+
+- **NFC Reader Mounting:** The NFC reader is also secured using M3 screws and VORON heat inserts, maintaining consistency across all components.
+
+- **Scale Base Mounting:** The only M4 screws required are for attaching the metal part of the scale to its base.
+
+## Benefits of Modifications
+
+- **Cost Reduction:** Sourcing components from AliExpress offers a more affordable alternative to Amazon, making the project more accessible.
+
+- **Standardized Hardware:** Using M3 screws and [VORON](https://vorondesign.com/) heat inserts throughout the assembly simplifies the build process and reduces the variety of required hardware.
+
+- **Enhanced Compatibility:** Adjustments to the 3D models ensure compatibility with readily available components, accommodating variations in part dimensions.
+
+## Assembly Instructions
+
+1. **Component Preparation:**
+   - Carefully drill the display's mounting holes to 3mm to fit M3 screws.
+
+2. **Heat Insert Installation:**
+   - install VORON M3 heat inserts into the designated holes in the 3D-printed housing/case for the ESP32 and Scale top &#8594; [heat insert location pictures](./Images/README.md)
+
+3. **Component Mounting:**
+   - Attach the display, scale, and NFC reader to their respective mounts using M3 screws.
+   - Secure the metal part of the scale to its base using M4 screws.
+
+4. **Final Assembly:**
+   - Assemble all components according to the original FilaMan instructions, ensuring that all modified parts fit correctly and function as intended.
+
+For detailed assembly guides and additional resources, refer to the [original FilaMan documentation](https://github.com/ManuelW77/Filaman).
+
+## Conclusion
+
+These modifications to the FilaMan project provide a cost-effective and standardized approach to building a filament management system. By sourcing components from AliExpress and adjusting the 3D models accordingly, users can achieve the same functionality at a reduced cost, with the added benefit of using uniform hardware throughout the assembly.
+
+## Changelog
+
+### Version 1.0 - 2025-03-04
+- Initial release of modifications for AliExpress-sourced components.
+- Adjusted 3D models to fit different display and scale dimensions.
+- Replaced M4 screws with M3 screws and integrated VORON heat inserts.
+- Modified display mounting, requiring drilling to 3mm for M3 screws.
+- Adjusted scale top surface for flush screw placement.
+- Standardized NFC reader mounting with M3 screws and VORON heat inserts.
+- Retained M4 screws only for metal scale attachment.
Author	SHA1	Message	Date
tugsi	f2bf5e96f0	- RFID-Reader-Task optimized	2025-03-18 11:54:56 +01:00
tugsi	9a7ba2845d	-RFID SPI Pins angepasst - NFC-Tag verbessert	2025-03-18 11:36:10 +01:00
tugsi	f1a9c3c5d4	-Abfrage Error gefixt, wenn leer dann kein Error mehr	2025-03-17 11:19:28 +01:00
tugsi	ccca159a10	rfid.js wieder auf Originalstand gebracht	2025-03-17 09:31:26 +01:00
tugsi	70c8b7bdc0	Delete data directory Old and not used... Testing from SPIFFS	2025-03-16 19:40:05 +01:00
tugsi	c574cc964e	Merge branch 'Bambu-Serie-X-MQTT-Fix' of https://github.com/tugsi/Filaman into Bambu-Serie-X-MQTT-Fix	2025-03-16 19:35:08 +01:00
tugsi	9262865b56	- X1C MQTT Fix - Spoolman Settings Fix - Spoolman Out Fix - Spoolman In Fix	2025-03-16 19:30:37 +01:00
Manuel Weiser	3eac0e5ac4	update Discord Link	2025-03-15 16:02:18 +01:00
Manuel Weiser	24d91693d9	update Discord Link	2025-03-15 15:57:46 +01:00
tugsi	f7c01eb5f0	Merge remote-tracking branch 'upstream/main' into Bambu-Serie-X-MQTT-Fix	2025-03-14 17:43:52 +01:00
tugsi	a41ef9e75a	docs: update changelog and header for version v1.4.1 - Die MQTT-Puffergröße auf 16.384 Byte (16 KB) erhöht. Dies sollte ausreichen, um Ihre 15.403 Byte große JSON-Nutzlast mit etwas mehr Spielraum zu verarbeiten. Diese Änderung ermöglicht es dem MQTT-Client, größere JSON-Nachrichten ohne Kürzung zu empfangen und zu verarbeiten. Einige wichtige Hinweise zu dieser Änderung: Die neue Puffergröße von 16 KB verbraucht mehr RAM, der ESP32 sollte jedoch ausreichend Speicher dafür haben. Die Größe ist auf 16 KB festgelegt, um über die benötigten 15.403 Byte hinaus zusätzlichen Puffer-Overhead bereitzustellen. Diese Änderung betrifft nur den MQTT-Empfangspuffer -- - Die Task-Stack-Größe von 8192 auf 16384 Wörter erhöht, um mehr Speicher für die JSON-Verarbeitung bereitzustellen --- - Erhöhung des Keepalive-Intervalls auf 60 Sekunden - Verbesserte Fehlerbehandlung und Debugging-Ausgaben - Detaillierte Statusmeldungen für die MQTT-Verbindung - Periodische Verbindungsüberprüfung alle 30 Sekunden - Bessere Handhabung von Verbindungsverlusten --- - Verwendung einer eindeutigen Client-ID mit Zufallssuffix - Erhöhung der QoS (Quality of Service) auf 1 für zuverlässigere Übertragung - Einstellung eines Socket-Timeouts von 60 Sekunden - Aktivierung von Clean Session und Will Message - Verbessertes Verbindungs-Logging	2025-03-14 17:42:26 +01:00
ManuelW	659dfb8627	Update README.de.md Removed OpenSpool	2025-03-12 10:02:30 +01:00
ManuelW	b4dd0d357a	Update README.md	2025-03-12 10:01:40 +01:00
ManuelW	8e38a68191	Merge pull request #19 from tugsi/patch-1 Update README.de.md	2025-03-12 09:59:54 +01:00
ManuelW	c3ec7edf6a	Merge pull request #20 from tugsi/patch-2 Update README.md	2025-03-12 09:58:52 +01:00
tugsi	a35e13e015	Update README.md See German-Commit Readme :-)	2025-03-11 14:54:43 +01:00
tugsi	e0df5d33f2	Update README.de.md Einige Kleinigkeiten die mir aufgefallen sind. - einheitlich Bambu Lab - generell Namensgebung korrigiert - die meisten Auflistungen haben ein . am Ende, eigentlich könnte man die weglassen, aber ich habe die, die keine hatten angepasst - Installation Google Chrome oder Microsoft Edge hinzugefügt	2025-03-11 14:49:28 +01:00
Manuel Weiser	94c26590c8	remove commented-out subscription topic in MQTT setup	2025-03-10 17:41:14 +01:00
Manuel Weiser	4559bae066	docs: update changelog and header for version v1.4.1	2025-03-10 17:34:09 +01:00
Manuel Weiser	cdb2d16cf9	docs: update platformio.ini for version v1.4.1	2025-03-10 17:34:09 +01:00
Manuel Weiser	cd71949c82	refactor length calculation to convert total length to meters before formatting	2025-03-10 17:33:47 +01:00
ManuelW	6cd280389d	Merge pull request #16 from spitzbirne32/main Usermod for M3 heat inserts and AliExpress parts	2025-03-06 15:19:28 +01:00
spitzbirne32	daf27820b1	improved housing to show display better	2025-03-06 12:16:10 +01:00
spitzbirne32	dd7fbe1119	added new .step, now with correct individual parts	2025-03-06 12:14:39 +01:00
spitzbirne32	dc2ddb47eb	removed CAD, as they were all duplicates	2025-03-06 12:13:25 +01:00
spitzbirne32	6bb8f565e6	typo in AliE link	2025-03-04 01:59:47 +01:00
spitzbirne32	ec60ca88f1	added changelog	2025-03-04 01:57:50 +01:00
spitzbirne32	17664acf9e	Delete usermod/spitzbirne32/STL/README.md	2025-03-04 01:48:02 +01:00
spitzbirne32	18f7454a76	Add files via upload	2025-03-04 01:43:50 +01:00
spitzbirne32	e7b5917888	added .stp files of modifications	2025-03-04 01:43:20 +01:00
spitzbirne32	5c57968ba9	Update README.md	2025-03-04 01:40:33 +01:00
spitzbirne32	795c926c1f	added merged picture	2025-03-04 01:33:01 +01:00
spitzbirne32	8735a9740c	moved pictures of parts into dedicated folders	2025-03-04 01:26:41 +01:00
spitzbirne32	02d0adc6bf	added pictures of components bought from AliE	2025-03-04 01:21:18 +01:00
spitzbirne32	24067666ed	Update README.md	2025-03-04 01:17:12 +01:00
spitzbirne32	9264333eda	Add files via upload	2025-03-04 01:06:07 +01:00
spitzbirne32	66216d57ae	Update README.md	2025-03-04 01:05:35 +01:00
spitzbirne32	5100a669b0	Update README.md	2025-03-04 00:54:43 +01:00
spitzbirne32	4ad89b68a7	added pictures for heat insert location	2025-03-04 00:50:42 +01:00
spitzbirne32	758acaff9f	Delete usermod/spitzbirne32/STL/ScaleTop_Heatinsert_Location_usermod_spitzbirne32_.png	2025-03-04 00:50:22 +01:00
spitzbirne32	fed96b9c58	Delete usermod/spitzbirne32/STL/Housing_Heatinsert_Location_usermod_spitzbirne32_.png	2025-03-04 00:50:14 +01:00
spitzbirne32	2d072ee09a	added pictures showing heat insert location	2025-03-04 00:49:31 +01:00
spitzbirne32	b55b6e3fd5	created folders	2025-03-04 00:26:37 +01:00
spitzbirne32	238b928236	Update README.md	2025-03-04 00:16:01 +01:00
spitzbirne32	24ce0ca6df	Update README.md	2025-03-04 00:15:10 +01:00
spitzbirne32	3cf934b920	Create README.md	2025-03-04 00:11:54 +01:00
spitzbirne32	f68ea3edb0	Update README.md	2025-03-04 00:09:49 +01:00
spitzbirne32	16321c9461	Update README.md	2025-03-04 00:05:21 +01:00
spitzbirne32	f9530f6d9a	Create README.md	2025-03-03 22:08:45 +01:00
ManuelW	83f2f0834d	Merge pull request #15 from ManuelW77/main set to main state	2025-03-03 17:10:35 +01:00
ManuelW	6632aa8f95	Merge pull request #14 from janecker/scale-calibration-rework Reworks the scale calibration handling	2025-03-03 17:08:06 +01:00
Manuel Weiser	8a558c3121	refactor: remove unnecessary delay in MQTT setup and add delay before restart	2025-03-03 16:58:24 +01:00
Jan Philipp Ecker	d434fde92e	Reworks the scale calibration handling Fixes some issues in the scale handling. Prevents a wdg reset after after scale calibration. Also makes sure that after calibration all tasks are started again that have been suspsended before.	2025-03-03 16:50:46 +01:00
Manuel Weiser	5afb60df32	fix: correct typo in console log for total length	2025-03-02 20:21:27 +01:00
Manuel Weiser	3394e6eb01	feat: add new 3D print file for Filaman scale	2025-03-02 08:06:59 +01:00
Manuel Weiser	3818c2c059	refactor: remove redundant scale calibration checks and enhance task management	2025-03-01 18:50:20 +01:00
Manuel Weiser	0afc543b5f	refactor: enhance AMS data handling and streamline spool auto-setting logic	2025-03-01 18:44:35 +01:00
Manuel Weiser	adee46e3fc	refactor: adjust stack size and improve scale calibration logic	2025-03-01 18:44:29 +01:00
Manuel Weiser	1db74867e6	refactor: update labels and input types for better clarity and functionality	2025-03-01 18:44:17 +01:00
Manuel Weiser	0f24a63d32	added Discord Server	2025-03-01 15:33:39 +01:00
Manuel Weiser	3640809502	update documentation for clarity and accuracy	2025-03-01 13:04:28 +01:00
Manuel Weiser	289d5357be	docs: update changelog and header for version v1.4.0	2025-03-01 12:46:18 +01:00
Manuel Weiser	315530d1ea	update NFC tag references to include NTAG213 and clarify storage capacity	2025-03-01 12:45:55 +01:00
Manuel Weiser	f36773a4c4	bump version to 1.4.0	2025-03-01 12:37:50 +01:00
Manuel Weiser	b35163936f	add support for Spoolman Octoprint Plugin in README files	2025-03-01 12:33:26 +01:00
Manuel Weiser	7a2c9d6d17	add OctoPrint integration with configurable fields and update functionality	2025-03-01 12:18:33 +01:00
Manuel Weiser	eb2a8dc128	add version comparison function and check for outdated versions before updates	2025-03-01 12:18:21 +01:00
Manuel Weiser	bec2c91331	remove unused version and protocol fields from JSON output; add error message for insufficient memory	2025-03-01 10:42:06 +01:00
Manuel Weiser	c6e727de06	remove unused version and protocol fields from NFC data packet	2025-03-01 10:41:51 +01:00
Manuel Weiser	3253e7d407	sort vendors alphabetically in the dropdown list	2025-03-01 10:41:44 +01:00
ManuelW	bce2ad2ed8	Merge pull request #10 from janecker/nfc-improvements Improves NFC Tag handling	2025-03-01 10:03:46 +01:00
Jan Philipp Ecker	0eff29ef4a	Improves NFC Tag handling Fixes memory underflow when reading tags. Reads tags with their actual data size and uses actual size instead of constnat value for tag size when writing a tag.	2025-02-28 22:35:34 +01:00
Manuel Weiser	492bf6cdb8	docs: update changelog and header for version v1.3.99	2025-02-28 18:35:16 +01:00
Manuel Weiser	b0317f4001	docs: update platformio.ini for version v1.3.99	2025-02-28 18:35:16 +01:00
Manuel Weiser	58ff6458b0	refactor: update workflows to build firmware with LittleFS instead of SPIFFS	2025-02-28 18:35:05 +01:00
Manuel Weiser	d9c40f5124	docs: update changelog and header for version v1.3.98	2025-02-28 18:12:56 +01:00
Manuel Weiser	68bc31e29a	docs: update platformio.ini for version v1.3.98	2025-02-28 18:12:56 +01:00
Manuel Weiser	9b23ac5fd2	refactor: migrate from SPIFFS to LittleFS for file handling	2025-02-28 18:12:42 +01:00
Manuel Weiser	d31bff14c3	chore: remove unused VSCode settings file	2025-02-28 09:29:34 +01:00
Manuel Weiser	150f92484a	refactor: remove commented-out spoolman and filaman data from api.cpp	2025-02-28 09:26:09 +01:00
Manuel Weiser	fa74832fb9	docs: update changelog and header for version v1.3.97	2025-02-28 08:53:08 +01:00
Manuel Weiser	2eab3db77d	docs: update platformio.ini for version v1.3.97	2025-02-28 08:53:07 +01:00
Manuel Weiser	0a1bf22f7e	feat: füge Bestätigungsmeldung für Spool-Einstellung hinzu	2025-02-27 22:07:47 +01:00
Manuel Weiser	d58244c1f8	fix: Speichernutzung optimiert	2025-02-27 21:56:31 +01:00
Manuel Weiser	db626ea516	fix: behebe doppelte http.end() Aufrufe in checkSpoolmanExtraFields	2025-02-27 21:54:47 +01:00
Manuel Weiser	fd8f7685a1	fix: optimiere Verzögerungen und Stackgrößen in NFC-Task-Funktionen	2025-02-27 21:54:32 +01:00
Manuel Weiser	944b156528	feat: verbessere WLAN-Konfiguration und füge mDNS-Unterstützung hinzu	2025-02-27 21:53:48 +01:00
Manuel Weiser	76100593cc	refactor: entferne ungenutzte Bibliotheken und Debug-Ausgaben aus main.cpp	2025-02-27 15:50:04 +01:00
Manuel Weiser	732d590344	feat: aktualisiere OLED-Anzeige mit Versionsnummer und verbessere Textausrichtung	2025-02-27 14:35:53 +01:00
Manuel Weiser	46cd953b80	feat: füge regelmäßige WLAN-Verbindungsüberprüfung hinzu	2025-02-27 09:38:54 +01:00
Manuel Weiser	c645035bbe	feat: aktualisiere Schaltplan-Bild	2025-02-26 18:29:37 +01:00
Manuel Weiser	9e76620cd3	style: entferne text-shadow von deaktivierten Schaltflächen	2025-02-26 18:07:22 +01:00
Manuel Weiser	faddda6201	feat: zeige Versionsnummer im OLED-Display an	2025-02-26 18:01:35 +01:00
Manuel Weiser	de9c1706c0	docs: füge Link zum Wiki für detaillierte Informationen über die Nutzung hinzu	2025-02-25 20:19:04 +01:00