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

Nfc write improvements

.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

CHANGELOG.md

@@ -1,5 +1,285 @@
 # Changelog
 
+## [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

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

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

html/bambu_credentials.json

@@ -0,0 +1 @@
+{"bambu_ip": "192.168.1.14", "bambu_accesscode": "22772584", "bambu_serialnr": "01P00C492600230","autoSendToBambu":true,"autoSendTime": 60}

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="
@@ -571,7 +578,24 @@ function updateNfcData(data) {
         `;
 
         // Spoolman ID anzeigen
-    html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;
+        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>
+        `;
+     }
+
+    
 
     // Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns
     if (data.sm_id) {
@@ -598,6 +622,7 @@ function updateNfcData(data) {
 }
 
 function writeNfcTag() {
+    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.');
@@ -626,11 +651,11 @@ function writeNfcTag() {
 
         // Erstelle das NFC-Datenpaket mit korrekten Datentypen
         const nfcData = {
-        //color_hex: selectedSpool.filament.color_hex || "FFFFFF",
+            color_hex: selectedSpool.filament.color_hex || "FFFFFF",
-        //type: selectedSpool.filament.material,
+            type: selectedSpool.filament.material,
-        //min_temp: minTemp,
+            min_temp: minTemp,
-        //max_temp: maxTemp,
+            max_temp: maxTemp,
-        //brand: selectedSpool.filament.vendor.name,
+            brand: selectedSpool.filament.vendor.name,
             sm_id: String(selectedSpool.id) // Konvertiere zu String
         };
 
@@ -640,14 +665,17 @@ function writeNfcTag() {
             writeButton.textContent = "Writing";
             socket.send(JSON.stringify({
                 type: 'writeNfcTag',
+                tagType: 'spool',
                 payload: nfcData
             }));
         } else {
             alert('Not connected to Server. Please check connection.');
         }
     }
+}
 
 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.');
@@ -658,18 +686,21 @@ function writeLocationNfcTag() {
             location: String(selectedText)
         };
 
+
         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");

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 -->

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>
+                <h5 class="card-title">Set URL/IP to your Spoolman instance</h5>
-                <input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
+                <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 Spool to Spoolman Octoprint Plugin:</h5>
+                <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>

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"}

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>

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.5.4"
+version = "1.5.11-beta1"
 to_old_version = "1.5.0"
 
 ##
@@ -52,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

src/api.cpp

@@ -2,13 +2,21 @@
 #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;
@@ -16,6 +24,10 @@ struct SendToApiParams {
     String spoolsUrl;
     String updatePayload;
     String octoToken;
+    // Weight update parameters for sequential execution
+    bool triggerWeightUpdate;
+    String spoolIdForWeight;
+    uint16_t weightValue;
 };
 
 JsonDocument fetchSingleSpoolInfo(int spoolId) {
@@ -87,15 +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);
@@ -120,23 +142,103 @@ void sendToApi(void *parameter) {
             Serial.print("Fehler beim Parsen der JSON-Antwort: ");
             Serial.println(error.c_str());
         } else {
-            if (requestType == API_REQUEST_SPOOL_WEIGHT_UPDATE) {
+            switch(requestType){
-                uint16_t remaining_weight = doc["remaining_weight"].as<float>();
+            case API_REQUEST_SPOOL_WEIGHT_UPDATE:
+                remainingWeight = doc["remaining_weight"].as<uint16_t>();
                 Serial.print("Aktuelles Gewicht: ");
-                Serial.println(remaining_weight);
+                Serial.println(remainingWeight);
-                oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
-            }
+                if(!octoEnabled){
-            else if ( requestType == API_REQUEST_SPOOL_LOCATION_UPDATE) {
+                    // TBD: Do not use Strings...
-                oledShowMessage("Location updated!");
+                    oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
-            }
+                    remainingWeight = 0;
-            
-            vTaskDelay(3000 / portTICK_PERIOD_MS);
-            doc.clear();
-        }
-
                 }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");
+            }
+            
+            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);
     }
 
