docs: update changelog and header for version v1.5.11-beta2

docs: update platformio.ini for beta version v1.5.11-beta2
fix: add logging for healthy spoolman instance check
2025-08-28 10:45:35 +02:00 · 2025-08-28 10:45:35 +02:00 · 2025-08-28 10:45:16 +02:00 · 2025-08-28 10:29:36 +02:00 · 2025-08-28 10:29:36 +02:00 · 2025-08-28 10:29:21 +02:00
34 changed files with 1525 additions and 621 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,42 @@
+.pio
+.vscode/
+.aider*
+.DS_Store
+._*
+**/.DS_Store
+**/.Spotlight-V100
+**/.Trashes
+**/.fseventsd
+.AppleDouble
+**/.DS_Store
+**/.Spotlight-V100
+**/.Trashes
+**/.fseventsd
+.AppleDouble
+.aider.chat.history.md
+.aider.input.history
+.DS_Store
+.gitignore
+.aider.tags.cache.v3/cache.db
+.aider.tags.cache.v3/cache.db-shm
+.aider.tags.cache.v3/cache.db-wal
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
+.vscode/extensions.json
+.vscode/launch.json
+include/README
+lib/README
+test/README
+.aider*
+data/*
+!data/
+!data/.gitkeep
+# important
+html/bambu_credentials.json
+html/spoolman_url.json
+_local/*
+website/*
+release.sh
+.github/copilot-instructions.md
+data
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,309 @@
 # Changelog

+## [1.5.11-beta2] - 2025-08-28
+### Added
+- add logging for healthy spoolman instance check
+
+### Changed
+- update platformio.ini for beta version v1.5.11-beta2
+
+
+## [1.5.11-beta1] - 2025-08-28
+### Changed
+- update platformio.ini for beta version v1.5.11-beta1
+
+### Fixed
+- adjust spacing in loop structure and enable tare function in scale loop
+
+
+## [1.5.11] - 2025-08-27
+### Changed
+- update platformio.ini for version v1.5.11
+
+
+## [1.5.10] - 2025-08-27
+### Added
+- improve weight processing logic and add auto-send feature for Bambu spool ID
+- improve weight processing logic and add auto-send feature for Bambu spool ID
+- Adds a link to the spool in spoolman when reading a spool tag
+- Fixes types and some issues in the new graphics
+- Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags
+- Adds data directory and further .vscode files to to .gitignore
+- Introduces new heap debugging feature and fixes some memory leaks in website feature
+- Fixes some issues with the new location tags
+- Adds new feature to write and read location tags
+- Adds slight debouncing to the scale loop weight logic
+- add loadcell desc.
+- implement multi-color filament display and styles for dropdown options
+- add remaining weight logging for PUT requests and improve error reporting in sendToApi function
+- add remaining weight logging and display after successful spool update
+- add weight field to update payload in updateSpoolTagId function
+- add auto-tare functionality and update scale handling based on touch sensor connection
+- add touch sensor connection check and update logic
+- add manual tare functionality for scale
+- add debounce handling for TTP223 touch sensor
+- add TTP223 touch sensor support and wiring configuration
+- Renamed states of NFC state machine and introduced new state machine for spoolman API
+- add forced cache refresh after removing and saving Bambu credentials
+- add functionality to remove Bambu credentials and update API handling
+- add rfid_bambu.html and update bambu connection handling
+- add error handling for missing vendor IDs in filament data
+- add WiFi connection check and restart Bambu if not connected
+- 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
+- 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 platformio.ini for version v1.5.10
+- Merge branch 'main' of https://gitlab.fire-devils.org/3D-Druck/Filaman
+- Changed Amazon Link for PN532
+- Changed Amazon Link for PN532
+- update changelog and header for version v1.5.9
+- update platformio.ini for version v1.5.9
+- Enhance API to support weight updates after successful spool tag updates
+- update changelog and header for version v1.5.8
+- update platformio.ini for version v1.5.8
+- Merge pull request #45 from janecker/nfc_write_improvements
+- Introduces periodic Spoolman Healthcheck
+- Improves init - NFC reading now only starts after boot is finished
+- Further improvements on NFC writing
+- Merge pull request #44 from janecker/graphics_rework
+- Graphic rework of the NFC writing process
+- Remove unused parameter of sendNfcData()
+- Reworks startup graphics and timings
+- update changelog and header for version v1.5.7
+- update platformio.ini for version v1.5.7
+- clean up unused variables and improve .gitignore entries
+- update changelog and header for version v1.5.6
+- update webpages for version v1.5.6
+- update platformio.ini for version v1.5.6
+- Merge pull request #42 from janecker/configuration_nvs_storage
+- Merge branch 'main' into configuration_nvs_storage
+- Changes configuration storage of spoolman and bambu values
+- update changelog and header for version v1.5.5
+- update platformio.ini for version v1.5.5
+- update changelog and header for version v1.5.4
+- update platformio.ini for version v1.5.4
+- Merge branch 'main' of github.com:ManuelW77/Filaman
+- Merge pull request #39 from janecker/location_tags
+- Merge pull request #38 from janecker/scale_debouncing
+- update changelog and header for version v1.5.3
+- update platformio.ini for version v1.5.3
+- Affiliate Links
+- update changelog and header for version v1.5.2
+- update platformio.ini for version v1.5.2
+- update changelog and header for version v1.5.1
+- update version to 1.5.1 and improve OTA update handling with task management
+- update changelog and header for version v1.4.14
+- update platformio.ini for version v1.4.14
+- update changelog and header for version v1.4.13
+- update platformio.ini for version v1.4.13
+- update changelog and header for version v1.4.12
+- update platformio.ini for version v1.4.12
+- update README files to clarify PN532 DIP switch settings
+- update changelog and header for version v1.4.11
+- update platformio.ini for version v1.4.11
+- Merge branch 'main' of github.com:ManuelW77/Filaman
+- update changelog and header for version v1.4.10
+- update platformio.ini for version v1.4.10
+- Merge pull request #31 from janecker/nfc_rework
+- Introducing enum for handling the NFC state to improve code readability
+- update changelog and header for version v1.4.9
+- update platformio.ini for version v1.4.9
+- update changelog and header for version v1.4.8
+- update platformio.ini for version v1.4.8
+- Merge pull request #30 from janecker/main
+- Merge branch 'testing' into main
+- update changelog and header for version v1.4.7
+- update platformio.ini for version v1.4.7
+- Merge branch 'testing'
+- update remove button for Bambu credentials with red background
+- Merge pull request #28 from tugsi/main
+- update changelog and header for version v1.4.6
+- update platformio.ini for version v1.4.6
+- update changelog and header for version v1.4.5
+- update platformio.ini for version v1.4.5
+- Merge branch 'testing'
+- remove unused request_topic subscription and reduce MQTT task stack size
+- Merge pull request #26 from tugsi/main
+- rename report_topic to topic and update MQTT subscription logic, switched publish topic to request
+- update changelog and header for version v1.4.4
+- update platformio.ini for version v1.4.4
+- update changelog and header for version v1.4.3
+- update platformio.ini for version v1.4.3
+- update changelog and header for version v1.4.2
+- update platformio.ini for version v1.4.2
+- increase stack size for BambuMqtt task
+- update Discord Link
+- update Discord Link
+- remove commented-out subscription topic in MQTT setup
+- update changelog and header for version v1.4.1
+- 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
+- update changelog and header for version v1.4.0
+- 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
+
+### Fixed
+- Fixes issue that scale not calibrated message was not shown
+- Improves NFC writing workaround and removes debug output
+- Fixes typos in upgrade page
+- Reworks graphics of tag reading and some api fixes
+- Replaces usage of String with const char* in heap debug function
+- Merge pull request #41 from janecker/memory_leak_fixes
+- Fixes compiler warnings in nfc
+- Memory leak fixes in api and nfc, location tag fix
+- Merge pull request #40 from janecker/location_bambu_fix
+- uncomment monitor_port configuration in platformio.ini
+- update spool weight conditionally based on NFC ID
+- update weight field in update payload to only include values greater than 10
+- increase stack size for sendToApi task to improve stability
+- adjust tare weight tolerance to ignore deviations of 2g
+- improve weight stability check before sending to API
+- update touch sensor connection logic to correctly identify connection status
+- update TTP223 pin configuration and adjust touch sensor logic
+- enhance HTTP method handling in sendToApi function
+- improve HTTP client configuration and clear update documents after API calls
+- Fixes memory leak in HTTPClient by disabling connection reuse
+- update reload logic after removing and saving Bambu credentials for better cache handling
+- handle Bambu connection state by introducing bambuDisabled flag
+- handle potential undefined value for tray_info_idx in handleSpoolIn function, by @tugsi
+- Fix rfid.js-Failure with X1-Series, if you wanna send a Spool to AMS:  - Uncaught TypeError: Cannot read properties of undefined (reading 'replace')     at handleSpoolIn (rfid.js:493:67)     at HTMLButtonElement.onclick ((Index):1:1) handleSpoolIn	@	rfid.js:493 onclick	@	(Index):1
+- increase MQTT buffer size and adjust task stack size
+- Fix BufferSize for larger JSONs from X-Series
+- adjust weight threshold for tare check to allow negative values
+- use unique client ID for MQTT connection to avoid conflicts
+- reload page after firmware update completion
+- increase WiFi connection timeout from 5 to 10 seconds
+- ensure valid URL format and remove trailing slash in setupWebserver
+- correct typo in console log for total length
+
+
+## [1.5.9] - 2025-08-11
+### Changed
+- update platformio.ini for version v1.5.9
+- Enhance API to support weight updates after successful spool tag updates
+
+
+## [1.5.8] - 2025-08-10
+### Added
+- Adds a link to the spool in spoolman when reading a spool tag
+- Fixes types and some issues in the new graphics
+
+### Changed
+- update platformio.ini for version v1.5.8
+- Merge pull request #45 from janecker/nfc_write_improvements
+- Introduces periodic Spoolman Healthcheck
+- Improves init - NFC reading now only starts after boot is finished
+- Further improvements on NFC writing
+- Merge pull request #44 from janecker/graphics_rework
+- Graphic rework of the NFC writing process
+- Remove unused parameter of sendNfcData()
+- Reworks startup graphics and timings
+
+### Fixed
+- Fixes issue that scale not calibrated message was not shown
+- Improves NFC writing workaround and removes debug output
+- Fixes typos in upgrade page
+- Reworks graphics of tag reading and some api fixes
+- Replaces usage of String with const char* in heap debug function
+
+
+## [1.5.7] - 2025-07-28
+### Changed
+- update platformio.ini for version v1.5.7
+- clean up unused variables and improve .gitignore entries
+
+
+## [1.5.6] - 2025-07-28
+### Added
+- Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags
+- Adds data directory and further .vscode files to to .gitignore
+- Introduces new heap debugging feature and fixes some memory leaks in website feature
+
+### Changed
+- update webpages for version v1.5.6
+- update platformio.ini for version v1.5.6
+- Merge pull request #42 from janecker/configuration_nvs_storage
+- Merge branch 'main' into configuration_nvs_storage
+- Changes configuration storage of spoolman and bambu values
+
+### Fixed
+- Merge pull request #41 from janecker/memory_leak_fixes
+- Fixes compiler warnings in nfc
+- Memory leak fixes in api and nfc, location tag fix
+
+
+## [1.5.5] - 2025-07-22
+### Added
+- Fixes some issues with the new location tags
+
+### Changed
+- update platformio.ini for version v1.5.5
+
+### Fixed
+- Merge pull request #40 from janecker/location_bambu_fix
+
+
+## [1.5.4] - 2025-07-22
+### Added
+- Adds new feature to write and read location tags
+- Adds slight debouncing to the scale loop weight logic
+- add loadcell desc.
+
+### Changed
+- update platformio.ini for version v1.5.4
+- Merge branch 'main' of github.com:ManuelW77/Filaman
+- Merge pull request #39 from janecker/location_tags
+- Merge pull request #38 from janecker/scale_debouncing
+
+### Fixed
+- uncomment monitor_port configuration in platformio.ini
+
+
 ## [1.5.3] - 2025-04-25
 ### Changed
 - update platformio.ini for version v1.5.3
--- a/README.de.md
+++ b/README.de.md
@@ -62,7 +62,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
 [Amazon Link](https://amzn.to/445aaa9)
 - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
-[Amazon Link](https://amzn.to/4iO6CO4)
+[Amazon Link](https://amzn.eu/d/gy9vaBX)
 - **NFC Tags NTAG213 NTAG215:** RFID Tag
 [Amazon Link](https://amzn.to/3E071xO)
 - **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch
@@ -90,6 +90,12 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 ![myWiring](./img/IMG_2589.jpeg)
 ![myWiring](./img/IMG_2590.jpeg)

+*Die Wägezelle wird bei den meisten HX711 Modulen folgendermaßen verkabelt:  
+E+ rot  
+E- schwarz  
+A- weiß  
+A+ grün*
+
 ## Software-Abhängigkeiten

 ### ESP32-Bibliotheken
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
 [Amazon Link](https://amzn.to/445aaa9)
 - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
-[Amazon Link](https://amzn.to/4iO6CO4)
+[Amazon Link](https://amzn.eu/d/gy9vaBX)
 - **NFC Tags NTAG213 NTAG215:** RFID Tag
 [Amazon Link](https://amzn.to/3E071xO)
 - **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch
@@ -94,6 +94,12 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 ![myWiring](./img/IMG_2589.jpeg)
 ![myWiring](./img/IMG_2590.jpeg)

+*The load cell is connected to most HX711 modules as follows:  
+E+ red  
+E- black  
+A- white  
+A+ green*
+
 ## Software Dependencies

 ### ESP32 Libraries
--- a/html/.DS_Store
+++ b/html/.DS_Store
--- a/html/bambu_credentials.json
+++ b/html/bambu_credentials.json
@@ -0,0 +1 @@
+{"bambu_ip": "192.168.1.14", "bambu_accesscode": "22772584", "bambu_serialnr": "01P00C492600230","autoSendToBambu":true,"autoSendTime": 60}
--- a/html/rfid.html
+++ b/html/rfid.html
@@ -139,6 +139,18 @@
                <p id="nfcInfo" class="nfc-status"></p>
                <button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button>
            </div>
+
+            <div class="feature-box">
+                <h2>Spoolman Locations</h2>
+                <label for="locationSelect">Location:</label>
+                <div style="display: flex; justify-content: space-between; align-items: center;">
+                    <select id="locationSelect" class="styled-select">
+                        <option value="">Please choose...</option>
+                    </select>
+                </div>
+                <p id="nfcInfoLocation" class="nfc-status"></p>
+                <button id="writeLocationNfcButton" class="btn btn-primary hidden" onclick="writeLocationNfcTag()">Write Location Tag</button>
+            </div>
        </div>

    </div>
--- a/html/rfid.js
+++ b/html/rfid.js
@@ -7,6 +7,7 @@ let heartbeatTimer = null;
 let lastHeartbeatResponse = Date.now();
 const HEARTBEAT_TIMEOUT = 20000;
 let reconnectTimer = null;
+let spoolDetected = false;

 // WebSocket Funktionen
 function startHeartbeat() {
@@ -508,12 +509,15 @@ function updateNfcStatusIndicator(data) {
    if (data.found === 0) {
        // Kein NFC Tag gefunden
        indicator.className = 'status-circle';
+        spoolDetected = false;
    } else if (data.found === 1) {
        // NFC Tag erfolgreich gelesen
        indicator.className = 'status-circle success';
+        spoolDetected = true;
    } else {
        // Fehler beim Lesen
        indicator.className = 'status-circle error';
+        spoolDetected = true;
    }
 }

@@ -555,7 +559,10 @@ function updateNfcData(data) {
    }

    // HTML für die Datenanzeige erstellen
-    let html = `
+    let html = "";
+
+    if(data.sm_id){
+        html = `
        <div class="nfc-card-data" style="margin-top: 10px;">
            <p><strong>Brand:</strong> ${data.brand || 'N/A'}</p>
            <p><strong>Type:</strong> ${data.type || 'N/A'} ${data.color_hex ? `<span style="
@@ -568,10 +575,27 @@ function updateNfcData(data) {
                border-radius: 3px;
                margin-left: 5px;
            "></span>` : ''}</p>
-    `;
+        `;
+
+        // Spoolman ID anzeigen
+        html += `<p><strong>Spoolman ID:</strong> ${data.sm_id} (<a href="${spoolmanUrl}/spool/show/${data.sm_id}">Open in Spoolman</a>)</p>`;
+     }
+     else if(data.location)
+     {
+        html = `
+        <div class="nfc-card-data" style="margin-top: 10px;">
+            <p><strong>Location:</strong> ${data.location || 'N/A'}</p>
+        `;
+     }
+     else
+     {
+        html = `
+        <div class="nfc-card-data" style="margin-top: 10px;">
+            <p><strong>Unknown tag</strong></p>
+        `;
+     }
+
    
-    // Spoolman ID anzeigen
-    html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;

    // Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns
    if (data.sm_id) {
@@ -598,65 +622,112 @@ function updateNfcData(data) {
 }

 function writeNfcTag() {
-    const selectedText = document.getElementById("selected-filament").textContent;
-    if (selectedText === "Please choose...") {
-        alert('Please select a Spool first.');
-        return;
+    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
+        const selectedText = document.getElementById("selected-filament").textContent;
+        if (selectedText === "Please choose...") {
+            alert('Please select a Spool first.');
+            return;
+        }
+
+        const spoolsData = window.getSpoolData();
+        const selectedSpool = spoolsData.find(spool => 
+            `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
+        );
+
+        if (!selectedSpool) {
+            alert('Ausgewählte Spule konnte nicht gefunden werden.');
+            return;
+        }
+
+        // Temperaturwerte korrekt extrahieren
+        let minTemp = "175";
+        let maxTemp = "275";
+        
+        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]);
+        }
+
+        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+        const nfcData = {
+            color_hex: selectedSpool.filament.color_hex || "FFFFFF",
+            type: selectedSpool.filament.material,
+            min_temp: minTemp,
+            max_temp: maxTemp,
+            brand: selectedSpool.filament.vendor.name,
+            sm_id: String(selectedSpool.id) // Konvertiere zu String
+        };
+
+        if (socket?.readyState === WebSocket.OPEN) {
+            const writeButton = document.getElementById("writeNfcButton");
+            writeButton.classList.add("writing");
+            writeButton.textContent = "Writing";
+            socket.send(JSON.stringify({
+                type: 'writeNfcTag',
+                tagType: 'spool',
+                payload: nfcData
+            }));
+        } else {
+            alert('Not connected to Server. Please check connection.');
+        }
    }
+}

-    const spoolsData = window.getSpoolData();
-    const selectedSpool = spoolsData.find(spool => 
-        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
-    );
+function writeLocationNfcTag() {
+    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
+        const selectedText = document.getElementById("locationSelect").value;
+        if (selectedText === "Please choose...") {
+            alert('Please select a location first.');
+            return;
+        }
+        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+        const nfcData = {
+            location: String(selectedText)
+        };

-    if (!selectedSpool) {
-        alert('Ausgewählte Spule konnte nicht gefunden werden.');
-        return;
-    }

-    // Temperaturwerte korrekt extrahieren
-    let minTemp = "175";
-    let maxTemp = "275";
-    
-    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]);
-    }
-
-    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
-    const nfcData = {
-        color_hex: selectedSpool.filament.color_hex || "FFFFFF",
-        type: selectedSpool.filament.material,
-        min_temp: minTemp,
-        max_temp: maxTemp,
-        brand: selectedSpool.filament.vendor.name,
-        sm_id: String(selectedSpool.id) // Konvertiere zu String
-    };
-
-    if (socket?.readyState === WebSocket.OPEN) {
-        const writeButton = document.getElementById("writeNfcButton");
-        writeButton.classList.add("writing");
-        writeButton.textContent = "Writing";
-        socket.send(JSON.stringify({
-            type: 'writeNfcTag',
-            payload: nfcData
-        }));
-    } else {
-        alert('Not connected to Server. Please check connection.');
+        if (socket?.readyState === WebSocket.OPEN) {
+            const writeButton = document.getElementById("writeLocationNfcButton");
+            writeButton.classList.add("writing");
+            writeButton.textContent = "Writing";
+            socket.send(JSON.stringify({
+                type: 'writeNfcTag',
+                tagType: 'location',
+                payload: nfcData
+            }));
+        } else {
+            alert('Not connected to Server. Please check connection.');
+        }
    }
 }

 function handleWriteNfcTagResponse(success) {
    const writeButton = document.getElementById("writeNfcButton");
-    writeButton.classList.remove("writing");
-    writeButton.classList.add(success ? "success" : "error");
-    writeButton.textContent = success ? "Write success" : "Write failed";
+    const writeLocationButton = document.getElementById("writeLocationNfcButton");
+    if(writeButton.classList.contains("writing")){
+        writeButton.classList.remove("writing");
+        writeButton.classList.add(success ? "success" : "error");
+        writeButton.textContent = success ? "Write success" : "Write failed";
+
+        setTimeout(() => {
+            writeButton.classList.remove("success", "error");
+            writeButton.textContent = "Write Tag";
+        }, 5000);
+    }
+
+    if(writeLocationButton.classList.contains("writing")){
+        writeLocationButton.classList.remove("writing");
+        writeLocationButton.classList.add(success ? "success" : "error");
+        writeLocationButton.textContent = success ? "Write success" : "Write failed";
+
+        setTimeout(() => {
+            writeLocationButton.classList.remove("success", "error");
+            writeLocationButton.textContent = "Write Location Tag";
+        }, 5000);
+    }
+
    
-    setTimeout(() => {
-        writeButton.classList.remove("success", "error");
-        writeButton.textContent = "Write Tag";
-    }, 5000);
 }

 function showNotification(message, isSuccess) {
--- a/html/rfid_bambu.html
+++ b/html/rfid_bambu.html
@@ -139,6 +139,18 @@
                <p id="nfcInfo" class="nfc-status"></p>
                <button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button>
            </div>
+
+            <div class="feature-box">
+                <h2>Spoolman Locations</h2>
+                <label for="locationSelect">Location:</label>
+                <div style="display: flex; justify-content: space-between; align-items: center;">
+                    <select id="locationSelect" class="styled-select">
+                        <option value="">Please choose...</option>
+                    </select>
+                </div>
+                <p id="nfcInfoLocation" class="nfc-status"></p>
+                <button id="writeLocationNfcButton" class="btn btn-primary hidden" onclick="writeLocationNfcTag()">Write Location Tag</button>
+            </div>
        </div>

        <!-- Rechte Spalte -->
--- a/html/spoolman.html
+++ b/html/spoolman.html
@@ -146,20 +146,20 @@

        <div class="card">
            <div class="card-body">
-                <h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5>
-                <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
-                <h5 class="card-title">If you want to enable sending Spool to Spoolman Octoprint Plugin:</h5>
+                <h5 class="card-title">Set URL/IP to your Spoolman instance</h5>
+                <input type="text" id="spoolmanUrl" onkeydown="if(event.keyCode == 13) document.getElementById('btnSaveSpoolmanUrl').click()" placeholder="http://ip-or-url-of-your-spoolman-instance:port">
+                <h5 class="card-title">If you want to enable sending the spool to the 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="spoolmanOctoUrl" placeholder="http://ip-or-url-of-your-octoprint-instance:port" value="{{spoolmanOctoUrl}}">
                        <input type="text" id="spoolmanOctoToken" placeholder="Your Octoprint Token" value="{{spoolmanOctoToken}}">
                    </p>
                </div>
                
-                <button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
+                <button id="btnSaveSpoolmanUrl" onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
                <p id="statusMessage"></p>
            </div>
        </div>
@@ -169,16 +169,16 @@
                <h5 class="card-title">Bambu Lab Printer Credentials</h5>
                <div class="bambu-settings">
                    <div class="input-group">
-                        <label for="bambuIp">Bambu Drucker IP-Adresse:</label>
+                        <label for="bambuIp">Bambu Printer IP Address:</label>
                        <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}">
                    </div>
                    <div class="input-group">
-                        <label for="bambuSerial">Drucker Seriennummer:</label>
+                        <label for="bambuSerial">Printer Serial Number:</label>
                        <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}">
                    </div>
                    <div class="input-group">
                        <label for="bambuCode">Access Code:</label>
-                        <input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}">
+                        <input type="text" id="bambuCode" placeholder="Access Code of the printer" value="{{bambuCode}}">
                    </div>
                    <hr>
                    <p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p>
--- a/html/spoolman.js
+++ b/html/spoolman.js
@@ -1,6 +1,7 @@
 // Globale Variablen
 let spoolmanUrl = '';
 let spoolsData = [];
+let locationData = [];

 // Hilfsfunktionen für Datenmanipulation
 function processSpoolData(data) {
@@ -133,6 +134,26 @@ function populateVendorDropdown(data, selectedSmId = null) {
    }
 }

+// Dropdown-Funktionen
+function populateLocationDropdown(data) {
+    const locationSelect = document.getElementById("locationSelect");
+    if (!locationSelect) {
+        console.error('locationSelect Element nicht gefunden');
+        return;
+    }
+
+    locationSelect.innerHTML = '<option value="">Bitte wählen...</option>';
+    // Dropdown mit gefilterten Herstellern befüllen - alphabetisch sortiert
+    Object.entries(data)
+        .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB)) // Sort vendors alphabetically by name
+        .forEach(([id, name]) => {
+            const option = document.createElement("option");
+            option.value = name;
+            option.textContent = name;
+            locationSelect.appendChild(option);
+        });
+}
+
 function updateFilamentDropdown(selectedSmId = null) {
    const vendorId = document.getElementById("vendorSelect").value;
    const dropdownContentInner = document.getElementById("filament-dropdown-content");
@@ -208,6 +229,13 @@ function updateFilamentDropdown(selectedSmId = null) {
    }
 }

+function updateLocationSelect(){
+    const writeLocationNfcButton = document.getElementById('writeLocationNfcButton');
+    if(writeLocationNfcButton){
+        writeLocationNfcButton.classList.remove("hidden");
+    }
+}
+
 function selectFilament(spool) {
    const selectedColor = document.getElementById("selected-color");
    const selectedText = document.getElementById("selected-filament");
@@ -265,6 +293,14 @@ async function initSpoolman() {
        document.dispatchEvent(new CustomEvent('spoolDataLoaded', { 
            detail: spoolsData 
        }));
+        
+        locationData = await fetchLocationData();
+        
+        document.dispatchEvent(new CustomEvent('locationDataLoaded', { 
+            detail: locationData 
+        }));
+
+
    } catch (error) {
        console.error('Fehler beim Initialisieren von Spoolman:', error);
        document.dispatchEvent(new CustomEvent('spoolmanError', { 
@@ -292,6 +328,25 @@ async function fetchSpoolData() {
    }
 }

+async function fetchLocationData() {
+    try {
+        if (!spoolmanUrl) {
+            throw new Error('Spoolman URL ist nicht initialisiert');
+        }
+        
+        const response = await fetch(`${spoolmanUrl}/api/v1/location`);
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        
+        const data = await response.json();
+        return data;
+    } catch (error) {
+        console.error('Fehler beim Abrufen der Location-Daten:', error);
+        return [];
+    }
+}
+
 // Event Listener
 document.addEventListener('DOMContentLoaded', () => {
    initSpoolman();
@@ -301,6 +356,11 @@ document.addEventListener('DOMContentLoaded', () => {
        vendorSelect.addEventListener('change', () => updateFilamentDropdown());
    }

+    const locationSelect = document.getElementById('locationSelect');
+    if (locationSelect) {
+        locationSelect.addEventListener('change', () => updateLocationSelect());
+    }
+    
    const onlyWithoutSmId = document.getElementById('onlyWithoutSmId');
    if (onlyWithoutSmId) {
        onlyWithoutSmId.addEventListener('change', () => {
@@ -313,6 +373,10 @@ document.addEventListener('DOMContentLoaded', () => {
        populateVendorDropdown(event.detail);
    });

+    document.addEventListener('locationDataLoaded', (event) => {
+        populateLocationDropdown(event.detail);
+    });
+    
    window.onclick = function(event) {
        if (!event.target.closest('.custom-dropdown')) {
            const dropdowns = document.getElementsByClassName("dropdown-content");
@@ -342,6 +406,7 @@ window.getSpoolData = () => spoolsData;
 window.setSpoolData = (data) => { spoolsData = data; };
 window.reloadSpoolData = initSpoolman;
 window.populateVendorDropdown = populateVendorDropdown;
+window.populateLocationDropdown = populateLocationDropdown;
 window.updateFilamentDropdown = updateFilamentDropdown;
 window.toggleFilamentDropdown = () => {
    const content = document.getElementById("filament-dropdown-content");
--- a/html/spoolman_url.json
+++ b/html/spoolman_url.json
@@ -0,0 +1 @@
+{"url": "http://192.168.1.5:7912", "octoEnabled": true, "octoUrl": "http://192.168.1.17:5001", "octoToken": "O5zZ58mXRAyeGpVEj2ZZj-UPAPqJ2N7JgtD36mw1M4g"}
--- a/html/style.css
+++ b/html/style.css
@@ -971,31 +971,35 @@ input[type="submit"]:disabled,
 }

 /* Schreib-Button */
-#writeNfcButton {
+#writeNfcButton, #writeLocationNfcButton {
    background-color: #007bff;
    color: white;
    transition: background-color 0.3s, color 0.3s;
    width: 160px;
 }

-#writeNfcButton.writing {
+#writeNfcButton.writing, #writeLocationNfcButton.writing {
    background-color: #ffc107;
    color: black;
    width: 160px;
 }

-#writeNfcButton.success {
+#writeNfcButton.success, #writeLocationNfcButton.success {
    background-color: #28a745;
    color: white;
    width: 160px;
 }

-#writeNfcButton.error {
+#writeNfcButton.error, #writeLocationNfcButton.error {
    background-color: #dc3545;
    color: white;
    width: 160px;
 }

+#writeLocationNfcButton{
+    width: 250px;
+}
+
@keyframes dots {
    0% { content: ""; }
    33% { content: "."; }
@@ -1003,7 +1007,7 @@ input[type="submit"]:disabled,
    100% { content: "..."; }
 }

-#writeNfcButton.writing::after {
+#writeNfcButton.writing::after, #writeLocationNfcButton.writing::after {
    content: "...";
    animation: dots 1s steps(3, end) infinite;
 }
--- a/html/upgrade.html
+++ b/html/upgrade.html
@@ -57,7 +57,7 @@
        <div class="update-options">
            <div class="update-section">
                <h2>Firmware Update</h2>