@@ -145,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);
     
@@ -165,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+"\"";
@@ -188,25 +296,32 @@ bool updateSpoolTagId(String uidString, const char* payload) {
     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
+    // Update Spool weight now handled sequentially in sendToApi task
-    if (weight > 10) updateSpoolWeight(doc["sm_id"].as<String>(), weight);
+    // 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);
@@ -222,6 +337,7 @@ 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;
     }
@@ -237,15 +353,20 @@ 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);
@@ -269,6 +390,8 @@ uint8_t updateSpoolLocation(String spoolId, String location){
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
 
+
+    if(apiTask == nullptr){
         // Erstelle die Task
         BaseType_t result = xTaskCreate(
             sendToApi,                // Task-Funktion
@@ -276,15 +399,21 @@ uint8_t updateSpoolLocation(String spoolId, String location){
             6144,                     // Stackgröße in Bytes
             (void*)params,            // Parameter
             0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+            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);
@@ -316,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();
@@ -345,6 +474,10 @@ bool updateSpoolBambuData(String payload) {
 
     String updatePayload;
     serializeJson(updateDoc, updatePayload);
+
+    doc.clear();
+    updateDoc.clear();
+
     Serial.print("Update Payload: ");
     Serial.println(updatePayload);
 
@@ -365,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;
@@ -373,6 +506,8 @@ bool updateSpoolBambuData(String payload) {
 
 // #### Spoolman init
 bool checkSpoolmanExtraFields() {
+    // Only check extra fields if they have not been checked before
+    if(!spoolmanExtraFieldsChecked){
         HTTPClient http;
         String checkUrls[] = {
             spoolmanUrl + apiUrl + "/field/spool",
@@ -511,6 +646,7 @@ bool checkSpoolmanExtraFields() {
                         vTaskDelay(100 / portTICK_PERIOD_MS);
                     }
                 }
+                doc.clear();
             }
         }
         
@@ -519,14 +655,23 @@ bool checkSpoolmanExtraFields() {
 
         http.end();
 
+        spoolmanExtraFieldsChecked = true;
+        return true;
+    }else{
         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: ");
+    // 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";
+
+        Serial.print("Checking spoolman instance: ");
         Serial.println(healthUrl);
 
         http.begin(healthUrl);
@@ -534,9 +679,6 @@ bool checkSpoolmanInstance(const String& url) {
 
         if (httpCode > 0) {
             if (httpCode == HTTP_CODE_OK) {
-            oledShowMessage("Spoolman available");
-            vTaskDelay(1000 / portTICK_PERIOD_MS);
-
                 String payload = http.getString();
                 JsonDocument doc;
                 DeserializationError error = deserializeJson(doc, payload);
@@ -547,6 +689,7 @@ bool checkSpoolmanInstance(const String& url) {
                     if (!checkSpoolmanExtraFields()) {
                         Serial.println("Fehler beim Überprüfen der Extrafelder.");
 
+                        // TBD
                         oledShowMessage("Spoolman Error creating Extrafields");
                         vTaskDelay(2000 / portTICK_PERIOD_MS);
                         
@@ -555,65 +698,72 @@ bool checkSpoolmanInstance(const String& url) {
 
                     spoolmanApiState = API_IDLE;
                     oledShowTopRow();
-                return strcmp(status, "healthy") == 0;
+                    spoolmanConnected = true;
+                    returnValue = strcmp(status, "healthy") == 0;
+                }else{
+                    spoolmanConnected = false;
                 }
+
+                doc.clear();
+            }else{
+                spoolmanConnected = false;
             }
         } else {
+            spoolmanConnected = false;
             Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
         }
         http.end();
-    return false;
+        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;
+    }
+    Serial.println("Healthcheck completed!");
+    return returnValue;
 }
 
-bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk) {
+bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octo_url, const String& octoTk) {
-    if (!checkSpoolmanInstance(url)) return false;
+    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;
+    //TBD: This could be handled nicer in the future
-    doc["url"] = url;
+    spoolmanExtraFieldsChecked = false;
-    doc["octoEnabled"] = octoOn;
-    doc["octoUrl"] = octoWh;
-    doc["octoToken"] = octoTk;
-    Serial.print("Speichere Spoolman Data in Datei: ");
-    Serial.println(doc.as<String>());
-    if (!saveJsonValue("/spoolman_url.json", doc)) {
-        Serial.println("Fehler beim Speichern der Spoolman-URL.");
-        return false;
-    }
     spoolmanUrl = url;
     octoEnabled = octoOn;
-    octoUrl = octoWh;
+    octoUrl = octo_url;
     octoToken = octoTk;
 
-    return true;
+    return checkSpoolmanInstance();
 }
 
 String loadSpoolmanUrl() {
-    JsonDocument doc;
+    Preferences preferences;
-    if (loadJsonValue("/spoolman_url.json", doc) && doc["url"].is<String>()) {
+    preferences.begin(NVS_NAMESPACE_API, true);
-        octoEnabled = (doc["octoEnabled"].is<bool>()) ? doc["octoEnabled"].as<bool>() : false;
+    String spoolmanUrl = preferences.getString(NVS_KEY_SPOOLMAN_URL, "");
-        if (octoEnabled && doc["octoToken"].is<String>() && doc["octoUrl"].is<String>())
+    octoEnabled = preferences.getBool(NVS_KEY_OCTOPRINT_ENABLED, false);
+    if(octoEnabled)
     {
-            octoUrl = doc["octoUrl"].as<String>();
+        octoUrl = preferences.getString(NVS_KEY_OCTOPRINT_URL, "");
-            octoToken = doc["octoToken"].as<String>();
+        octoToken = preferences.getString(NVS_KEY_OCTOPRINT_TOKEN, "");
     }
-
+    preferences.end();
-        return doc["url"].as<String>();
+    return spoolmanUrl;
-    }
-    Serial.println("Keine gültige Spoolman-URL gefunden.");
-    return "";
 }
 
 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;
     }
 

src/api.h

@@ -24,10 +24,12 @@ 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

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")) {
+    Preferences preferences;
-        Serial.println("Fehler beim Löschen der Bambu-Credentials.");
+    preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
-        return false;
+    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 = "";
+    bambuCredentials.ip = "";
-    g_bambu_accesscode = "";
+    bambuCredentials.serial = "";
-    g_bambu_serialnr = "";
+    bambuCredentials.accesscode = "";
-    bambu_ip = nullptr;
+    bambuCredentials.autosend_enable = false;
-    bambu_accesscode = nullptr;
+    bambuCredentials.autosend_time = BAMBU_DEFAULT_AUTOSEND_TIME;
-    bambu_serialnr = nullptr;
+
-    autoSendToBambu = false;
     autoSetToBambuSpoolId = 0;
     ams_count = 0;
     amsJsonData = "";
@@ -69,24 +65,20 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
         vTaskDelete(BambuMqttTask);
     }
 
-    JsonDocument doc;
+    bambuCredentials.ip = ip.c_str();
-    doc["bambu_ip"] = ip;
+    bambuCredentials.serial = serialnr.c_str();
-    doc["bambu_accesscode"] = accesscode;
+    bambuCredentials.accesscode = accesscode.c_str();
-    doc["bambu_serialnr"] = serialnr;
+    bambuCredentials.autosend_enable = autoSend;
-    doc["autoSendToBambu"] = autoSend;
+    bambuCredentials.autosend_time = autoSendTime.toInt();
-    doc["autoSendTime"] = (autoSendTime != "") ? autoSendTime.toInt() : autoSetBambuAmsCounter;
 
-    if (!saveJsonValue("/bambu_credentials.json", doc)) {
+    Preferences preferences;
-        Serial.println("Fehler beim Speichern der Bambu-Credentials.");
+    preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
-        return false;
+    preferences.putString(NVS_KEY_BAMBU_IP, bambuCredentials.ip);
-    }
+    preferences.putString(NVS_KEY_BAMBU_SERIAL, bambuCredentials.serial);
-
+    preferences.putString(NVS_KEY_BAMBU_ACCESSCODE, bambuCredentials.accesscode);
-    // Dynamische Speicherallokation für die globalen Pointer
+    preferences.putBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, bambuCredentials.autosend_enable);
-    bambu_ip = ip.c_str();
+    preferences.putInt(NVS_KEY_BAMBU_AUTOSEND_TIME, bambuCredentials.autosend_time);
-    bambu_accesscode = accesscode.c_str();
+    preferences.end();
-    bambu_serialnr = serialnr.c_str();
-    autoSendToBambu = autoSend;
-    autoSetBambuAmsCounter = autoSendTime.toInt();
 
     vTaskDelay(100 / portTICK_PERIOD_MS);
     if (!setupMqtt()) return false;
@@ -95,36 +87,37 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
 }
 
 bool loadBambuCredentials() {
-    JsonDocument doc;
+    Preferences preferences;
-    if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
+    preferences.begin(NVS_NAMESPACE_BAMBU, true);
-        // Temporäre Strings für die Werte
+    String ip = preferences.getString(NVS_KEY_BAMBU_IP, "");
-        String ip = doc["bambu_ip"].as<String>();
+    String serial = preferences.getString(NVS_KEY_BAMBU_SERIAL, "");
-        String code = doc["bambu_accesscode"].as<String>();
+    String code = preferences.getString(NVS_KEY_BAMBU_ACCESSCODE, "");
-        String serial = doc["bambu_serialnr"].as<String>();
+    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;
+    if(ip != ""){
-        g_bambu_accesscode = code;
+        bambuCredentials.ip = ip.c_str();
-        g_bambu_serialnr = serial;
+        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>();
+        Serial.println("credentials loaded loadCredentials!");
-        if (doc["autoSendTime"].is<int>()) autoSetBambuAmsCounter = doc["autoSendTime"].as<int>();
+        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;
     }
+    else
+    {
         Serial.println("Keine gültigen Bambu-Credentials gefunden.");
         return false;
     }
+}
 
 struct FilamentResult {
     String key;
@@ -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));
+        String clientId = bambuCredentials.serial + "_" + String(random(0, 100));
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) {
+        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) {
+    if (bambuCredentials.ip != "" && bambuCredentials.accesscode != "" && bambuCredentials.serial != "") 
-        bambuDisabled = true;
-        return false;
-    }
-
-    if (success && bambu_ip != "" && bambu_accesscode != "" && bambu_serialnr != "") 
     {
+        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));
+        String clientId = String(bambuCredentials.serial) + "_" + String(random(0, 100));
-        if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) 
+        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");

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();

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

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[];

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);
+}

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));
+    oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, "Display init");
-    vTaskDelay(2000 / portTICK_PERIOD_MS);
 }
 
 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();
 
+    display.setTextSize(1);
+    display.setCursor(0, 4);
+    display.print("v");
+    display.print(VERSION);
+
+    iconToggle = !iconToggle;
+
+    // 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 {
-        display.drawBitmap(50, 0, bitmap_off , 16, 16, WHITE);
+                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 (spoolmanApiState != API_INIT) {
+        if (spoolmanConnected) {
             display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
         } else {
-        display.drawBitmap(80, 0, bitmap_off , 16, 16, WHITE);
+            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 {
-        display.drawBitmap(107, 0, wifi_off , 16, 16, WHITE);
+            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();

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_h(const String &text);
-int oled_center_v(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);
 

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,21 +163,21 @@ void loop() {
     }
   }
 
-  // Wenn Waage nicht Kalibriert
+  // If scale is not calibrated, only show a warning
-  if (scaleCalibrated == 3) 
+  if (!scaleCalibrated) 
   {
-    oledShowMessage("Scale not calibrated!");
+    // Do not show the warning if the calibratin process is onging
-    vTaskDelay(5000 / portTICK_PERIOD_MS);
+    if(!scaleCalibrationActive){
-    yield();
+      oledShowMessage("Scale not calibrated");
-    esp_task_wdt_reset();
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
-    
-    return;
     }
-
+  } 
+  else 
+  {
     // Ausgabe der Waage auf Display
     if(pauseMainTask == 0)
     {
-    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!autoSendToBambu || autoSetToBambuSpoolId == 0)))
+      if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
       {
         (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
       }
@@ -212,18 +227,19 @@ void loop() {
     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) {
+    if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) 
-    oledShowIcon("loading");
-    if (updateSpoolWeight(spoolId, weight)) 
     {
-      oledShowIcon("success");
+      // set the current tag as processed to prevent it beeing processed again
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+      tagProcessed = true;
-      weightSend = 1;
-      autoSetToBambuSpoolId = spoolId.toInt();
 
-      if (octoEnabled) 
+      if (updateSpoolWeight(activeSpoolId, weight)) 
       {
-        updateSpoolOcto(autoSetToBambuSpoolId);
+        weightSend = 1;
+        
+        // Set Bambu spool ID for auto-send if enabled
+        if (bambuCredentials.autosend_enable) 
+        {
+          autoSetToBambuSpoolId = activeSpoolId.toInt();
         }
       }
       else
@@ -233,5 +249,12 @@ void loop() {
       }
     }
 
+    if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
+    {
+      updateSpoolOcto(autoSetToBambuSpoolId);
+      sendOctoUpdate = false;
+    }
+  }
+  
   esp_task_wdt_reset();
 }