-                <p>Upload a new firmware file (filaman_*.bin)</p>
+                <p>Upload a new firmware file (upgrade_filaman_firmware_*.bin)</p>
                <div class="update-form">
                    <form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
                        <input type='file' name='update' accept='.bin' required>
@@ -68,7 +68,7 @@

            <div class="update-section">
                <h2>Webpage Update</h2>
-                <p>Upload a new webpage file (webpage_*.bin)</p>
+                <p>Upload a new webpage file (upgrade_filaman_website_*.bin)</p>
                <div class="update-form">
                    <form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
                        <input type='file' name='update' accept='.bin' required>
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.5.3"
+version = "1.5.11-beta2"
 to_old_version = "1.5.0"

 ##
@@ -18,6 +18,7 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
+#monitor_port = /dev/cu.usbmodem01

 lib_deps =
    tzapu/WiFiManager @ ^2.0.17
@@ -51,6 +52,7 @@ build_flags =
    -mtext-section-literals
    -DVERSION=\"${common.version}\"
    -DTOOLDVERSION=\"${common.to_old_version}\"
+    #-DENABLE_HEAP_DEBUGGING
    -DASYNCWEBSERVER_REGEX
    #-DCORE_DEBUG_LEVEL=3
    -DCONFIG_ARDUHAL_LOG_COLORS=1
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -2,19 +2,32 @@
 #include <HTTPClient.h>
 #include <ArduinoJson.h>
 #include "commonFS.h"
+#include <Preferences.h>
+#include "debug.h"
+#include "scale.h"

-volatile spoolmanApiStateType spoolmanApiState = API_INIT;
+volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
 //bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
+bool sendOctoUpdate = false;
 String octoUrl = "";
 String octoToken = "";