src/main.h

@@ -0,0 +1,9 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include <Arduino.h>
+
+
+extern bool booting;
+
+#endif

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,66 +230,79 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
   } 
   else 
   {
+    // 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.containsKey("sm_id") && doc["sm_id"] != "") 
+      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>());
-      spoolId = doc["sm_id"].as<String>();
+        activeSpoolId = doc["sm_id"].as<String>();
+        lastSpoolId = activeSpoolId;
       }
-    else if(doc.containsKey("location") && doc["location"] != "")
+      else if(doc["location"].is<String>() && doc["location"] != "")
       {
         Serial.println("Location Tag found!");
         String location = doc["location"].as<String>();
-      if(spoolId != ""){
+        if(lastSpoolId != ""){
-        updateSpoolLocation(spoolId, location);
+          updateSpoolLocation(lastSpoolId, location);
         }
         else
         {
           Serial.println("Location update tag scanned without scanning spool before!");
-        oledShowMessage("No spool scanned before!");
+          oledShowProgressBar(1, 1, "Failure", "Scan spool first");
         }
-
       }
       else 
       {
         Serial.println("Keine SPOOL-ID gefunden.");
-      spoolId = "";
+        activeSpoolId = "";
-      oledShowMessage("Unknown Spool");
+        oledShowProgressBar(1, 1, "Failure", "Unkown tag");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+      }
+    }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
@@ -284,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));
@@ -293,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)) {
+        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;
-          oledShowIcon("success");
+        yield();
-          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+        esp_task_wdt_reset();
+        while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400)) {
           yield();
         } 
-        }
-          
         vTaskResume(RfidReaderTask);
         vTaskDelay(500 / portTICK_PERIOD_MS);        
     } 
@@ -330,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) {
+void startWriteJsonToTag(const bool isSpoolTag, const char* payload) {
-  char* payloadCopy = strdup(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)
   }
 }
 
@@ -365,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");
+        oledShowProgressBar(0, octoEnabled?5:4, "Reading", "Detecting tag");
-        vTaskDelay(500 / portTICK_PERIOD_MS);
+
+        //vTaskDelay(500 / portTICK_PERIOD_MS);
         
         if (uidLength == 7)
         {
@@ -418,8 +464,7 @@ void scanRfidTask(void * parameter) {
 
             if (!decodeNdefAndReturnJson(data)) 
             {
-              oledShowMessage("NFC-Tag unknown");
+              oledShowProgressBar(1, 1, "Failure", "Unknown tag");
-              vTaskDelay(2000 / portTICK_PERIOD_MS);
               nfcReaderState = NFC_READ_ERROR;
             }
             else 
@@ -431,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

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;
 
 
 

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;
             }

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;
+bool scaleCalibrated;
-
-Preferences preferences;
-const char* NVS_NAMESPACE = "scale";
-const char* NVS_KEY_CALIBRATION = "cal_value";
-const char* NVS_KEY_AUTOTARE = "auto_tare";
 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()) 
     {
@@ -90,8 +89,15 @@ void start_scale(bool touchSensorConnected) {
   float calibrationValue;
 
   // NVS lesen
-  preferences.begin(NVS_NAMESPACE, true); // true = readonly
+  Preferences preferences;
-  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  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
@@ -106,19 +112,7 @@ void start_scale(bool touchSensorConnected) {
 
   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
 
-  if (isnan(calibrationValue) || calibrationValue < 1) {
+  oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
-    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");
   for (uint16_t i = 0; i < 2000; i++) {
     yield();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -128,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
@@ -155,6 +149,8 @@ uint8_t calibrate_scale() {
   uint8_t returnState = 0;
   float newCalibrationValue;
 
+  scaleCalibrationActive = true;
+
   vTaskSuspend(RfidReaderTask);
   vTaskSuspend(ScaleTask);
 
@@ -165,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();
@@ -177,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();
@@ -197,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");
+      oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
-
-      oledShowMessage("Remove weight");
 
       scale.set_scale(newCalibrationValue);
       for (uint16_t i = 0; i < 2000; i++) {
@@ -220,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();
@@ -232,15 +227,14 @@ uint8_t calibrate_scale() {
         esp_task_wdt_reset();
       }
 
+      scaleCalibrated = true;
       returnState = 1;
     }
-   
     else
-    {
     {
       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();
@@ -250,7 +244,6 @@ uint8_t calibrate_scale() {
       returnState = 0;
     } 
   }
-  }
   else 
   {
     Serial.println("HX711 not found.");
@@ -269,6 +262,7 @@ uint8_t calibrate_scale() {
   vTaskResume(ScaleTask);
   pauseBambuMqttTask = false;
   pauseMainTask = 0;
+  scaleCalibrationActive = false;
 
   return returnState;
 }

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;
 

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;
+        html.replace("{{bambuIp}}", bambuCredentials.ip);            
-        if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) 
+        html.replace("{{bambuSerial}}", bambuCredentials.serial);
-        {
+        html.replace("{{bambuCode}}", bambuCredentials.accesscode ? bambuCredentials.accesscode : "");
-            String bambuIp = doc["bambu_ip"].as<String>();
+        html.replace("{{autoSendToBambu}}", bambuCredentials.autosend_enable ? "checked" : "");
-            String bambuSerial = doc["bambu_serialnr"].as<String>();
+        html.replace("{{autoSendTime}}", (bambuCredentials.autosend_time != 0) ? String(bambuCredentials.autosend_time) : String(BAMBU_DEFAULT_AUTOSEND_TIME));
-            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));
-        }
 
         request->send(200, "text/html", html);
     });

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);
 

src/wlan.cpp

@@ -61,8 +61,7 @@ void initWiFi() {
   wm.setWiFiAutoReconnect(true);
   wm.setConnectTimeout(10);
 
-  oledShowTopRow();
+  oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
-  oledShowMessage("WiFi Setup");
   
   //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();