+uint16_t remainingWeight = 0;
+bool spoolmanConnected = false;
+bool spoolmanExtraFieldsChecked = false;
+TaskHandle_t* apiTask;

 struct SendToApiParams {
+    SpoolmanApiRequestType requestType;
    String httpType;
    String spoolsUrl;
    String updatePayload;
    String octoToken;
+    // Weight update parameters for sequential execution
+    bool triggerWeightUpdate;
+    String spoolIdForWeight;
+    uint16_t weightValue;
 };

 JsonDocument fetchSingleSpoolInfo(int spoolId) {
@@ -86,14 +99,25 @@ JsonDocument fetchSingleSpoolInfo(int spoolId) {
 }

 void sendToApi(void *parameter) {
+    HEAP_DEBUG_MESSAGE("sendToApi begin");
+
+    // Wait until API is IDLE
+    while(spoolmanApiState != API_IDLE){
+        Serial.println("Waiting!");
+        yield();
+    }
    spoolmanApiState = API_TRANSMITTING;
    SendToApiParams* params = (SendToApiParams*)parameter;

-    // Extrahiere die Werte
+    // Extract values including weight update parameters
+    SpoolmanApiRequestType requestType = params->requestType;
    String httpType = params->httpType;
    String spoolsUrl = params->spoolsUrl;
    String updatePayload = params->updatePayload;
    String octoToken = params->octoToken;
+    bool triggerWeightUpdate = params->triggerWeightUpdate;
+    String spoolIdForWeight = params->spoolIdForWeight;
+    uint16_t weightValue = params->weightValue;    

    HTTPClient http;
    http.setReuse(false);
@@ -118,20 +142,103 @@ void sendToApi(void *parameter) {
            Serial.print("Fehler beim Parsen der JSON-Antwort: ");
            Serial.println(error.c_str());
        } else {
-            if (httpType == "PUT") {
-                uint16_t remaining_weight = doc["remaining_weight"].as<float>();
+            switch(requestType){
+            case API_REQUEST_SPOOL_WEIGHT_UPDATE:
+                remainingWeight = doc["remaining_weight"].as<uint16_t>();
                Serial.print("Aktuelles Gewicht: ");
-                Serial.println(remaining_weight);
-                oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                Serial.println(remainingWeight);
+                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                if(!octoEnabled){
+                    // TBD: Do not use Strings...
+                    oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
+                    remainingWeight = 0;
+                }else{
+                    // ocoto is enabled, trigger octo update
+                    sendOctoUpdate = true;
+                }
+                break;
+            case API_REQUEST_SPOOL_LOCATION_UPDATE:
+                oledShowProgressBar(1, 1, "Loc. Tag", "Done!");
+                break;
+            case API_REQUEST_SPOOL_TAG_ID_UPDATE:
+                oledShowProgressBar(1, 1, "Write Tag", "Done!");
+                break;
+            case API_REQUEST_OCTO_SPOOL_UPDATE:
+                // TBD: Do not use Strings...
+                oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
+                remainingWeight = 0;
+                break;
+            }
+        }
+        doc.clear();
+
+        // Execute weight update if requested and tag update was successful
+        if (triggerWeightUpdate && requestType == API_REQUEST_SPOOL_TAG_ID_UPDATE && weightValue > 10) {
+            Serial.println("Executing weight update after successful tag update");
+            
+            // Prepare weight update request
+            String weightUrl = spoolmanUrl + apiUrl + "/spool/" + spoolIdForWeight + "/measure";
+            JsonDocument weightDoc;
+            weightDoc["weight"] = weightValue;
+            
+            String weightPayload;
+            serializeJson(weightDoc, weightPayload);
+            
+            Serial.print("Weight update URL: ");
+            Serial.println(weightUrl);
+            Serial.print("Weight update payload: ");
+            Serial.println(weightPayload);
+
+            // Execute weight update
+            http.begin(weightUrl);
+            http.addHeader("Content-Type", "application/json");
+            
+            int weightHttpCode = http.PUT(weightPayload);
+            
+            if (weightHttpCode == HTTP_CODE_OK) {
+                Serial.println("Weight update successful");
+                String weightResponse = http.getString();
+                JsonDocument weightResponseDoc;
+                DeserializationError weightError = deserializeJson(weightResponseDoc, weightResponse);
+                
+                if (!weightError) {
+                    remainingWeight = weightResponseDoc["remaining_weight"].as<uint16_t>();
+                    Serial.print("Updated weight: ");
+                    Serial.println(remainingWeight);
+                    
+                    if (!octoEnabled) {
+                        oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
+                        remainingWeight = 0;
+                    } else {
+                        sendOctoUpdate = true;
+                    }
+                }
+                weightResponseDoc.clear();
+            } else {
+                Serial.print("Weight update failed with HTTP code: ");
+                Serial.println(weightHttpCode);
+                oledShowProgressBar(1, 1, "Failure!", "Weight update");
            }
            
-            vTaskDelay(3000 / portTICK_PERIOD_MS);
-            doc.clear();
+            weightDoc.clear();
        }
-
    } else {
+        switch(requestType){
+        case API_REQUEST_SPOOL_WEIGHT_UPDATE:
+        case API_REQUEST_SPOOL_LOCATION_UPDATE:
+        case API_REQUEST_SPOOL_TAG_ID_UPDATE:
+            oledShowProgressBar(1, 1, "Failure!", "Spoolman update");
+            break;
+        case API_REQUEST_OCTO_SPOOL_UPDATE:
+            oledShowProgressBar(1, 1, "Failure!", "Octoprint update");
+            break;
+        case API_REQUEST_BAMBU_UPDATE:
+            oledShowProgressBar(1, 1, "Failure!", "Bambu update");
+            break;
+        }
        Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
-        oledShowMessage("Spoolman update failed");
+
+        // TBD: really required?
        vTaskDelay(2000 / portTICK_PERIOD_MS);
    }

@@ -140,11 +247,14 @@ void sendToApi(void *parameter) {

    // Speicher freigeben
    delete params;
-    vTaskDelete(NULL);
+    HEAP_DEBUG_MESSAGE("sendToApi end");
    spoolmanApiState = API_IDLE;
+    vTaskDelete(NULL);
 }

 bool updateSpoolTagId(String uidString, const char* payload) {
+    oledShowProgressBar(2, 3, "Write Tag", "Update Spoolman");
+
    JsonDocument doc;
    DeserializationError error = deserializeJson(doc, payload);
    
@@ -160,10 +270,13 @@ bool updateSpoolTagId(String uidString, const char* payload) {
        return false;
    }

-    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + doc["sm_id"].as<String>();
+    String spoolId = doc["sm_id"].as<String>();
+    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
    Serial.print("Update Spule mit URL: ");
    Serial.println(spoolsUrl);
    
+    doc.clear();
+
    // Update Payload erstellen
    JsonDocument updateDoc;
    updateDoc["extra"]["nfc_id"] = "\""+uidString+"\"";
@@ -178,29 +291,37 @@ bool updateSpoolTagId(String uidString, const char* payload) {
        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
        return false;
    }
+    params->requestType = API_REQUEST_SPOOL_TAG_ID_UPDATE;
    params->httpType = "PATCH";
    params->spoolsUrl = spoolsUrl;
    params->updatePayload = updatePayload;
    
-    // Erstelle die Task
+    // Add weight update parameters for sequential execution
+    params->triggerWeightUpdate = (weight > 10);
+    params->spoolIdForWeight = spoolId;
+    params->weightValue = weight;
+
+    // Erstelle die Task mit erhöhter Stackgröße für zusätzliche HTTP-Anfrage
    BaseType_t result = xTaskCreate(
        sendToApi,                // Task-Funktion
        "SendToApiTask",          // Task-Name
-        6144,                     // Stackgröße in Bytes
+        8192,                     // Erhöhte Stackgröße für zusätzliche HTTP-Anfrage
        (void*)params,            // Parameter
        0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                   // Task-Handle (nicht benötigt)
    );

    updateDoc.clear();

-    // Update Spool weight
-    if (weight > 10) updateSpoolWeight(doc["sm_id"].as<String>(), weight);
+    // Update Spool weight now handled sequentially in sendToApi task
+    // to prevent parallel API access issues

    return true;
 }

 uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
+    HEAP_DEBUG_MESSAGE("updateSpoolWeight begin");
+    oledShowProgressBar(3, octoEnabled?5:4, "Spool Tag", "Spoolman update");
    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId + "/measure";
    Serial.print("Update Spule mit URL: ");
    Serial.println(spoolsUrl);
@@ -216,9 +337,11 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {

    SendToApiParams* params = new SendToApiParams();
    if (params == nullptr) {
+        // TBD: reset ESP instead of showing a message
        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
        return 0;
    }
+    params->requestType = API_REQUEST_SPOOL_WEIGHT_UPDATE;
    params->httpType = "PUT";
    params->spoolsUrl = spoolsUrl;
    params->updatePayload = updatePayload;
@@ -230,15 +353,67 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
        6144,                     // Stackgröße in Bytes
        (void*)params,            // Parameter
        0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
    );

    updateDoc.clear();
+    HEAP_DEBUG_MESSAGE("updateSpoolWeight end");

    return 1;
 }

+uint8_t updateSpoolLocation(String spoolId, String location){
+    HEAP_DEBUG_MESSAGE("updateSpoolLocation begin");
+
+    oledShowProgressBar(3, octoEnabled?5:4, "Loc. Tag", "Spoolman update");
+
+    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
+    Serial.print("Update Spule mit URL: ");
+    Serial.println(spoolsUrl);
+
+    // Update Payload erstellen
+    JsonDocument updateDoc;
+    updateDoc["location"] = location;
+    
+    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 0;
+    }
+    params->requestType = API_REQUEST_SPOOL_LOCATION_UPDATE;
+    params->httpType = "PATCH";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = updatePayload;
+
+
+    if(apiTask == nullptr){
+        // Erstelle die Task
+        BaseType_t result = xTaskCreate(
+            sendToApi,                // Task-Funktion
+            "SendToApiTask",          // Task-Name
+            6144,                     // Stackgröße in Bytes
+            (void*)params,            // Parameter
+            0,                        // Priorität
+            apiTask                   // Task-Handle
+        );
+    }else{
+        Serial.println("Not spawning new task, API still active!");
+    }
+
+    updateDoc.clear();
+
+    HEAP_DEBUG_MESSAGE("updateSpoolLocation end");
+    return 1;
+}
+
 bool updateSpoolOcto(int spoolId) {
+    oledShowProgressBar(4, octoEnabled?5:4, "Spool Tag", "Octoprint update");
+
    String spoolsUrl = octoUrl + "/plugin/Spoolman/selectSpool";
    Serial.print("Update Spule in Octoprint mit URL: ");
    Serial.println(spoolsUrl);
@@ -257,6 +432,7 @@ bool updateSpoolOcto(int spoolId) {
        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
        return false;
    }
+    params->requestType = API_REQUEST_OCTO_SPOOL_UPDATE;
    params->httpType = "POST";
    params->spoolsUrl = spoolsUrl;
    params->updatePayload = updatePayload;
@@ -269,7 +445,7 @@ bool updateSpoolOcto(int spoolId) {
        6144,                     // Stackgröße in Bytes
        (void*)params,            // Parameter
        0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
    );

    updateDoc.clear();
@@ -298,6 +474,10 @@ bool updateSpoolBambuData(String payload) {

    String updatePayload;
    serializeJson(updateDoc, updatePayload);
+
+    doc.clear();
+    updateDoc.clear();
+
    Serial.print("Update Payload: ");
    Serial.println(updatePayload);

@@ -306,6 +486,7 @@ bool updateSpoolBambuData(String payload) {
        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
        return false;
    }
+    params->requestType = API_REQUEST_BAMBU_UPDATE;
    params->httpType = "PATCH";
    params->spoolsUrl = spoolsUrl;
    params->updatePayload = updatePayload;
@@ -317,7 +498,7 @@ bool updateSpoolBambuData(String payload) {
        6144,                     // Stackgröße in Bytes
        (void*)params,            // Parameter
        0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
    );

    return true;
@@ -325,245 +506,266 @@ bool updateSpoolBambuData(String payload) {

 // #### Spoolman init
 bool checkSpoolmanExtraFields() {
-    HTTPClient http;
-    String checkUrls[] = {
-        spoolmanUrl + apiUrl + "/field/spool",
-        spoolmanUrl + apiUrl + "/field/filament"
-    };
+    // Only check extra fields if they have not been checked before
+    if(!spoolmanExtraFieldsChecked){
+        HTTPClient http;
+        String checkUrls[] = {
+            spoolmanUrl + apiUrl + "/field/spool",
+            spoolmanUrl + apiUrl + "/field/filament"
+        };

-    String spoolExtra[] = {
-        "nfc_id"
-    };
+        String spoolExtra[] = {
+            "nfc_id"
+        };

-    String filamentExtra[] = {
-        "nozzle_temperature",
-        "price_meter",
-        "price_gramm",
-        "bambu_setting_id",
-        "bambu_cali_id",
-        "bambu_idx",
-        "bambu_k",
-        "bambu_flow_ratio",
-        "bambu_max_volspeed"
-    };
+        String filamentExtra[] = {
+            "nozzle_temperature",
+            "price_meter",
+            "price_gramm",
+            "bambu_setting_id",
+            "bambu_cali_id",
+            "bambu_idx",
+            "bambu_k",
+            "bambu_flow_ratio",
+            "bambu_max_volspeed"
+        };

-    String spoolExtraFields[] = {
-        "{\"name\": \"NFC ID\","
-        "\"key\": \"nfc_id\","
-        "\"field_type\": \"text\"}"
-    };
+        String spoolExtraFields[] = {
+            "{\"name\": \"NFC ID\","
+            "\"key\": \"nfc_id\","
+            "\"field_type\": \"text\"}"
+        };

-    String filamentExtraFields[] = {
-        "{\"name\": \"Nozzle Temp\","
-        "\"unit\": \"°C\","
-        "\"field_type\": \"integer_range\","
-        "\"default_value\": \"[190,230]\","
-        "\"key\": \"nozzle_temperature\"}",
+        String filamentExtraFields[] = {
+            "{\"name\": \"Nozzle Temp\","
+            "\"unit\": \"°C\","
+            "\"field_type\": \"integer_range\","
+            "\"default_value\": \"[190,230]\","
+            "\"key\": \"nozzle_temperature\"}",

-        "{\"name\": \"Price/m\","
-        "\"unit\": \"€\","
-        "\"field_type\": \"float\","
-        "\"key\": \"price_meter\"}",
+            "{\"name\": \"Price/m\","
+            "\"unit\": \"€\","
+            "\"field_type\": \"float\","
+            "\"key\": \"price_meter\"}",
            
-        "{\"name\": \"Price/g\","
-        "\"unit\": \"€\","
-        "\"field_type\": \"float\","
-        "\"key\": \"price_gramm\"}",
+            "{\"name\": \"Price/g\","
+            "\"unit\": \"€\","
+            "\"field_type\": \"float\","
+            "\"key\": \"price_gramm\"}",

-        "{\"name\": \"Bambu Setting ID\","
-        "\"field_type\": \"text\","
-        "\"key\": \"bambu_setting_id\"}",
+            "{\"name\": \"Bambu Setting ID\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_setting_id\"}",

-        "{\"name\": \"Bambu Cali ID\","
-        "\"field_type\": \"text\","
-        "\"key\": \"bambu_cali_id\"}",
+            "{\"name\": \"Bambu Cali ID\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_cali_id\"}",

-        "{\"name\": \"Bambu Filament IDX\","
-        "\"field_type\": \"text\","
-        "\"key\": \"bambu_idx\"}",
+            "{\"name\": \"Bambu Filament IDX\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_idx\"}",

-        "{\"name\": \"Bambu k\","
-        "\"field_type\": \"float\","
-        "\"key\": \"bambu_k\"}",
+            "{\"name\": \"Bambu k\","
+            "\"field_type\": \"float\","
+            "\"key\": \"bambu_k\"}",

-        "{\"name\": \"Bambu Flow Ratio\","
-        "\"field_type\": \"float\","
-        "\"key\": \"bambu_flow_ratio\"}",
+            "{\"name\": \"Bambu Flow Ratio\","
+            "\"field_type\": \"float\","
+            "\"key\": \"bambu_flow_ratio\"}",

-        "{\"name\": \"Bambu Max Vol. Speed\","
-        "\"unit\": \"mm3/s\","
-        "\"field_type\": \"integer\","
-        "\"default_value\": \"12\","
-        "\"key\": \"bambu_max_volspeed\"}"
-    };
+            "{\"name\": \"Bambu Max Vol. Speed\","
+            "\"unit\": \"mm3/s\","
+            "\"field_type\": \"integer\","
+            "\"default_value\": \"12\","
+            "\"key\": \"bambu_max_volspeed\"}"
+        };

-    Serial.println("Überprüfe Extrafelder...");
+        Serial.println("Überprüfe Extrafelder...");

-    int urlLength = sizeof(checkUrls) / sizeof(checkUrls[0]);
+        int urlLength = sizeof(checkUrls) / sizeof(checkUrls[0]);

-    for (uint8_t i = 0; i < urlLength; i++) {
-        Serial.println();
-        Serial.println("-------- Prüfe Felder für "+checkUrls[i]+" --------");
-        http.begin(checkUrls[i]);
-        int httpCode = http.GET();
+        for (uint8_t i = 0; i < urlLength; i++) {
+            Serial.println();
+            Serial.println("-------- Prüfe Felder für "+checkUrls[i]+" --------");
+            http.begin(checkUrls[i]);
+            int httpCode = http.GET();
        
-        if (httpCode == HTTP_CODE_OK) {
-            String payload = http.getString();
-            JsonDocument doc;
-            DeserializationError error = deserializeJson(doc, payload);
-            if (!error) {
-                String* extraFields;
-                String* extraFieldData;
-                u16_t extraLength;
+            if (httpCode == HTTP_CODE_OK) {
+                String payload = http.getString();
+                JsonDocument doc;
+                DeserializationError error = deserializeJson(doc, payload);
+                if (!error) {
+                    String* extraFields;
+                    String* extraFieldData;
+                    u16_t extraLength;

-                if (i == 0) {
-                    extraFields = spoolExtra;
-                    extraFieldData = spoolExtraFields;
-                    extraLength = sizeof(spoolExtra) / sizeof(spoolExtra[0]);
-                } else {
-                    extraFields = filamentExtra;
-                    extraFieldData = filamentExtraFields;
-                    extraLength = sizeof(filamentExtra) / sizeof(filamentExtra[0]);
-                }
-
-                for (uint8_t s = 0; s < extraLength; s++) {
-                    bool found = false;
-                    for (JsonObject field : doc.as<JsonArray>()) {
-                        if (field["key"].is<String>() && field["key"] == extraFields[s]) {
-                            Serial.println("Feld gefunden: " + extraFields[s]);
-                            found = true;
-                            break;
-                        }
+                    if (i == 0) {
+                        extraFields = spoolExtra;
+                        extraFieldData = spoolExtraFields;
+                        extraLength = sizeof(spoolExtra) / sizeof(spoolExtra[0]);
+                    } else {
+                        extraFields = filamentExtra;
+                        extraFieldData = filamentExtraFields;
+                        extraLength = sizeof(filamentExtra) / sizeof(filamentExtra[0]);
                    }
-                    if (!found) {
-                        Serial.println("Feld nicht gefunden: " + extraFields[s]);

-                        // Extrafeld hinzufügen
-                        http.begin(checkUrls[i] + "/" + extraFields[s]);
-                        http.addHeader("Content-Type", "application/json");
-                        int httpCode = http.POST(extraFieldData[s]);
+                    for (uint8_t s = 0; s < extraLength; s++) {
+                        bool found = false;
+                        for (JsonObject field : doc.as<JsonArray>()) {
+                            if (field["key"].is<String>() && field["key"] == extraFields[s]) {
+                                Serial.println("Feld gefunden: " + extraFields[s]);
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found) {
+                            Serial.println("Feld nicht gefunden: " + extraFields[s]);

-                         if (httpCode > 0) {
-                            // Antwortscode und -nachricht abrufen
-                            String response = http.getString();
-                            //Serial.println("HTTP-Code: " + String(httpCode));
-                            //Serial.println("Antwort: " + response);
-                            if (httpCode != HTTP_CODE_OK) {
+                            // Extrafeld hinzufügen
+                            http.begin(checkUrls[i] + "/" + extraFields[s]);
+                            http.addHeader("Content-Type", "application/json");
+                            int httpCode = http.POST(extraFieldData[s]);

+                            if (httpCode > 0) {
+                                // Antwortscode und -nachricht abrufen
+                                String response = http.getString();
+                                //Serial.println("HTTP-Code: " + String(httpCode));
+                                //Serial.println("Antwort: " + response);
+                                if (httpCode != HTTP_CODE_OK) {
+
+                                    return false;
+                                }
+                            } else {
+                                // Fehler beim Senden der Anfrage
+                                Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
                                return false;
                            }
-                        } else {
-                            // Fehler beim Senden der Anfrage
-                            Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
-                            return false;
+                            //http.end();
                        }
-                        //http.end();
+                        yield();
+                        vTaskDelay(100 / portTICK_PERIOD_MS);
                    }
-                    yield();
-                    vTaskDelay(100 / portTICK_PERIOD_MS);
                }
+                doc.clear();
            }
        }
+        
+        Serial.println("-------- ENDE Prüfe Felder --------");
+        Serial.println();
+
+        http.end();
+
+        spoolmanExtraFieldsChecked = true;
+        return true;
+    }else{
+        return true;
    }
-    
-    Serial.println("-------- ENDE Prüfe Felder --------");
-    Serial.println();
-
-    http.end();
-
-    return true;
 }

-bool checkSpoolmanInstance(const String& url) {
+bool checkSpoolmanInstance() {
    HTTPClient http;
-    String healthUrl = url + apiUrl + "/health";
+    bool returnValue = false;

-    Serial.print("Überprüfe Spoolman-Instanz unter: ");
-    Serial.println(healthUrl);
+    // Only do the spoolman instance check if there is no active API request going on
+    if(spoolmanApiState == API_IDLE){
+        spoolmanApiState = API_TRANSMITTING;
+        String healthUrl = spoolmanUrl + apiUrl + "/health";

-    http.begin(healthUrl);
-    int httpCode = http.GET();
+        Serial.print("Checking spoolman instance: ");
+        Serial.println(healthUrl);

-    if (httpCode > 0) {
-        if (httpCode == HTTP_CODE_OK) {
-            oledShowMessage("Spoolman available");
-            vTaskDelay(1000 / portTICK_PERIOD_MS);
+        http.begin(healthUrl);
+        int httpCode = http.GET();

-            String payload = http.getString();
-            JsonDocument doc;
-            DeserializationError error = deserializeJson(doc, payload);
-            if (!error && doc["status"].is<String>()) {
-                const char* status = doc["status"];
-                http.end();
+        if (httpCode > 0) {
+            if (httpCode == HTTP_CODE_OK) {
+                String payload = http.getString();
+                JsonDocument doc;
+                DeserializationError error = deserializeJson(doc, payload);
+                if (!error && doc["status"].is<String>()) {
+                    const char* status = doc["status"];
+                    http.end();

-                if (!checkSpoolmanExtraFields()) {
-                    Serial.println("Fehler beim Überprüfen der Extrafelder.");
+                    if (!checkSpoolmanExtraFields()) {
+                        Serial.println("Fehler beim Überprüfen der Extrafelder.");

-                    oledShowMessage("Spoolman Error creating Extrafields");
-                    vTaskDelay(2000 / portTICK_PERIOD_MS);
+                        // TBD
+                        oledShowMessage("Spoolman Error creating Extrafields");
+                        vTaskDelay(2000 / portTICK_PERIOD_MS);
                        
-                    return false;
+                        return false;
+                    }
+
+                    spoolmanApiState = API_IDLE;
+                    oledShowTopRow();
+                    spoolmanConnected = true;
+                    returnValue = strcmp(status, "healthy") == 0;
+                    Serial.print("Spoolman instance is healthy: ");
+                    Serial.println(returnValue);
+                }else{
+                    spoolmanConnected = false;
                }

-                spoolmanApiState = API_IDLE;
-                oledShowTopRow();
-                return strcmp(status, "healthy") == 0;
+                doc.clear();
+            }else{
+                spoolmanConnected = false;
            }
+        } else {
+            spoolmanConnected = false;
+            Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
        }
+        http.end();
+        returnValue = false;
+        spoolmanApiState = API_IDLE;
+    }else{
+        // If the check is skipped, return the previous status
+        Serial.println("Skipping spoolman healthcheck, API is active.");
+        returnValue = spoolmanConnected;
    }
-    http.end();
-    return false;
+    Serial.println("Healthcheck completed!");
+    return returnValue;
 }

-bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk) {
-    if (!checkSpoolmanInstance(url)) return false;
+bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octo_url, const String& octoTk) {
+    Preferences preferences;
+    preferences.begin(NVS_NAMESPACE_API, false); // false = readwrite
+    preferences.putString(NVS_KEY_SPOOLMAN_URL, url);
+    preferences.putBool(NVS_KEY_OCTOPRINT_ENABLED, octoOn);
+    preferences.putString(NVS_KEY_OCTOPRINT_URL, octo_url);
+    preferences.putString(NVS_KEY_OCTOPRINT_TOKEN, octoTk);
+    preferences.end();

-    JsonDocument doc;
-    doc["url"] = 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;
-    }
+    //TBD: This could be handled nicer in the future
+    spoolmanExtraFieldsChecked = false;
    spoolmanUrl = url;
    octoEnabled = octoOn;
-    octoUrl = octoWh;
+    octoUrl = octo_url;
    octoToken = octoTk;

-    return true;
+    return checkSpoolmanInstance();
 }

 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>();
+    Preferences preferences;
+    preferences.begin(NVS_NAMESPACE_API, true);
+    String spoolmanUrl = preferences.getString(NVS_KEY_SPOOLMAN_URL, "");
+    octoEnabled = preferences.getBool(NVS_KEY_OCTOPRINT_ENABLED, false);
+    if(octoEnabled)
+    {
+        octoUrl = preferences.getString(NVS_KEY_OCTOPRINT_URL, "");
+        octoToken = preferences.getString(NVS_KEY_OCTOPRINT_TOKEN, "");
    }
-    Serial.println("Keine gültige Spoolman-URL gefunden.");
-    return "";
+    preferences.end();
+    return spoolmanUrl;
 }

 bool initSpoolman() {
+    oledShowProgressBar(3, 7, DISPLAY_BOOT_TEXT, "Spoolman init");
    spoolmanUrl = loadSpoolmanUrl();
-    spoolmanUrl.trim();
-    if (spoolmanUrl == "") {
-        Serial.println("Keine Spoolman-URL gefunden.");
-        return false;
-    }
    
-    bool success = checkSpoolmanInstance(spoolmanUrl);
+    bool success = checkSpoolmanInstance();
    if (!success) {
-        Serial.println("Spoolman nicht erreichbar.");
+        Serial.println("Spoolman not available");
        return false;
    }

--- a/src/api.h
+++ b/src/api.h
@@ -12,20 +12,31 @@ typedef enum {
    API_TRANSMITTING
 } spoolmanApiStateType;

+typedef enum {
+    API_REQUEST_OCTO_SPOOL_UPDATE,
+    API_REQUEST_BAMBU_UPDATE,
+    API_REQUEST_SPOOL_TAG_ID_UPDATE,
+    API_REQUEST_SPOOL_WEIGHT_UPDATE,
+    API_REQUEST_SPOOL_LOCATION_UPDATE
+} SpoolmanApiRequestType;
+
 extern volatile spoolmanApiStateType spoolmanApiState;
 extern bool spoolman_connected;
 extern String spoolmanUrl;
 extern bool octoEnabled;
+extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
+extern bool spoolmanConnected;

-bool checkSpoolmanInstance(const String& url);
+bool checkSpoolmanInstance();
 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
 bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
+uint8_t updateSpoolLocation(String spoolId, String location);
 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
--- a/src/bambu.cpp
+++ b/src/bambu.cpp
@@ -10,6 +10,7 @@
 #include "esp_task_wdt.h"
 #include "config.h"
 #include "display.h"
+#include <Preferences.h>

 WiFiClient espClient;
 SSLClient sslClient(&espClient);
@@ -17,22 +18,13 @@ PubSubClient client(sslClient);

 TaskHandle_t BambuMqttTask;

-String 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 bambuDisabled = false;

 bool bambu_connected = false;
-bool autoSendToBambu = false;
 int autoSetToBambuSpoolId = 0;

+BambuCredentials bambuCredentials;
+
 // Globale Variablen für AMS-Daten
 int ams_count = 0;
 String amsJsonData;  // Speichert das fertige JSON für WebSocket-Clients
@@ -43,18 +35,22 @@ bool removeBambuCredentials() {
        vTaskDelete(BambuMqttTask);
    }
    
-    if (!removeJsonValue("/bambu_credentials.json")) {
-        Serial.println("Fehler beim Löschen der Bambu-Credentials.");
-        return false;
-    }
+    Preferences preferences;
+    preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
+    preferences.remove(NVS_KEY_BAMBU_IP);
+    preferences.remove(NVS_KEY_BAMBU_SERIAL);
+    preferences.remove(NVS_KEY_BAMBU_ACCESSCODE);
+    preferences.remove(NVS_KEY_BAMBU_AUTOSEND_ENABLE);
+    preferences.remove(NVS_KEY_BAMBU_AUTOSEND_TIME);
+    preferences.end();
+
    // Löschen der globalen Variablen
-    g_bambu_ip = "";
-    g_bambu_accesscode = "";
-    g_bambu_serialnr = "";
-    bambu_ip = nullptr;
-    bambu_accesscode = nullptr;
-    bambu_serialnr = nullptr;
-    autoSendToBambu = false;
+    bambuCredentials.ip = "";
+    bambuCredentials.serial = "";
+    bambuCredentials.accesscode = "";
+    bambuCredentials.autosend_enable = false;
+    bambuCredentials.autosend_time = BAMBU_DEFAULT_AUTOSEND_TIME;
+
    autoSetToBambuSpoolId = 0;
    ams_count = 0;
    amsJsonData = "";
@@ -69,24 +65,20 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
        vTaskDelete(BambuMqttTask);
    }

-    JsonDocument doc;
-    doc["bambu_ip"] = ip;
-    doc["bambu_accesscode"] = accesscode;
-    doc["bambu_serialnr"] = serialnr;
-    doc["autoSendToBambu"] = autoSend;
-    doc["autoSendTime"] = (autoSendTime != "") ? autoSendTime.toInt() : autoSetBambuAmsCounter;
+    bambuCredentials.ip = ip.c_str();
+    bambuCredentials.serial = serialnr.c_str();
+    bambuCredentials.accesscode = accesscode.c_str();
+    bambuCredentials.autosend_enable = autoSend;
+    bambuCredentials.autosend_time = autoSendTime.toInt();

-    if (!saveJsonValue("/bambu_credentials.json", doc)) {
-        Serial.println("Fehler beim Speichern der Bambu-Credentials.");
-        return false;
-    }
-
-    // Dynamische Speicherallokation für die globalen Pointer
-    bambu_ip = ip.c_str();
-    bambu_accesscode = accesscode.c_str();
-    bambu_serialnr = serialnr.c_str();
-    autoSendToBambu = autoSend;
-    autoSetBambuAmsCounter = autoSendTime.toInt();
+    Preferences preferences;
+    preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
+    preferences.putString(NVS_KEY_BAMBU_IP, bambuCredentials.ip);
+    preferences.putString(NVS_KEY_BAMBU_SERIAL, bambuCredentials.serial);
+    preferences.putString(NVS_KEY_BAMBU_ACCESSCODE, bambuCredentials.accesscode);
+    preferences.putBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, bambuCredentials.autosend_enable);
+    preferences.putInt(NVS_KEY_BAMBU_AUTOSEND_TIME, bambuCredentials.autosend_time);
+    preferences.end();

    vTaskDelay(100 / portTICK_PERIOD_MS);
    if (!setupMqtt()) return false;
@@ -95,35 +87,36 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
 }

 bool loadBambuCredentials() {
-    JsonDocument doc;
-    if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
-        // Temporäre Strings für die Werte
-        String ip = doc["bambu_ip"].as<String>();
-        String code = doc["bambu_accesscode"].as<String>();
-        String serial = doc["bambu_serialnr"].as<String>();
+    Preferences preferences;
+    preferences.begin(NVS_NAMESPACE_BAMBU, true);
+    String ip = preferences.getString(NVS_KEY_BAMBU_IP, "");
+    String serial = preferences.getString(NVS_KEY_BAMBU_SERIAL, "");
+    String code = preferences.getString(NVS_KEY_BAMBU_ACCESSCODE, "");
+    bool autosendEnable = preferences.getBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, false);
+    int autosendTime = preferences.getInt(NVS_KEY_BAMBU_AUTOSEND_TIME, BAMBU_DEFAULT_AUTOSEND_TIME);
+    preferences.end();

-        g_bambu_ip = ip;
-        g_bambu_accesscode = code;
-        g_bambu_serialnr = serial;
+    if(ip != ""){
+        bambuCredentials.ip = ip.c_str();
+        bambuCredentials.serial = serial.c_str();
+        bambuCredentials.accesscode = code.c_str();
+        bambuCredentials.autosend_enable = autosendEnable;
+        bambuCredentials.autosend_time = autosendTime;

-        if (doc["autoSendToBambu"].is<bool>()) autoSendToBambu = doc["autoSendToBambu"].as<bool>();
-        if (doc["autoSendTime"].is<int>()) autoSetBambuAmsCounter = doc["autoSendTime"].as<int>();
+        Serial.println("credentials loaded loadCredentials!");
+        Serial.println(bambuCredentials.ip);
+        Serial.println(bambuCredentials.serial);
+        Serial.println(bambuCredentials.accesscode);
+        Serial.println(String(bambuCredentials.autosend_enable));
+        Serial.println(String(bambuCredentials.autosend_time));

-        ip.trim();
-        code.trim();
-        serial.trim();
-
-        // Dynamische Speicherallokation für die globalen Pointer
-        bambu_ip = g_bambu_ip.c_str();
-        bambu_accesscode = g_bambu_accesscode.c_str();
-        bambu_serialnr = g_bambu_serialnr.c_str();
-
-        topic = "device/" + String(bambu_serialnr);
-        //request_topic = "device/" + String(bambu_serialnr) + "/request";
        return true;
    }
-    Serial.println("Keine gültigen Bambu-Credentials gefunden.");
-    return false;
+    else
+    {
+        Serial.println("Keine gültigen Bambu-Credentials gefunden.");
+        return false;
+    }
 }

 struct FilamentResult {
@@ -226,7 +219,7 @@ FilamentResult findFilamentIdx(String brand, String type) {
 bool sendMqttMessage(const String& payload) {
    Serial.println("Sending MQTT message");
    Serial.println(payload);
-    if (client.publish((String(topic) + "/request").c_str(), payload.c_str())) 
+    if (client.publish(("device/"+bambuCredentials.serial+"/request").c_str(), payload.c_str())) 
    {
        return true;
    }
@@ -499,7 +492,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                    trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) {
                    hasChanges = true;

-                    if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
+                    if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && hasChanges)
                    {
                        autoSetSpool(autoSetToBambuSpoolId, ams_data[storedIndex].trays[j].id);
                    }
@@ -523,7 +516,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                        (vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) {
                        hasChanges = true;

-                        if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
+                        if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && hasChanges)
                        {
                            autoSetSpool(autoSetToBambuSpoolId, 254);
                        }
@@ -580,11 +573,11 @@ void reconnect() {
        oledShowTopRow();

        // Attempt to connect
-        String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) {
+        String clientId = bambuCredentials.serial + "_" + String(random(0, 100));
+        if (client.connect(clientId.c_str(), BAMBU_USERNAME, bambuCredentials.accesscode.c_str())) {
            Serial.println("MQTT re/connected");

-            client.subscribe((String(topic) + "/report").c_str());
+            client.subscribe(("device/"+bambuCredentials.serial+"/report").c_str());
            bambu_connected = true;
            oledShowTopRow();
        } else {
@@ -630,28 +623,24 @@ void mqtt_loop(void * parameter) {

 bool setupMqtt() {
    // Wenn Bambu Daten vorhanden
-    bool success = loadBambuCredentials();
+    //bool success = loadBambuCredentials();

-    if (!success) {
-        bambuDisabled = true;
-        return false;
-    }
-
-    if (success && bambu_ip != "" && bambu_accesscode != "" && bambu_serialnr != "") 
+    if (bambuCredentials.ip != "" && bambuCredentials.accesscode != "" && bambuCredentials.serial != "") 
    {
+        oledShowProgressBar(4, 7, DISPLAY_BOOT_TEXT, "Bambu init");
        bambuDisabled = false;
        sslClient.setCACert(root_ca);
        sslClient.setInsecure();
-        client.setServer(bambu_ip, 8883);
+        client.setServer(bambuCredentials.ip.c_str(), 8883);

        // Verbinden mit dem MQTT-Server
        bool connected = true;
-        String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) 
+        String clientId = String(bambuCredentials.serial) + "_" + String(random(0, 100));
+        if (client.connect(bambuCredentials.ip.c_str(), BAMBU_USERNAME, bambuCredentials.accesscode.c_str())) 
        {
            client.setCallback(mqtt_callback);
            client.setBufferSize(15488);
-            client.subscribe((String(topic) + "/report").c_str());
+            client.subscribe(("device/"+bambuCredentials.serial+"/report").c_str());
            Serial.println("MQTT-Client initialisiert");

            oledShowMessage("Bambu Connected");
--- a/src/bambu.h
+++ b/src/bambu.h
@@ -16,6 +16,14 @@ struct TrayData {
    String cali_idx;
 };

+struct BambuCredentials {
+    String ip;
+    String serial;
+    String accesscode;
+    bool autosend_enable;
+    int autosend_time;
+};
+
 #define MAX_AMS 17  // 16 normale AMS + 1 externe Spule
 extern String amsJsonData;  // Für die vorbereiteten JSON-Daten

@@ -28,9 +36,10 @@ extern bool bambu_connected;

 extern int ams_count;
 extern AMSData ams_data[MAX_AMS];
-extern bool autoSendToBambu;
+//extern bool autoSendToBambu;
 extern int autoSetToBambuSpoolId;
 extern bool bambuDisabled;
+extern BambuCredentials bambuCredentials;

 bool removeBambuCredentials();
 bool loadBambuCredentials();
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -16,7 +16,6 @@ const uint8_t LOADCELL_DOUT_PIN = 16; //16;
 const uint8_t LOADCELL_SCK_PIN = 17; //17;
 const uint8_t calVal_eepromAdress = 0;
 const uint16_t SCALE_LEVEL_WEIGHT = 500;
-uint16_t defaultScaleCalibrationValue = 430;
 // ***** HX711

 // ***** TTP223 (Touch Sensor)
@@ -26,16 +25,11 @@ const uint8_t TTP223_PIN = 25;


 // ***** Display
-// Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
-// On an ESP32:   21(SDA),  22(SCL)
-const int8_t OLED_RESET = -1; // Reset pin # (or -1 if sharing Arduino reset pin)
-const uint8_t SCREEN_ADDRESS = 0x3C; ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
-const uint8_t SCREEN_WIDTH = 128; // OLED display width, in pixels
-const uint8_t SCREEN_HEIGHT = 64; // OLED display height, in pixels
 const uint8_t OLED_TOP_START = 0;
 const uint8_t OLED_TOP_END = 16;
 const uint8_t OLED_DATA_START = 17;
 const uint8_t OLED_DATA_END = SCREEN_HEIGHT;
+
 // ***** Display

 // ***** Webserver
@@ -46,8 +40,6 @@ const uint8_t webserverPort = 80;
 const char* apiUrl = "/api/v1";
 // ***** API

-// ***** Bambu Auto Set Spool
-uint8_t autoSetBambuAmsCounter = 60;
 // ***** Bambu Auto Set Spool

 // ***** Task Prios
--- a/src/config.h
+++ b/src/config.h
@@ -3,6 +3,40 @@

 #include <Arduino.h>

+#define BAMBU_DEFAULT_AUTOSEND_TIME         60
+
+#define NVS_NAMESPACE_API                   "api"
+#define NVS_KEY_SPOOLMAN_URL                "spoolmanUrl"
+#define NVS_KEY_OCTOPRINT_ENABLED           "octoEnabled"
+#define NVS_KEY_OCTOPRINT_URL               "octoUrl"
+#define NVS_KEY_OCTOPRINT_TOKEN             "octoToken"
+
+#define NVS_NAMESPACE_BAMBU                 "bambu"
+#define NVS_KEY_BAMBU_IP                    "bambuIp"
+#define NVS_KEY_BAMBU_ACCESSCODE            "bambuCode"
+#define NVS_KEY_BAMBU_SERIAL                "bambuSerial"
+#define NVS_KEY_BAMBU_AUTOSEND_ENABLE       "autosendEnable"
+#define NVS_KEY_BAMBU_AUTOSEND_TIME         "autosendTime"
+
+#define NVS_NAMESPACE_SCALE                 "scale"
+#define NVS_KEY_CALIBRATION                 "cal_value"
+#define NVS_KEY_AUTOTARE                    "auto_tare"
+#define SCALE_DEFAULT_CALIBRATION_VALUE     430.0f;
+
+#define BAMBU_USERNAME                      "bblp"
+
+#define OLED_RESET                          -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+#define SCREEN_ADDRESS                      0x3CU   // See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
+#define SCREEN_WIDTH                        128U
+#define SCREEN_HEIGHT                       64U
+#define SCREEN_TOP_BAR_HEIGHT               16U
+#define SCREEN_PROGRESS_BAR_HEIGHT          12U
+#define DISPLAY_BOOT_TEXT                   "FilaMan"
+
+#define WIFI_CHECK_INTERVAL                 60000U
+#define DISPLAY_UPDATE_INTERVAL             1000U
+#define SPOOLMAN_HEALTHCHECK_INTERVAL       60000U
+
 extern const uint8_t PN532_IRQ;
 extern const uint8_t PN532_RESET;

@@ -13,10 +47,6 @@ extern const uint16_t SCALE_LEVEL_WEIGHT;

 extern const uint8_t TTP223_PIN;

-extern const int8_t OLED_RESET;
-extern const uint8_t SCREEN_ADDRESS;
-extern const uint8_t SCREEN_WIDTH;
-extern const uint8_t SCREEN_HEIGHT;
 extern const uint8_t OLED_TOP_START;
 extern const uint8_t OLED_TOP_END;
 extern const uint8_t OLED_DATA_START;
@@ -25,7 +55,7 @@ extern const uint8_t OLED_DATA_END;
 extern const char* apiUrl;
 extern const uint8_t webserverPort;

-extern uint8_t autoSetBambuAmsCounter;
+

 extern const unsigned char wifi_on[];
 extern const unsigned char wifi_off[];
--- a/src/debug.h
+++ b/src/debug.h
@@ -0,0 +1,12 @@
+#include <Arduino.h>
+
+
+#ifdef ENABLE_HEAP_DEBUGGING
+    #define HEAP_DEBUG_MESSAGE(location) printHeapDebugData(location);
+#else
+    #define HEAP_DEBUG_MESSAGE(location) 
+#endif
+
+inline void printHeapDebugData(const char *location){
+    Serial.println("Heap: " + String(ESP.getMinFreeHeap()/1024) + "\t" + String(ESP.getFreeHeap()/1024) + "\t" + String(ESP.getMaxAllocHeap()/1024) + "\t" + location);
+}
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -2,10 +2,12 @@
 #include "api.h"
 #include <vector>
 #include "icons.h"
+#include "main.h"

 Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);

 bool wifiOn = false;
+bool iconToggle = false;

 void setupDisplay() {
    if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
@@ -14,15 +16,10 @@ void setupDisplay() {
    }
    display.setTextColor(WHITE);
    display.clearDisplay();
-    display.display();

-    // Show initial display buffer contents on the screen --
-    // the library initializes this with an Adafruit splash screen.
-    display.setTextColor(WHITE);
-    display.display();
+
    oledShowTopRow();
-    oledShowMessage("FilaMan v" + String(VERSION));
-    vTaskDelay(2000 / portTICK_PERIOD_MS);
+    oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, "Display init");
 }

 void oledclearline() {
@@ -45,14 +42,14 @@ void oledcleardata() {
    //display.display();
 }

-int oled_center_h(String text) {
+int oled_center_h(const String &text) {
    int16_t x1, y1;
    uint16_t w, h;
    display.getTextBounds(text, 0, 0, &x1, &y1, &w, &h);
    return (SCREEN_WIDTH - w) / 2;
 }

-int oled_center_v(String text) {
+int oled_center_v(const String &text) {
    int16_t x1, y1;
    uint16_t w, h;
    display.getTextBounds(text, 0, OLED_DATA_START, &x1, &y1, &w, &h);
@@ -60,7 +57,7 @@ int oled_center_v(String text) {
    return OLED_DATA_START + ((OLED_DATA_END - OLED_DATA_START - h) / 2);
 }

-std::vector<String> splitTextIntoLines(String text, uint8_t textSize) {
+std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
    std::vector<String> lines;
    display.setTextSize(textSize);
    
@@ -120,7 +117,7 @@ std::vector<String> splitTextIntoLines(String text, uint8_t textSize) {
    return lines;
 }

-void oledShowMultilineMessage(String message, uint8_t size) {
+void oledShowMultilineMessage(const String &message, uint8_t size) {
    std::vector<String> lines;
    int maxLines = 3;  // Maximale Anzahl Zeilen für size 2
    
@@ -148,7 +145,7 @@ void oledShowMultilineMessage(String message, uint8_t size) {
    display.display();
 }

-void oledShowMessage(String message, uint8_t size) {
+void oledShowMessage(const String &message, uint8_t size) {
    oledcleardata();
    display.setTextSize(size);
    display.setTextWrap(false);
@@ -171,22 +168,46 @@ void oledShowMessage(String message, uint8_t size) {
 void oledShowTopRow() {
    oledclearline();

-    if (bambu_connected == 1) {
-        display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
-    } else {
-        display.drawBitmap(50, 0, bitmap_off , 16, 16, WHITE);
-    }
+    display.setTextSize(1);
+    display.setCursor(0, 4);
+    display.print("v");
+    display.print(VERSION);

-    if (spoolmanApiState != API_INIT) {
-        display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
-    } else {
-        display.drawBitmap(80, 0, bitmap_off , 16, 16, WHITE);
-    }
+    iconToggle = !iconToggle;

-    if (wifiOn == 1) {
-        display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
-    } else {
-        display.drawBitmap(107, 0, wifi_off , 16, 16, WHITE);
+    // Do not show status indicators during boot
+    if(!booting){
+        if(bambuDisabled == false) {
+            if (bambu_connected == 1) {
+                display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
+            } else {
+                if(iconToggle){
+                    display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
+                    display.drawLine(50, 15, 66, 0, WHITE);
+                    display.drawLine(51, 15, 67, 0, WHITE);
+                }
+            }
+        }
+
+        if (spoolmanConnected) {
+            display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
+        } else {
+            if(iconToggle){
+                display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
+                display.drawLine(80, 15, 96, 0, WHITE);
+                display.drawLine(81, 15, 97, 0, WHITE);
+            }
+        }
+
+        if (wifiOn == 1) {
+            display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
+        } else {
+            if(iconToggle){
+                display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
+                display.drawLine(107, 15, 123, 0, WHITE);
+                display.drawLine(108, 15, 124, 0, WHITE);
+            }
+        }
    }
    
    display.display();
@@ -214,6 +235,27 @@ void oledShowIcon(const char* icon) {
    display.display();
 }

+void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage){
+    assert(step <= numSteps);
+
+    // clear data and bar area
+    display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, SCREEN_HEIGHT-16, BLACK);
+
+    
+    display.setTextWrap(false);
+    display.setTextSize(2);
+    display.setCursor(0, OLED_DATA_START+4);
+    display.print(largeText);
+    display.setTextSize(1);
+    display.setCursor(0, OLED_DATA_END-SCREEN_PROGRESS_BAR_HEIGHT-10);
+    display.print(statusMessage);
+
+    const int barLength = ((SCREEN_WIDTH-2)*step)/numSteps;
+    display.drawRoundRect(0, SCREEN_HEIGHT-SCREEN_PROGRESS_BAR_HEIGHT, SCREEN_WIDTH, 12, 6, WHITE);
+    display.fillRoundRect(1, SCREEN_HEIGHT-SCREEN_PROGRESS_BAR_HEIGHT+1, barLength, 10, 6, WHITE);
+    display.display();
+}
+
 void oledShowWeight(uint16_t weight) {
    // Display Gewicht
    oledcleardata();
--- a/src/display.h
+++ b/src/display.h
@@ -13,11 +13,13 @@ extern bool wifiOn;
 void setupDisplay();
 void oledclearline();
 void oledcleardata();
-int oled_center_h(String text);
-int oled_center_v(String text);
+int oled_center_h(const String &text);
+int oled_center_v(const String &text);
+
+void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);

 void oledShowWeight(uint16_t weight);
-void oledShowMessage(String message, uint8_t size = 2);
+void oledShowMessage(const String &message, uint8_t size = 2);
 void oledShowTopRow();
 void oledShowIcon(const char* icon);

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@
 bool mainTaskWasPaused = 0;
 uint8_t scaleTareCounter = 0;
 bool touchSensorConnected = false;
+bool booting = true;

 // ##### SETUP #####
 void setup() {
@@ -63,6 +64,7 @@ void setup() {
  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
  esp_task_wdt_init(10, panic);

+  booting = false;
  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
  esp_task_wdt_add(NULL);
 }
@@ -95,7 +97,8 @@ int16_t lastWeight = 0;

 // WIFI check variables
 unsigned long lastWifiCheckTime = 0;
-const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
+unsigned long lastTopRowUpdateTime = 0;
+unsigned long lastSpoolmanHealcheckTime = 0;

 // Button debounce variables
 unsigned long lastButtonPress = 0;
@@ -113,13 +116,25 @@ void loop() {
  }

  // Überprüfe regelmäßig die WLAN-Verbindung
-  if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL)) 
  {
    checkWiFiConnection();
  }

+  // Periodic display update
+  if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL)) 
+  {
+    oledShowTopRow();
+  }
+
+  // Periodic spoolman health check
+  if (intervalElapsed(currentMillis, lastSpoolmanHealcheckTime, SPOOLMAN_HEALTHCHECK_INTERVAL)) 
+  {
+    checkSpoolmanInstance();
+  }
+
  // Wenn Bambu auto set Spool aktiv
-  if (autoSendToBambu && autoSetToBambuSpoolId > 0) 
+  if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0) 
  {
    if (!bambuDisabled && !bambu_connected) 
    {
@@ -131,10 +146,10 @@ void loop() {
      if (nfcReaderState == NFC_IDLE)
      {
        lastAutoSetBambuAmsTime = currentMillis;
-        oledShowMessage("Auto Set         " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s");
+        oledShowMessage("Auto Set         " + String(bambuCredentials.autosend_time - autoAmsCounter) + "s");
        autoAmsCounter++;

-        if (autoAmsCounter >= autoSetBambuAmsCounter) 
+        if (autoAmsCounter >= bambuCredentials.autosend_time) 
        {
          autoSetToBambuSpoolId = 0;
          autoAmsCounter = 0;
@@ -148,88 +163,96 @@ void loop() {
    }
  }

-  // Wenn Waage nicht Kalibriert
-  if (scaleCalibrated == 3) 
+  // If scale is not calibrated, only show a warning
+  if (!scaleCalibrated) 
  {
-    oledShowMessage("Scale not calibrated!");
-    vTaskDelay(5000 / portTICK_PERIOD_MS);
-    yield();
-    esp_task_wdt_reset();
-    
-    return;
-  } 
-
-  // Ausgabe der Waage auf Display
-  if(pauseMainTask == 0)
-  {
-    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!autoSendToBambu || autoSetToBambuSpoolId == 0)))
-    {
-      (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+    // Do not show the warning if the calibratin process is onging
+    if(!scaleCalibrationActive){
+      oledShowMessage("Scale not calibrated");
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
    }
-    mainTaskWasPaused = false;
  } 
  else 
  {
-    mainTaskWasPaused = true;
-  }
-
-
-  // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
-  {
-    lastWeightReadTime = currentMillis;
-
-    // Prüfen ob die Waage korrekt genullt ist
-    // Abweichung von 2g ignorieren
-    if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+    // Ausgabe der Waage auf Display
+    if(pauseMainTask == 0)
    {
-      scale_tare_counter++;
-    }
-    else
-    {
-      scale_tare_counter = 0;
-    }
-
-    // Prüfen ob das Gewicht gleich bleibt und dann senden
-    if (abs(weight - lastWeight) <= 2 && weight > 5)
-    {
-      weigthCouterToApi++;
-    } 
-    else 
-    {
-      weigthCouterToApi = 0;
-      weightSend = 0;
-    }
-  }
-
-  // reset weight counter after writing tag
-  // TBD: what exactly is the logic behind this?
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
-  {
-    weigthCouterToApi = 0;
-  }
-  
-  lastWeight = weight;
-
-  // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-  if (spoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS) {
-    oledShowIcon("loading");
-    if (updateSpoolWeight(spoolId, weight)) 
-    {
-      oledShowIcon("success");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
-      weightSend = 1;
-      autoSetToBambuSpoolId = spoolId.toInt();
-
-      if (octoEnabled) 
+      if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
      {
-        updateSpoolOcto(autoSetToBambuSpoolId);
+        (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+      }
+      mainTaskWasPaused = false;
+    }
+    else
+    {
+      mainTaskWasPaused = true;
+    }
+
+
+    // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
+    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
+    {
+      lastWeightReadTime = currentMillis;
+
+      // Prüfen ob die Waage korrekt genullt ist
+      // Abweichung von 2g ignorieren
+      if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+      {
+        scale_tare_counter++;
+      }
+      else
+      {
+        scale_tare_counter = 0;
+      }
+
+      // Prüfen ob das Gewicht gleich bleibt und dann senden
+      if (abs(weight - lastWeight) <= 2 && weight > 5)
+      {
+        weigthCouterToApi++;
+      } 
+      else 
+      {
+        weigthCouterToApi = 0;
+        weightSend = 0;
      }
    }
-    else
+
+    // reset weight counter after writing tag
+    // TBD: what exactly is the logic behind this?
+    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
    {
-      oledShowIcon("failed");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+      weigthCouterToApi = 0;
+    }
+    
+    lastWeight = weight;
+
+    // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
+    if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) 
+    {
+      // set the current tag as processed to prevent it beeing processed again
+      tagProcessed = true;
+
+      if (updateSpoolWeight(activeSpoolId, weight)) 
+      {
+        weightSend = 1;
+        
+        // Set Bambu spool ID for auto-send if enabled
+        if (bambuCredentials.autosend_enable) 
+        {
+          autoSetToBambuSpoolId = activeSpoolId.toInt();
+        }
+      }
+      else
+      {
+        oledShowIcon("failed");
+        vTaskDelay(2000 / portTICK_PERIOD_MS);
+      }
+    }
+
+    if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
+    {
+      updateSpoolOcto(autoSetToBambuSpoolId);
+      sendOctoUpdate = false;
    }
  }
  
--- a/src/main.h
+++ b/src/main.h
@@ -0,0 +1,9 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include <Arduino.h>
+
+
+extern bool booting;
+
+#endif
--- a/src/nfc.cpp
+++ b/src/nfc.cpp
@@ -7,6 +7,8 @@
 #include "api.h"
 #include "esp_task_wdt.h"
 #include "scale.h"
+#include "bambu.h"
+#include "main.h"

 //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
 Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -14,9 +16,18 @@ Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
 TaskHandle_t RfidReaderTask;

 JsonDocument rfidData;
-String spoolId = "";
+String activeSpoolId = "";
+String lastSpoolId = "";
 String nfcJsonData = "";
+bool tagProcessed = false;
 volatile bool pauseBambuMqttTask = false;
+volatile bool nfcReadingTaskSuspendRequest = false;
+volatile bool nfcReadingTaskSuspendState = false;
+
+struct NfcWriteParameterType {
+  bool tagType;
+  char* payload;
+};

 volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
 // 0 = nicht gelesen
@@ -64,6 +75,8 @@ void payloadToJson(uint8_t *data) {
        Serial.print("deserializeJson() failed: ");
        Serial.println(error.f_str());
      }
+
+      doc.clear();
    } else {
        Serial.println("Kein gültiger JSON-Inhalt gefunden oder fehlerhafte Formatierung.");
        //writeJsonToTag("{\"version\":\"1.0\",\"protocol\":\"NFC\",\"color_hex\":\"#FFFFFF\",\"type\":\"Example\",\"min_temp\":10,\"max_temp\":30,\"brand\":\"BrandName\"}");
@@ -192,6 +205,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
 }

 bool decodeNdefAndReturnJson(const byte* encodedMessage) {
+  oledShowProgressBar(1, octoEnabled?5:4, "Reading", "Decoding data");
+
  byte typeLength = encodedMessage[3];
  byte payloadLength = encodedMessage[4];

@@ -215,52 +230,79 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
  } 
  else 
  {
-    // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
-    Serial.println("JSON-Dokument erfolgreich verarbeitet");
-    Serial.println(doc.as<String>());
-    if (doc["sm_id"] != "") 
-    {
-      Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
-      spoolId = doc["sm_id"].as<String>();
-    } 
-    else 
-    {
-      Serial.println("Keine SPOOL-ID gefunden.");
-      spoolId = "";
-      oledShowMessage("Unknown Spool");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+    // If spoolman is unavailable, there is no point in continuing
+    if(spoolmanConnected){
+      // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
+      Serial.println("JSON-Dokument erfolgreich verarbeitet");
+      Serial.println(doc.as<String>());
+      if (doc["sm_id"].is<String>() && doc["sm_id"] != "") 
+      {
+        oledShowProgressBar(2, octoEnabled?5:4, "Spool Tag", "Weighing");
+        Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
+        activeSpoolId = doc["sm_id"].as<String>();
+        lastSpoolId = activeSpoolId;
+      }
+      else if(doc["location"].is<String>() && doc["location"] != "")
+      {
+        Serial.println("Location Tag found!");
+        String location = doc["location"].as<String>();
+        if(lastSpoolId != ""){
+          updateSpoolLocation(lastSpoolId, location);
+        }
+        else
+        {
+          Serial.println("Location update tag scanned without scanning spool before!");
+          oledShowProgressBar(1, 1, "Failure", "Scan spool first");
+        }
+      }
+      else 
+      {
+        Serial.println("Keine SPOOL-ID gefunden.");
+        activeSpoolId = "";
+        oledShowProgressBar(1, 1, "Failure", "Unkown tag");
+      }
+    }else{
+      oledShowProgressBar(octoEnabled?5:4, octoEnabled?5:4, "Failure!", "Spoolman unavailable");
    }
  }

+  doc.clear();
+
  return true;
 }

 void writeJsonToTag(void *parameter) {
-  const char* payload = (const char*)parameter;
+  NfcWriteParameterType* params = (NfcWriteParameterType*)parameter;

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

  nfcReaderState = NFC_WRITING;
-  vTaskSuspend(RfidReaderTask);
-  vTaskDelay(50 / portTICK_PERIOD_MS);
+
+  // First request the reading task to be suspended and than wait until it responds
+  nfcReadingTaskSuspendRequest = true;
+  while(nfcReadingTaskSuspendState == false){
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+  }

  //pauseBambuMqttTask = true;
  // aktualisieren der Website wenn sich der Status ändert
-  sendNfcData(nullptr);
+  sendNfcData();
  vTaskDelay(100 / portTICK_PERIOD_MS);
-  oledShowMessage("Waiting for NFC-Tag");
-  
  // Wait 10sec for tag
  uint8_t success = 0;
  String uidString = "";
  for (uint16_t i = 0; i < 20; i++) {
    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, 500);
+    // yield before potentially waiting for 400ms
+    yield();
+    esp_task_wdt_reset();
+    success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
    if (success) {
      for (uint8_t i = 0; i < uidLength; i++) {
+        //TBD: Rework to remove all the string operations
        uidString += String(uid[i], HEX);
        if (i < uidLength - 1) {
            uidString += ":"; // Optional: Trennzeichen hinzufügen
@@ -270,8 +312,6 @@ void writeJsonToTag(void *parameter) {
      break;
    }

-    if (i == 0) oledShowMessage("Waiting for NFC-Tag");
-
    yield();
    esp_task_wdt_reset();
    vTaskDelay(pdMS_TO_TICKS(1));
@@ -279,29 +319,37 @@ void writeJsonToTag(void *parameter) {

  if (success)
  {
-    oledShowIcon("transfer");
+    oledShowProgressBar(1, 3, "Write Tag", "Writing");
+
    // Schreibe die NDEF-Message auf den Tag
-    success = ntag2xx_WriteNDEF(payload);
+    success = ntag2xx_WriteNDEF(params->payload);
    if (success) 
    {
        Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
        //oledShowMessage("NFC-Tag written");
-        oledShowIcon("success");
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
+        //vTaskDelay(1000 / portTICK_PERIOD_MS);
        nfcReaderState = NFC_WRITE_SUCCESS;
        // aktualisieren der Website wenn sich der Status ändert
-        sendNfcData(nullptr);
+        sendNfcData();
        pauseBambuMqttTask = false;
        
-        if (updateSpoolTagId(uidString, payload)) {
-          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-          uint8_t uidLength;
-          oledShowIcon("success");
-          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
-            yield();
-          }
-        }
+        if(params->tagType){
+          // TBD: should this be simplified?
+          if (updateSpoolTagId(uidString, params->payload) && params->tagType) {
            
+          }else{
+            // Potentially handle errors
+          }
+        }else{
+          oledShowProgressBar(1, 1, "Write Tag", "Done!");
+        }
+        uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+        uint8_t uidLength;
+        yield();
+        esp_task_wdt_reset();
+        while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400)) {
+          yield();
+        } 
        vTaskResume(RfidReaderTask);
        vTaskDelay(500 / portTICK_PERIOD_MS);        
    } 
@@ -316,34 +364,40 @@ void writeJsonToTag(void *parameter) {
  else
  {
    Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
-    oledShowMessage("No NFC-Tag found");
+    oledShowProgressBar(1, 1, "Failure!", "No tag found");
    vTaskDelay(2000 / portTICK_PERIOD_MS);
    nfcReaderState = NFC_IDLE;
  }
  
  sendWriteResult(nullptr, success);
-  sendNfcData(nullptr);
+  sendNfcData();

-  vTaskResume(RfidReaderTask);
+  nfcReadingTaskSuspendRequest = false;
  pauseBambuMqttTask = false;

  vTaskDelete(NULL);
 }

-void startWriteJsonToTag(const char* payload) {
-  char* payloadCopy = strdup(payload);
+void startWriteJsonToTag(const bool isSpoolTag, const char* payload) {
+  NfcWriteParameterType* parameters = new NfcWriteParameterType();
+  parameters->tagType = isSpoolTag;
+  parameters->payload = strdup(payload);
  
  // Task nicht mehrfach starten
-  if (nfcReaderState != NFC_WRITING) {
+  if (nfcReaderState == NFC_IDLE || nfcReaderState == NFC_READ_ERROR || nfcReaderState == NFC_READ_SUCCESS) {
+    oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
    // Erstelle die Task
    xTaskCreate(
        writeJsonToTag,        // Task-Funktion
        "WriteJsonToTagTask",       // Task-Name
        5115,                        // Stackgröße in Bytes
-        (void*)payloadCopy,         // Parameter
+        (void*)parameters,         // Parameter
        rfidWriteTaskPrio,           // Priorität
        NULL                         // Task-Handle (nicht benötigt)
    );
+  }else{
+    oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
+    // TBD: Add proper error handling (website)
  }
 }

@@ -351,27 +405,33 @@ void scanRfidTask(void * parameter) {
  Serial.println("RFID Task gestartet");
  for(;;) {
    // Wenn geschrieben wird Schleife aussetzen
-    if (nfcReaderState != NFC_WRITING)
+    if (nfcReaderState != NFC_WRITING && !nfcReadingTaskSuspendRequest && !booting)
    {
+      nfcReadingTaskSuspendState = false;
      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);
+      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);

      foundNfcTag(nullptr, success);
      
-      if (success && nfcReaderState != NFC_READ_SUCCESS)
+      // As long as there is still a tag on the reader, do not try to read it again
+      if (success && nfcReaderState == NFC_IDLE)
      {
+        // Set the current tag as not processed
+        tagProcessed = false;
+
        // Display some basic information about the card
        Serial.println("Found an ISO14443A card");

        nfcReaderState = NFC_READING;

-        oledShowIcon("transfer");
-        vTaskDelay(500 / portTICK_PERIOD_MS);
+        oledShowProgressBar(0, octoEnabled?5:4, "Reading", "Detecting tag");
+
+        //vTaskDelay(500 / portTICK_PERIOD_MS);
        
        if (uidLength == 7)
        {
@@ -404,8 +464,7 @@ void scanRfidTask(void * parameter) {

            if (!decodeNdefAndReturnJson(data)) 
            {
-              oledShowMessage("NFC-Tag unknown");
-              vTaskDelay(2000 / portTICK_PERIOD_MS);
+              oledShowProgressBar(1, 1, "Failure", "Unknown tag");
              nfcReaderState = NFC_READ_ERROR;
            }
            else 
@@ -417,42 +476,50 @@ void scanRfidTask(void * parameter) {
          }
          else
          {
-            oledShowMessage("NFC-Tag read error");
+            oledShowProgressBar(1, 1, "Failure", "Tag read error");
            nfcReaderState = NFC_READ_ERROR;
          }
        }
        else
        {
+          //TBD: Show error here?!
+          oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
          Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
        }
      }

-      if (!success && nfcReaderState != NFC_IDLE)
+      if (!success && nfcReaderState != NFC_IDLE && !nfcReadingTaskSuspendRequest)
      {
        nfcReaderState = NFC_IDLE;
        //uidString = "";
        nfcJsonData = "";
+        activeSpoolId = "";
        Serial.println("Tag entfernt");
-        if (!autoSendToBambu) oledShowWeight(weight);
+        if (!bambuCredentials.autosend_enable) oledShowWeight(weight);
      }

      // aktualisieren der Website wenn sich der Status ändert
-      sendNfcData(nullptr);
+      sendNfcData();
+    }
+    else
+    {
+      nfcReadingTaskSuspendState = true;
+      Serial.println("NFC Reading disabled");
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
    }
    yield();
  }
 }

 void startNfc() {
+  oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, "NFC init");
  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);
+    vTaskDelay(2000 / portTICK_PERIOD_MS);
  }
  else {
    Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen
--- a/src/nfc.h
+++ b/src/nfc.h
@@ -15,13 +15,15 @@ typedef enum{

 void startNfc();
 void scanRfidTask(void * parameter);
-void startWriteJsonToTag(const char* payload);
+void startWriteJsonToTag(const bool isSpoolTag, const char* payload);

 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
-extern String spoolId;
+extern String activeSpoolId;
+extern String lastSpoolId;
 extern volatile nfcReaderStateType nfcReaderState;
 extern volatile bool pauseBambuMqttTask;
+extern bool tagProcessed;



--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -224,7 +224,7 @@ void handleUpdate(AsyncWebServer &server) {
            static int lastProgress = -1;
            if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
                sendUpdateProgress(currentProgress, "uploading");
-                oledShowMessage("Update: " + String(currentProgress) + "%");
+                oledShowProgressBar(currentProgress, 100, "Update", "Download");
                vTaskDelay(50 / portTICK_PERIOD_MS);
                lastProgress = currentProgress;
            }
--- a/src/scale.cpp
+++ b/src/scale.cpp
@@ -17,13 +17,9 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
-uint8_t scaleCalibrated = 1;
-
-Preferences preferences;
-const char* NVS_NAMESPACE = "scale";
-const char* NVS_KEY_CALIBRATION = "cal_value";
-const char* NVS_KEY_AUTOTARE = "auto_tare";
+bool scaleCalibrated;
 bool autoTare = true;
+bool scaleCalibrationActive = false;

 // ##### Funktionen für Waage #####
 uint8_t setAutoTare(bool autoTareValue) {
@@ -32,7 +28,8 @@ uint8_t setAutoTare(bool autoTareValue) {
  autoTare = autoTareValue;

  // Speichern mit NVS
-  preferences.begin(NVS_NAMESPACE, false); // false = readwrite
+  Preferences preferences;
+  preferences.begin(NVS_NAMESPACE_SCALE, false); // false = readwrite
  preferences.putBool(NVS_KEY_AUTOTARE, autoTare);
  preferences.end();

@@ -51,6 +48,8 @@ void scale_loop(void * parameter) {
  Serial.println("Scale Loop started");
  Serial.println("++++++++++++++++++++++++++++++");

+  scale.tare();
+
  for(;;) {
    if (scale.is_ready()) 
    {
@@ -74,7 +73,11 @@ void scale_loop(void * parameter) {
        scaleTareRequest = false;
      }

-      weight = round(scale.get_units());
+      // Only update weight if median changed more than 1
+      int16_t newWeight = round(scale.get_units());
+      if(abs(weight-newWeight) > 1){
+        weight = newWeight;
+      }
    }
    
    vTaskDelay(pdMS_TO_TICKS(100));
@@ -86,8 +89,15 @@ void start_scale(bool touchSensorConnected) {
  float calibrationValue;

  // NVS lesen
-  preferences.begin(NVS_NAMESPACE, true); // true = readonly
-  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  Preferences preferences;
+  preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
+  if(preferences.isKey(NVS_KEY_CALIBRATION)){
+    calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION);
+    scaleCalibrated = true;
+  }else{
+    calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
+    scaleCalibrated = false;
+  }
  
  // auto Tare
  // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
@@ -102,19 +112,7 @@ void start_scale(bool touchSensorConnected) {

  scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);

-  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");
+  oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
  for (uint16_t i = 0; i < 2000; i++) {
    yield();
    vTaskDelay(pdMS_TO_TICKS(1));
@@ -124,7 +122,7 @@ void start_scale(bool touchSensorConnected) {
  if (scale.wait_ready_timeout(1000))
  {
    scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
-    scale.tare();
+    //scale.tare();
  }

  // Display Gewicht
@@ -151,6 +149,8 @@ uint8_t calibrate_scale() {
  uint8_t returnState = 0;
  float newCalibrationValue;

+  scaleCalibrationActive = true;
+
  vTaskSuspend(RfidReaderTask);
  vTaskSuspend(ScaleTask);

@@ -161,7 +161,7 @@ uint8_t calibrate_scale() {
  {
    
    scale.set_scale();
-    oledShowMessage("Step 1 empty Scale");
+    oledShowProgressBar(0, 3, "Scale Cal.", "Empty Scale");

    for (uint16_t i = 0; i < 5000; i++) {
      yield();
@@ -173,7 +173,7 @@ uint8_t calibrate_scale() {
    Serial.println("Tare done...");
    Serial.print("Place a known weight on the scale...");

-    oledShowMessage("Step 2 Place the weight");
+    oledShowProgressBar(1, 3, "Scale Cal.", "Place the weight");

    for (uint16_t i = 0; i < 5000; i++) {
      yield();
@@ -193,21 +193,20 @@ uint8_t calibrate_scale() {
      Serial.println(newCalibrationValue);

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

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

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

-      Serial.println("End calibration, remove weight");
-
-      oledShowMessage("Remove weight");
+      oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");

      scale.set_scale(newCalibrationValue);
      for (uint16_t i = 0; i < 2000; i++) {
@@ -216,7 +215,7 @@ uint8_t calibrate_scale() {
        esp_task_wdt_reset();
      }
      
-      oledShowMessage("Scale calibrated");
+      oledShowProgressBar(3, 3, "Scale Cal.", "Completed");

      // 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();
@@ -228,23 +227,21 @@ uint8_t calibrate_scale() {
        esp_task_wdt_reset();
      }

+      scaleCalibrated = true;
      returnState = 1;
    }
-   
    else
    {
-      {
-        Serial.println("Calibration value is invalid. Please recalibrate.");
+      Serial.println("Calibration value is invalid. Please recalibrate.");

-        oledShowMessage("Calibration ERROR Try again");
+      oledShowProgressBar(3, 3, "Failure", "Calibration error");

-        for (uint16_t i = 0; i < 50000; i++) {
-          yield();
-          vTaskDelay(pdMS_TO_TICKS(1));
-          esp_task_wdt_reset();
-        }
-        returnState = 0;
+      for (uint16_t i = 0; i < 50000; i++) {
+        yield();
+        vTaskDelay(pdMS_TO_TICKS(1));
+        esp_task_wdt_reset();
      }
+      returnState = 0;
    } 
  }
  else 
@@ -265,6 +262,7 @@ uint8_t calibrate_scale() {
  vTaskResume(ScaleTask);
  pauseBambuMqttTask = false;
  pauseMainTask = 0;
+  scaleCalibrationActive = false;

  return returnState;
 }
--- a/src/scale.h
+++ b/src/scale.h
@@ -15,8 +15,9 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
-extern uint8_t scaleCalibrated;
+extern bool scaleCalibrated;
 extern bool autoTare;
+extern bool scaleCalibrationActive;

 extern TaskHandle_t ScaleTask;

--- a/src/website.cpp
+++ b/src/website.cpp
@@ -10,6 +10,9 @@
 #include <Update.h>
 #include "display.h"
 #include "ota.h"
+#include "config.h"
+#include "debug.h"
+

 #ifndef VERSION
  #define VERSION "1.1.0"
@@ -26,13 +29,18 @@ nfcReaderStateType lastnfcReaderState = NFC_IDLE;


 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
+    HEAP_DEBUG_MESSAGE("onWsEvent begin");
    if (type == WS_EVT_CONNECT) {
        Serial.println("Neuer Client verbunden!");
        // Sende die AMS-Daten an den neuen Client
        if (!bambuDisabled) sendAmsData(client);
-        sendNfcData(client);
+        sendNfcData();
        foundNfcTag(client, 0);
        sendWriteResult(client, 3);
+
+        // Clean up dead connections
+        (*server).cleanupClients();
+        Serial.println("Currently connected number of clients: " + String((*server).getClients().size()));
    } else if (type == WS_EVT_DISCONNECT) {
        Serial.println("Client getrennt.");
    } else if (type == WS_EVT_ERROR) {
@@ -44,8 +52,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
        JsonDocument doc;
        deserializeJson(doc, message);

-        bool spoolmanConnected = (spoolmanApiState != API_INIT);
-
        if (doc["type"] == "heartbeat") {
            // Sende Heartbeat-Antwort
            ws.text(client->id(), "{"
@@ -61,7 +67,8 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
                // Versuche NFC-Daten zu schreiben
                String payloadString;
                serializeJson(doc["payload"], payloadString);
-                startWriteJsonToTag(payloadString.c_str());
+
+                startWriteJsonToTag((doc["tagType"] == "spool") ? true : false, payloadString.c_str());
            }
        }

@@ -113,7 +120,9 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
        else {
            Serial.println("Unbekannter WebSocket-Typ: " + doc["type"].as<String>());
        }
+        doc.clear();
    }
+    HEAP_DEBUG_MESSAGE("onWsEvent end");
 }

 // Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei
@@ -140,11 +149,11 @@ void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
 void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
    if (success == lastSuccess) return;
    ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}");
-    sendNfcData(nullptr);
+    sendNfcData();
    lastSuccess = success;
 }

-void sendNfcData(AsyncWebSocketClient *client) {
+void sendNfcData() {
    if (lastnfcReaderState == nfcReaderState) return;
    // TBD: Why is there no status for reading the tag?
    switch(nfcReaderState){
@@ -179,6 +188,7 @@ void sendAmsData(AsyncWebSocketClient *client) {
 }

 void setupWebserver(AsyncWebServer &server) {
+    oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, "Webserver init");
    // Deaktiviere alle Debug-Ausgaben
    Serial.setDebugOutput(false);
    
@@ -195,6 +205,9 @@ void setupWebserver(AsyncWebServer &server) {
    Serial.print("Geladene Spoolman-URL: ");
    Serial.println(spoolmanUrl);

+    // Load Bamb credentials:
+    loadBambuCredentials();
+
    // Route für about
    server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
        Serial.println("Anfrage für /about erhalten");
@@ -254,31 +267,11 @@ void setupWebserver(AsyncWebServer &server) {
        html.replace("{{spoolmanOctoUrl}}", (octoUrl != "") ? octoUrl : "");
        html.replace("{{spoolmanOctoToken}}", (octoToken != "") ? octoToken : "");

-        JsonDocument doc;
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) 
-        {
-            String bambuIp = doc["bambu_ip"].as<String>();
-            String bambuSerial = doc["bambu_serialnr"].as<String>();
-            String bambuCode = doc["bambu_accesscode"].as<String>();
-            autoSendToBambu = doc["autoSendToBambu"].as<bool>();
-            bambuIp.trim();
-            bambuSerial.trim();
-            bambuCode.trim();
-
-            html.replace("{{bambuIp}}", bambuIp ? bambuIp : "");            
-            html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
-            html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
-            html.replace("{{autoSendToBambu}}", autoSendToBambu ? "checked" : "");
-            html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
-        }
-        else
-        {
-            html.replace("{{bambuIp}}", "");
-            html.replace("{{bambuSerial}}", "");
-            html.replace("{{bambuCode}}", "");
-            html.replace("{{autoSendToBambu}}", "");
-            html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
-        }
+        html.replace("{{bambuIp}}", bambuCredentials.ip);            
+        html.replace("{{bambuSerial}}", bambuCredentials.serial);
+        html.replace("{{bambuCode}}", bambuCredentials.accesscode ? bambuCredentials.accesscode : "");
+        html.replace("{{autoSendToBambu}}", bambuCredentials.autosend_enable ? "checked" : "");
+        html.replace("{{autoSendTime}}", (bambuCredentials.autosend_time != 0) ? String(bambuCredentials.autosend_time) : String(BAMBU_DEFAULT_AUTOSEND_TIME));

        request->send(200, "text/html", html);
    });
--- a/src/website.h
+++ b/src/website.h
@@ -24,7 +24,7 @@ void setupWebserver(AsyncWebServer &server);

 // WebSocket-Funktionen
 void sendAmsData(AsyncWebSocketClient *client);
-void sendNfcData(AsyncWebSocketClient *client);
+void sendNfcData();
 void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
 void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);

--- a/src/wlan.cpp
+++ b/src/wlan.cpp
@@ -61,8 +61,7 @@ void initWiFi() {
  wm.setWiFiAutoReconnect(true);
  wm.setConnectTimeout(10);

-  oledShowTopRow();
-  oledShowMessage("WiFi Setup");
+  oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
  
  //bool res = wm.autoConnect("FilaMan"); // anonymous ap
  if(!wm.autoConnect("FilaMan")) {
@@ -80,9 +79,6 @@ void initWiFi() {
    Serial.println(WiFi.localIP());

    oledShowTopRow();
-    display.display();
-
-    vTaskDelay(500 / portTICK_PERIOD_MS);

    // mDNS
    startMDNS();
				`@@ -0,0 +1 @@`
				`{"bambu_ip": "192.168.1.14", "bambu_accesscode": "22772584", "bambu_serialnr": "01P00C492600230","autoSendToBambu":true,"autoSendTime": 60}`
				`@@ -0,0 +1 @@`
				`{"url": "http://192.168.1.5:7912", "octoEnabled": true, "octoUrl": "http://192.168.1.17:5001", "octoToken": "O5zZ58mXRAyeGpVEj2ZZj-UPAPqJ2N7JgtD36mw1M4g"}`