Merge pull request #44 from janecker/graphics_rework

Graphics rework

.gitignore

@@ -0,0 +1,41 @@
+.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
+html/bambu_credentials.json
+html/spoolman_url.json
+_local/*
+website/*
+release.sh
+.github/copilot-instructions.md
+data

CHANGELOG.md

@@ -1,5 +1,96 @@
 # Changelog
 
+## [1.5.7] - 2025-07-28
+### Changed
+- update platformio.ini for version v1.5.7
+- clean up unused variables and improve .gitignore entries
+
+
+## [1.5.6] - 2025-07-28
+### Added
+- Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags
+- Adds data directory and further .vscode files to to .gitignore
+- Introduces new heap debugging feature and fixes some memory leaks in website feature
+
+### Changed
+- update webpages for version v1.5.6
+- update platformio.ini for version v1.5.6
+- Merge pull request #42 from janecker/configuration_nvs_storage
+- Merge branch 'main' into configuration_nvs_storage
+- Changes configuration storage of spoolman and bambu values
+
+### Fixed
+- Merge pull request #41 from janecker/memory_leak_fixes
+- Fixes compiler warnings in nfc
+- Memory leak fixes in api and nfc, location tag fix
+
+
+## [1.5.5] - 2025-07-22
+### Added
+- Fixes some issues with the new location tags
+
+### Changed
+- update platformio.ini for version v1.5.5
+
+### Fixed
+- Merge pull request #40 from janecker/location_bambu_fix
+
+
+## [1.5.4] - 2025-07-22
+### Added
+- Adds new feature to write and read location tags
+- Adds slight debouncing to the scale loop weight logic
+- add loadcell desc.
+
+### Changed
+- update platformio.ini for version v1.5.4
+- Merge branch 'main' of github.com:ManuelW77/Filaman
+- Merge pull request #39 from janecker/location_tags
+- Merge pull request #38 from janecker/scale_debouncing
+
+### Fixed
+- uncomment monitor_port configuration in platformio.ini
+
+
+## [1.5.3] - 2025-04-25
+### Changed
+- update platformio.ini for version v1.5.3
+- Affiliate Links
+
+### Fixed
+- update spool weight conditionally based on NFC ID
+
+
+## [1.5.2] - 2025-04-23
+### Added
+- 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
+
+### Changed
+- update platformio.ini for version v1.5.2
+
+### Fixed
+- 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
+
+
+## [1.5.1] - 2025-03-30
+### Changed
+- update version to 1.5.1 and improve OTA update handling with task management
+
+
+## [1.4.14] - 2025-03-30
+### Added
+- add auto-tare functionality and update scale handling based on touch sensor connection
+
+### Changed
+- update platformio.ini for version v1.4.14
+
+
 ## [1.4.13] - 2025-03-30
 ### Changed
 - update platformio.ini for version v1.4.13

README.de.md

@@ -54,7 +54,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 
 ## Hardware-Anforderungen
 
-### Komponenten
+### Komponenten (Affiliate Links)
 - **ESP32 Development Board:** Any ESP32 variant.
 [Amazon Link](https://amzn.to/3FHea6D)
 - **HX711 5kg Load Cell Amplifier:** For weight measurement.
@@ -90,6 +90,12 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 ![myWiring](./img/IMG_2589.jpeg)
 ![myWiring](./img/IMG_2590.jpeg)
 
+*Die Wägezelle wird bei den meisten HX711 Modulen folgendermaßen verkabelt:  
+E+ rot  
+E- schwarz  
+A- weiß  
+A+ grün*
+
 ## Software-Abhängigkeiten
 
 ### ESP32-Bibliotheken

README.md

@@ -58,7 +58,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 
 ## Hardware Requirements
 
-### Components
+### Components (Affiliate Links)
 - **ESP32 Development Board:** Any ESP32 variant.
 [Amazon Link](https://amzn.to/3FHea6D)
 - **HX711 5kg Load Cell Amplifier:** For weight measurement.
@@ -94,6 +94,12 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
 ![myWiring](./img/IMG_2589.jpeg)
 ![myWiring](./img/IMG_2590.jpeg)
 
+*The load cell is connected to most HX711 modules as follows:  
+E+ red  
+E- black  
+A- white  
+A+ green*
+
 ## Software Dependencies
 
 ### ESP32 Libraries

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

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

html/rfid.js

@@ -215,20 +215,6 @@ document.addEventListener('filamentSelected', function (event) {
     updateSpoolButtons(selectedText !== "Please choose...");
 });
 
-// Hilfsfunktion für kontrastreiche Textfarbe
-function getContrastColor(hexcolor) {
-    // Konvertiere Hex zu RGB
-    const r = parseInt(hexcolor.substr(0,2),16);
-    const g = parseInt(hexcolor.substr(2,2),16);
-    const b = parseInt(hexcolor.substr(4,2),16);
-    
-    // Berechne Helligkeit (YIQ Formel)
-    const yiq = ((r*299)+(g*587)+(b*114))/1000;
-    
-    // Return schwarz oder weiß basierend auf Helligkeit
-    return (yiq >= 128) ? '#000000' : '#FFFFFF';
-}
-
 function updateNfcInfo() {
     const selectedText = document.getElementById("selected-filament").textContent;
     const nfcInfo = document.getElementById("nfcInfo");
@@ -569,7 +555,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="
@@ -586,6 +575,23 @@ function updateNfcData(data) {
 
         // Spoolman ID anzeigen
         html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</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) {
@@ -654,6 +660,32 @@ 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() {
+    const selectedText = document.getElementById("locationSelect").value;
+    if (selectedText === "Please choose...") {
+        alert('Please select a location first.');
+        return;
+    }
+    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+    const nfcData = {
+        location: String(selectedText)
+    };
+
+    if (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 {
@@ -663,6 +695,8 @@ function writeNfcTag() {
 
 function handleWriteNfcTagResponse(success) {
     const writeButton = document.getElementById("writeNfcButton");
+    const writeLocationButton = document.getElementById("writeLocationNfcButton");
+    if(writeButton.classList.contains("writing")){
         writeButton.classList.remove("writing");
         writeButton.classList.add(success ? "success" : "error");
         writeButton.textContent = success ? "Write success" : "Write failed";
@@ -673,6 +707,20 @@ function handleWriteNfcTagResponse(success) {
         }, 5000);
     }
 
+    if(writeLocationButton.classList.contains("writing")){
+        writeLocationButton.classList.remove("writing");
+        writeLocationButton.classList.add(success ? "success" : "error");
+        writeLocationButton.textContent = success ? "Write success" : "Write failed";
+
+        setTimeout(() => {
+            writeLocationButton.classList.remove("success", "error");
+            writeLocationButton.textContent = "Write Location Tag";
+        }, 5000);
+    }
+
+    
+}
+
 function showNotification(message, isSuccess) {
     const notification = document.createElement('div');
     notification.className = `notification ${isSuccess ? 'success' : 'error'}`;

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

@@ -1,6 +1,7 @@
 // Globale Variablen
 let spoolmanUrl = '';
 let spoolsData = [];
+let locationData = [];
 
 // Hilfsfunktionen für Datenmanipulation
 function processSpoolData(data) {
@@ -133,6 +134,26 @@ function populateVendorDropdown(data, selectedSmId = null) {
     }
 }
 
+// Dropdown-Funktionen
+function populateLocationDropdown(data) {
+    const locationSelect = document.getElementById("locationSelect");
+    if (!locationSelect) {
+        console.error('locationSelect Element nicht gefunden');
+        return;
+    }
+
+    locationSelect.innerHTML = '<option value="">Bitte wählen...</option>';
+    // Dropdown mit gefilterten Herstellern befüllen - alphabetisch sortiert
+    Object.entries(data)
+        .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB)) // Sort vendors alphabetically by name
+        .forEach(([id, name]) => {
+            const option = document.createElement("option");
+            option.value = name;
+            option.textContent = name;
+            locationSelect.appendChild(option);
+        });
+}
+
 function updateFilamentDropdown(selectedSmId = null) {
     const vendorId = document.getElementById("vendorSelect").value;
     const dropdownContentInner = document.getElementById("filament-dropdown-content");
@@ -169,9 +190,32 @@ function updateFilamentDropdown(selectedSmId = null) {
             option.setAttribute("data-value", spool.filament.id);
             option.setAttribute("data-nfc-id", spool.extra.nfc_id || "");
             
+
+            // Generate color representation based on filament type (single or multi color)
+            let colorHTML = '';
+            
+            // Check if this is a multicolor filament
+            if (spool.filament.multi_color_hexes) {
+                // Parse multi color hexes from comma-separated string
+                const colors = spool.filament.multi_color_hexes.replace(/#/g, '').split(',');
+                
+                // Determine the display style based on direction
+                const direction = spool.filament.multi_color_direction || 'coaxial';
+                
+                // Generate color circles for each color
+                colorHTML = '<div class="option-colors">';
+                colors.forEach(color => {
+                    colorHTML += `<div class="option-color multi-color ${direction}" style="background-color: #${color}"></div>`;
+                });
+                colorHTML += '</div>';
+            } else {
+                // Single color filament
                 const colorHex = spool.filament.color_hex || 'FFFFFF';
+                colorHTML = `<div class="option-color" style="background-color: #${colorHex}"></div>`;
+            }
+            
             option.innerHTML = `
-                <div class="option-color" style="background-color: #${colorHex}"></div>
+                ${colorHTML}
                 <span>${spool.id} | ${spool.filament.name} (${spool.filament.material})</span>
             `;
             
@@ -185,12 +229,41 @@ function updateFilamentDropdown(selectedSmId = null) {
     }
 }
 
+function updateLocationSelect(){
+    const writeLocationNfcButton = document.getElementById('writeLocationNfcButton');
+    if(writeLocationNfcButton){
+        writeLocationNfcButton.classList.remove("hidden");
+    }
+}
+
 function selectFilament(spool) {
     const selectedColor = document.getElementById("selected-color");
     const selectedText = document.getElementById("selected-filament");
     const dropdownContent = document.getElementById("filament-dropdown-content");
     
+    // Update the selected color display
+    if (spool.filament.multi_color_hexes) {
+        // Handle multicolor filament display in the selection header
+        const colors = spool.filament.multi_color_hexes.replace(/#/g, '').split(',');
+        const direction = spool.filament.multi_color_direction || 'coaxial';
+        
+        // Replace the single color div with multiple color divs
+        selectedColor.innerHTML = '';
+        colors.forEach(color => {
+            const colorDiv = document.createElement('div');
+            colorDiv.className = `color-segment multi-color ${direction}`;
+            colorDiv.style.backgroundColor = `#${color}`;
+            selectedColor.appendChild(colorDiv);
+        });
+        // Add multiple color class to the container
+        selectedColor.classList.add('multi-color-container');
+    } else {
+        // Single color filament - reset to default display
+        selectedColor.innerHTML = '';
+        selectedColor.classList.remove('multi-color-container');
         selectedColor.style.backgroundColor = `#${spool.filament.color_hex || 'FFFFFF'}`;
+    }
+    
     selectedText.textContent = `${spool.id} | ${spool.filament.name} (${spool.filament.material})`;
     dropdownContent.classList.remove("show");
     
@@ -220,6 +293,14 @@ async function initSpoolman() {
         document.dispatchEvent(new CustomEvent('spoolDataLoaded', { 
             detail: spoolsData 
         }));
+        
+        locationData = await fetchLocationData();
+        
+        document.dispatchEvent(new CustomEvent('locationDataLoaded', { 
+            detail: locationData 
+        }));
+
+
     } catch (error) {
         console.error('Fehler beim Initialisieren von Spoolman:', error);
         document.dispatchEvent(new CustomEvent('spoolmanError', { 
@@ -247,6 +328,25 @@ async function fetchSpoolData() {
     }
 }
 
+async function fetchLocationData() {
+    try {
+        if (!spoolmanUrl) {
+            throw new Error('Spoolman URL ist nicht initialisiert');
+        }
+        
+        const response = await fetch(`${spoolmanUrl}/api/v1/location`);
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        
+        const data = await response.json();
+        return data;
+    } catch (error) {
+        console.error('Fehler beim Abrufen der Location-Daten:', error);
+        return [];
+    }
+}
+
 // Event Listener
 document.addEventListener('DOMContentLoaded', () => {
     initSpoolman();
@@ -256,6 +356,11 @@ document.addEventListener('DOMContentLoaded', () => {
         vendorSelect.addEventListener('change', () => updateFilamentDropdown());
     }
 
+    const locationSelect = document.getElementById('locationSelect');
+    if (locationSelect) {
+        locationSelect.addEventListener('change', () => updateLocationSelect());
+    }
+    
     const onlyWithoutSmId = document.getElementById('onlyWithoutSmId');
     if (onlyWithoutSmId) {
         onlyWithoutSmId.addEventListener('change', () => {
@@ -268,6 +373,10 @@ document.addEventListener('DOMContentLoaded', () => {
         populateVendorDropdown(event.detail);
     });
 
+    document.addEventListener('locationDataLoaded', (event) => {
+        populateLocationDropdown(event.detail);
+    });
+    
     window.onclick = function(event) {
         if (!event.target.closest('.custom-dropdown')) {
             const dropdowns = document.getElementsByClassName("dropdown-content");
@@ -297,6 +406,7 @@ window.getSpoolData = () => spoolsData;
 window.setSpoolData = (data) => { spoolsData = data; };
 window.reloadSpoolData = initSpoolman;
 window.populateVendorDropdown = populateVendorDropdown;
+window.populateLocationDropdown = populateLocationDropdown;
 window.updateFilamentDropdown = updateFilamentDropdown;
 window.toggleFilamentDropdown = () => {
     const content = document.getElementById("filament-dropdown-content");

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/style.css

@@ -759,6 +759,50 @@ a:hover {
     flex-shrink: 0;
 }
 
+/* Multi-color filament styles */
+.option-colors {
+    display: flex;
+    flex-shrink: 0;
+    gap: 2px;
+}
+
+.multi-color {
+    width: 14px;
+    height: 14px;
+    border-radius: 50%;
+    border: 1px solid #333;
+}
+
+/* Coaxial pattern (horizontal stripes) */
+.multi-color.coaxial {
+    border-radius: 50%;
+    position: relative;
+}
+
+/* Longitudinal pattern (vertical stripes) */
+.multi-color.longitudinal {
+    border-radius: 50%;
+    position: relative;
+}
+
+/* Container for multiple colors in selected display */
+.multi-color-container {
+    display: flex !important;
+    background: none !important;
+    border: none !important;
+    gap: 2px;
+    align-items: center;
+    justify-content: flex-start;
+    width: auto !important;
+}
+
+.color-segment {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    border: 1px solid #333;
+}
+
 .notification {
     position: fixed;
     top: 20px;
@@ -927,31 +971,35 @@ input[type="submit"]:disabled,
 }
 
 /* Schreib-Button */
-#writeNfcButton {
+#writeNfcButton, #writeLocationNfcButton {
     background-color: #007bff;
     color: white;
     transition: background-color 0.3s, color 0.3s;
     width: 160px;
 }
 
-#writeNfcButton.writing {
+#writeNfcButton.writing, #writeLocationNfcButton.writing {
     background-color: #ffc107;
     color: black;
     width: 160px;
 }
 
-#writeNfcButton.success {
+#writeNfcButton.success, #writeLocationNfcButton.success {
     background-color: #28a745;
     color: white;
     width: 160px;
 }
 
-#writeNfcButton.error {
+#writeNfcButton.error, #writeLocationNfcButton.error {
     background-color: #dc3545;
     color: white;
     width: 160px;
 }
 
+#writeLocationNfcButton{
+    width: 250px;
+}
+
 @keyframes dots {
     0% { content: ""; }
     33% { content: "."; }
@@ -959,7 +1007,7 @@ input[type="submit"]:disabled,
     100% { content: "..."; }
 }
 
-#writeNfcButton.writing::after {
+#writeNfcButton.writing::after, #writeLocationNfcButton.writing::after {
     content: "...";
     animation: dots 1s steps(3, end) infinite;
 }

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>

html/waage.html

@@ -55,6 +55,7 @@
                 <h5 class="card-title">Sacle Calibration</h5>
                 <button id="calibrateBtn" class="btn btn-primary">Calibrate Scale</button>
                 <button id="tareBtn" class="btn btn-secondary">Tare Scale</button>
+                &nbsp;&nbsp;&nbsp;Enable Auto-TARE <input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" {{autoTare}}>
                 <div id="statusMessage" class="mt-3"></div>
             </div>
         </div>
@@ -140,6 +141,15 @@
             }));
         });
 
+        // Add auto-tare function
+        function setAutoTare(enabled) {
+            ws.send(JSON.stringify({
+                type: 'scale',
+                payload: 'setAutoTare',
+                enabled: enabled
+            }));
+        }
+
         // WebSocket-Verbindung beim Laden der Seite initiieren
         connectWebSocket();
     </script>

platformio.ini

@@ -9,8 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.4.13"
+version = "1.5.7"
-to_old_version = "1.4.0"
+to_old_version = "1.5.0"
 
 ##
 [env:esp32dev]
@@ -18,6 +18,7 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
+#monitor_port = /dev/cu.usbmodem01
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
@@ -51,6 +52,7 @@ build_flags =
     -mtext-section-literals
     -DVERSION=\"${common.version}\"
     -DTOOLDVERSION=\"${common.to_old_version}\"
+    #-DENABLE_HEAP_DEBUGGING
     -DASYNCWEBSERVER_REGEX
     #-DCORE_DEBUG_LEVEL=3
     -DCONFIG_ARDUHAL_LOG_COLORS=1

scripts/gzip_files.py

@@ -14,7 +14,7 @@ def copy_file(input_file, output_file):
 
 def should_compress(file):
      # Skip compression for spoolman.html
-    if file == 'spoolman.html':
+    if file == 'spoolman.html' or file == 'waage.html':
         return False
     # Komprimiere nur bestimmte Dateitypen
     return file.endswith(('.js', '.png', '.css', '.html'))

src/api.cpp

@@ -2,15 +2,21 @@
 #include <HTTPClient.h>
 #include <ArduinoJson.h>
 #include "commonFS.h"
+#include <Preferences.h>
+#include "debug.h"
 
 volatile spoolmanApiStateType spoolmanApiState = API_INIT;
 //bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
+bool sendOctoUpdate = false;
 String octoUrl = "";
 String octoToken = "";
+uint16_t remainingWeight = 0;
+bool spoolmanConnected = false;
 
 struct SendToApiParams {
+    SpoolmanApiRequestType requestType;
     String httpType;
     String spoolsUrl;
     String updatePayload;
@@ -86,10 +92,13 @@ JsonDocument fetchSingleSpoolInfo(int spoolId) {
 }
 
 void sendToApi(void *parameter) {
+    HEAP_DEBUG_MESSAGE("sendToApi begin");
+
     spoolmanApiState = API_TRANSMITTING;
     SendToApiParams* params = (SendToApiParams*)parameter;
 
     // Extrahiere die Werte
+    SpoolmanApiRequestType requestType = params->requestType;
     String httpType = params->httpType;
     String spoolsUrl = params->spoolsUrl;
     String updatePayload = params->updatePayload;
@@ -109,9 +118,61 @@ void sendToApi(void *parameter) {
 
     if (httpCode == HTTP_CODE_OK) {
         Serial.println("Spoolman erfolgreich aktualisiert");
+
+        // Restgewicht der Spule auslesen
+        String payload = http.getString();
+        JsonDocument doc;
+        DeserializationError error = deserializeJson(doc, payload);
+        if (error) {
+            Serial.print("Fehler beim Parsen der JSON-Antwort: ");
+            Serial.println(error.c_str());
         } else {
-        Serial.println("Fehler beim Senden an Spoolman!");
+            switch(requestType){
-        oledShowMessage("Spoolman update failed");
+            case API_REQUEST_SPOOL_WEIGHT_UPDATE:
+                remainingWeight = doc["remaining_weight"].as<uint16_t>();
+                Serial.print("Aktuelles Gewicht: ");
+                Serial.println(remainingWeight);
+                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                if(!octoEnabled){
+                    // TBD: Do not use Strings...
+                    oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
+                    remainingWeight = 0;
+                }else{
+                    // ocoto is enabled, trigger octo update
+                    sendOctoUpdate = true;
+                }
+                break;
+            case API_REQUEST_SPOOL_LOCATION_UPDATE:
+                oledShowProgressBar(1, 1, "Loc. Tag", "Done!");
+                break;
+            case API_REQUEST_SPOOL_TAG_ID_UPDATE:
+                oledShowProgressBar(1, 1, "Write Tag", "Done!");
+                break;
+            case API_REQUEST_OCTO_SPOOL_UPDATE:
+                // TBD: Do not use Strings...
+                oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
+                remainingWeight = 0;
+                break;
+            }
+        }
+        doc.clear();
+    } 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));
+
+        // TBD: really required?
         vTaskDelay(2000 / portTICK_PERIOD_MS);
     }
 
@@ -120,11 +181,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);
     
@@ -144,6 +208,8 @@ bool updateSpoolTagId(String uidString, const char* payload) {
     Serial.print("Update Spule mit URL: ");
     Serial.println(spoolsUrl);
     
+    doc.clear();
+
     // Update Payload erstellen
     JsonDocument updateDoc;
     updateDoc["extra"]["nfc_id"] = "\""+uidString+"\"";
@@ -158,6 +224,7 @@ bool updateSpoolTagId(String uidString, const char* payload) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return false;
     }
+    params->requestType = API_REQUEST_SPOOL_TAG_ID_UPDATE;
     params->httpType = "PATCH";
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
@@ -166,7 +233,7 @@ bool updateSpoolTagId(String uidString, const char* payload) {
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
-        4096,                     // Stackgröße in Bytes
+        6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
@@ -174,10 +241,16 @@ bool updateSpoolTagId(String uidString, const char* payload) {
 
     updateDoc.clear();
 
+    // Update Spool weight
+    //TBD: how to handle this with spool and locatin tags? Also potential parallel access again
+    //if (weight > 10) updateSpoolWeight(doc["sm_id"].as<String>(), weight);
+
     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);
@@ -193,9 +266,11 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
 
     SendToApiParams* params = new SendToApiParams();
     if (params == nullptr) {
+        // TBD: reset ESP instead of showing a message
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return 0;
     }
+    params->requestType = API_REQUEST_SPOOL_WEIGHT_UPDATE;
     params->httpType = "PUT";
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
@@ -204,18 +279,70 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
-        4096,                     // Stackgröße in Bytes
+        6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
+    HEAP_DEBUG_MESSAGE("updateSpoolWeight end");
 
     return 1;
 }
 
+uint8_t updateSpoolLocation(String spoolId, String location){
+    HEAP_DEBUG_MESSAGE("updateSpoolLocation begin");
+
+    oledShowProgressBar(3, octoEnabled?5:4, "Loc. Tag", "Spoolman update");
+
+    String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
+    Serial.print("Update Spule mit URL: ");
+    Serial.println(spoolsUrl);
+
+    // Update Payload erstellen
+    JsonDocument updateDoc;
+    updateDoc["location"] = location;
+    
+    String updatePayload;
+    serializeJson(updateDoc, updatePayload);
+    Serial.print("Update Payload: ");
+    Serial.println(updatePayload);
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        return 0;
+    }
+    params->requestType = API_REQUEST_SPOOL_LOCATION_UPDATE;
+    params->httpType = "PATCH";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = updatePayload;
+
+    if(spoolmanApiState == API_IDLE){
+    // Erstelle die Task
+    BaseType_t result = xTaskCreate(
+        sendToApi,                // Task-Funktion
+        "SendToApiTask",          // Task-Name
+        6144,                     // Stackgröße in Bytes
+        (void*)params,            // Parameter
+        0,                        // Priorität
+        NULL                      // Task-Handle (nicht benötigt)
+    );
+
+    }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);
@@ -234,6 +361,7 @@ bool updateSpoolOcto(int spoolId) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return false;
     }
+    params->requestType = API_REQUEST_OCTO_SPOOL_UPDATE;
     params->httpType = "POST";
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
@@ -243,7 +371,7 @@ bool updateSpoolOcto(int spoolId) {
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
-        4096,                     // Stackgröße in Bytes
+        6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
@@ -275,6 +403,10 @@ bool updateSpoolBambuData(String payload) {
 
     String updatePayload;
     serializeJson(updateDoc, updatePayload);
+
+    doc.clear();
+    updateDoc.clear();
+
     Serial.print("Update Payload: ");
     Serial.println(updatePayload);
 
@@ -283,6 +415,7 @@ bool updateSpoolBambuData(String payload) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return false;
     }
+    params->requestType = API_REQUEST_BAMBU_UPDATE;
     params->httpType = "PATCH";
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
@@ -291,7 +424,7 @@ bool updateSpoolBambuData(String payload) {
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
-        4096,                     // Stackgröße in Bytes
+        6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
@@ -440,6 +573,7 @@ bool checkSpoolmanExtraFields() {
                     vTaskDelay(100 / portTICK_PERIOD_MS);
                 }
             }
+            doc.clear();
         }
     }
     
@@ -463,9 +597,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);
@@ -476,6 +607,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);
                     
@@ -484,53 +616,53 @@ bool checkSpoolmanInstance(const String& url) {
 
                 spoolmanApiState = API_IDLE;
                 oledShowTopRow();
+                spoolmanConnected = true;
                 return strcmp(status, "healthy") == 0;
             }
+
+            doc.clear();
         }
+    } else {
+        Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
     }
     http.end();
     return false;
 }
 
-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;
-    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;
 }
 
 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 == "") {

src/api.h

@@ -12,12 +12,22 @@ typedef enum {
     API_TRANSMITTING
 } spoolmanApiStateType;
 
+typedef enum {
+    API_REQUEST_OCTO_SPOOL_UPDATE,
+    API_REQUEST_BAMBU_UPDATE,
+    API_REQUEST_SPOOL_TAG_ID_UPDATE,
+    API_REQUEST_SPOOL_WEIGHT_UPDATE,
+    API_REQUEST_SPOOL_LOCATION_UPDATE
+} SpoolmanApiRequestType;
+
 extern volatile spoolmanApiStateType spoolmanApiState;
 extern bool spoolman_connected;
 extern String spoolmanUrl;
 extern bool octoEnabled;
+extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
+extern bool spoolmanConnected;
 
 bool checkSpoolmanInstance(const String& url);
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
@@ -26,6 +36,7 @@ bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafeld
 JsonDocument fetchSingleSpoolInfo(int spoolId); // API-Funktion für die Webseite
 bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
+uint8_t updateSpoolLocation(String spoolId, String location);
 bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
 bool updateSpoolBambuData(String payload); // Neue Funktion zum Aktualisieren der Bambu-Daten
 bool updateSpoolOcto(int spoolId); // Neue Funktion zum Aktualisieren der Octo-Daten

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");
@@ -674,6 +663,7 @@ bool setupMqtt() {
             vTaskDelay(2000 / portTICK_PERIOD_MS);
             connected = false;
             oledShowTopRow();
+            autoSetToBambuSpoolId = 0;
         }
 
         if (!connected) return false;
@@ -687,6 +677,8 @@ bool setupMqtt() {
 }
 
 void bambu_restart() {
+    Serial.println("Bambu restart");
+
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
         delay(10);

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

@@ -26,16 +26,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 +41,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,37 @@
 
 #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 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"
+
+
 extern const uint8_t PN532_IRQ;
 extern const uint8_t PN532_RESET;
 
@@ -13,10 +44,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 +52,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() {
@@ -48,16 +49,6 @@ void setup() {
   // NFC Reader
   startNfc();
 
-  // Scale
-  start_scale();
-
-  // WDT initialisieren mit 10 Sekunden Timeout
-  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
-  esp_task_wdt_init(10, panic);
-
-  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
-  esp_task_wdt_add(NULL);
-
   // Touch Sensor
   pinMode(TTP223_PIN, INPUT_PULLUP);
   if (digitalRead(TTP223_PIN) == LOW) 
@@ -65,6 +56,17 @@ void setup() {
     Serial.println("Touch Sensor is connected");
     touchSensorConnected = true;
   }
+
+  // Scale
+  start_scale(touchSensorConnected);
+
+  // WDT initialisieren mit 10 Sekunden Timeout
+  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
+  esp_task_wdt_init(10, panic);
+
+  booting = false;
+  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
+  esp_task_wdt_add(NULL);
 }
 
 
@@ -118,8 +120,14 @@ void loop() {
     checkWiFiConnection();
   }
 
+  // Periodic display update
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, 1000)) 
+  {
+    oledShowTopRow();
+  }
+
   // Wenn Bambu auto set Spool aktiv
-  if (autoSendToBambu && autoSetToBambuSpoolId > 0) 
+  if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0) 
   {
     if (!bambuDisabled && !bambu_connected) 
     {
@@ -131,10 +139,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;
@@ -162,7 +170,7 @@ void loop() {
   // 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);
     }
@@ -179,8 +187,19 @@ void loop() {
   {
     lastWeightReadTime = currentMillis;
 
+    // Prüfen ob die Waage korrekt genullt ist
+    // Abweichung von 2g ignorieren
+    if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+    {
+      scale_tare_counter++;
+    }
+    else
+    {
+      scale_tare_counter = 0;
+    }
+
     // Prüfen ob das Gewicht gleich bleibt und dann senden
-    if (weight == lastWeight && weight > 5)
+    if (abs(weight - lastWeight) <= 2 && weight > 5)
     {
       weigthCouterToApi++;
     } 
@@ -201,19 +220,14 @@ 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");
+    // set the current tag as processed to prevent it beeing processed again
-    if (updateSpoolWeight(spoolId, weight)) 
+    tagProcessed = true;
-    {
-      oledShowIcon("success");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
-      weightSend = 1;
-      autoSetToBambuSpoolId = spoolId.toInt();
 
-      if (octoEnabled) 
+    if (updateSpoolWeight(activeSpoolId, weight)) 
     {
-        updateSpoolOcto(autoSetToBambuSpoolId);
+      weightSend = 1;
-      }
+      
     }
     else
     {
@@ -222,5 +236,15 @@ void loop() {
     }
   }
 
+  if(sendOctoUpdate && spoolmanApiState == API_IDLE){
+    autoSetToBambuSpoolId = activeSpoolId.toInt();
+
+    if(octoEnabled) 
+    {
+      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,7 @@
 #include "api.h"
 #include "esp_task_wdt.h"
 #include "scale.h"
+#include "bambu.h"
 
 //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
 Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -14,10 +15,17 @@ 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;
 
+struct NfcWriteParameterType {
+  bool tagType;
+  char* payload;
+};
+
 volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
 // 0 = nicht gelesen
 // 1 = erfolgreich gelesen
@@ -64,6 +72,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 +202,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,32 +227,55 @@ 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["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;
+
+        Serial.println("Api state: " + String(spoolmanApiState));
+      }
+      else if(doc["location"].is<String>() && doc["location"] != "")
+      {
+        Serial.println("Location Tag found!");
+        String location = doc["location"].as<String>();
+        if(lastSpoolId != ""){
+          updateSpoolLocation(lastSpoolId, location);
+        }
+        else
+        {
+          Serial.println("Location update tag scanned without scanning spool before!");
+          oledShowProgressBar(1, 1, "Failure", "Scan spool first");
+        }
       }
       else 
       {
         Serial.println("Keine SPOOL-ID gefunden.");
-      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);
@@ -248,19 +283,24 @@ void writeJsonToTag(void *parameter) {
 
   //pauseBambuMqttTask = true;
   // aktualisieren der Website wenn sich der Status ändert
-  sendNfcData(nullptr);
+  sendNfcData();
   vTaskDelay(100 / portTICK_PERIOD_MS);
-  oledShowMessage("Waiting for NFC-Tag");
+  Serial.println("CP 1");
-  
   // Wait 10sec for tag
   uint8_t success = 0;
   String uidString = "";
   for (uint16_t i = 0; i < 20; i++) {
+    Serial.println("CP 2");
     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) {
+      Serial.println("CP 3.1");
       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
@@ -268,10 +308,10 @@ void writeJsonToTag(void *parameter) {
       }
       foundNfcTag(nullptr, success);
       break;
+    }else{
+      Serial.println("CP 3.2");
     }
 
-    if (i == 0) oledShowMessage("Waiting for NFC-Tag");
-
     yield();
     esp_task_wdt_reset();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -279,29 +319,37 @@ void writeJsonToTag(void *parameter) {
 
   if (success)
   {
-    oledShowIcon("transfer");
+    oledShowProgressBar(1, 3, "Write Tag", "Writing");
+
     // Schreibe die NDEF-Message auf den Tag
-    success = ntag2xx_WriteNDEF(payload);
+    success = ntag2xx_WriteNDEF(params->payload);
     if (success) 
     {
         Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
         //oledShowMessage("NFC-Tag written");
-        oledShowIcon("success");
+        //vTaskDelay(1000 / portTICK_PERIOD_MS);
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
         nfcReaderState = NFC_WRITE_SUCCESS;
         // aktualisieren der Website wenn sich der Status ändert
-        sendNfcData(nullptr);
+        sendNfcData();
         pauseBambuMqttTask = false;
         
-        if (updateSpoolTagId(uidString, payload)) {
+        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);        
     } 
@@ -316,13 +364,13 @@ 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);
   pauseBambuMqttTask = false;
@@ -330,20 +378,26 @@ void writeJsonToTag(void *parameter) {
   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) {
+    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)
   }
 }
 
@@ -363,14 +417,19 @@ void scanRfidTask(void * parameter) {
 
       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);
 
         if (uidLength == 7)
@@ -404,8 +463,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 
@@ -417,12 +475,14 @@ 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)!");
         }
       }
@@ -432,27 +492,27 @@ void scanRfidTask(void * parameter) {
         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();
     }
     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

@@ -1,6 +1,10 @@
 #include <Arduino.h>
 #include <website.h>
 #include <commonFS.h>
+#include "scale.h"
+#include "bambu.h"
+#include "nfc.h"
+
 
 // Globale Variablen für Config Backups hinzufügen
 String bambuCredentialsBackup;
@@ -151,6 +155,25 @@ void handleUpdate(AsyncWebServer &server) {
 
     updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
                              size_t index, uint8_t *data, size_t len, bool final) {
+
+        // Disable all Tasks
+        if (BambuMqttTask != NULL) 
+        {
+            Serial.println("Delete BambuMqttTask");
+            vTaskDelete(BambuMqttTask);
+            BambuMqttTask = NULL;
+        }
+        if (ScaleTask) {
+            Serial.println("Delete ScaleTask");
+            vTaskDelete(ScaleTask);
+            ScaleTask = NULL;
+        }
+        if (RfidReaderTask) {
+            Serial.println("Delete RfidReaderTask");
+            vTaskDelete(RfidReaderTask);
+            RfidReaderTask = NULL;
+        }
+
         if (!index) {
             updateTotalSize = request->contentLength();
             updateWritten = 0;
@@ -159,9 +182,9 @@ void handleUpdate(AsyncWebServer &server) {
             if (isSpiffsUpdate) {
                 // Backup vor dem Update
                 sendUpdateProgress(0, "backup", "Backing up configurations...");
-                delay(200);
+                vTaskDelay(200 / portTICK_PERIOD_MS);
                 backupJsonConfigs();
-                delay(200);
+                vTaskDelay(200 / portTICK_PERIOD_MS);
                 
                 const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
                 if (!partition || !Update.begin(partition->size, U_SPIFFS)) {
@@ -169,14 +192,14 @@ void handleUpdate(AsyncWebServer &server) {
                     return;
                 }
                 sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
-                delay(200);
+                vTaskDelay(200 / portTICK_PERIOD_MS);
             } else {
                 if (!Update.begin(updateTotalSize)) {
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
                     return;
                 }
                 sendUpdateProgress(0, "starting", "Starting firmware update...");
-                delay(200);
+                vTaskDelay(200 / portTICK_PERIOD_MS);
             }
         }
 
@@ -201,8 +224,8 @@ 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");
-                delay(50);
+                vTaskDelay(50 / portTICK_PERIOD_MS);
                 lastProgress = currentProgress;
             }
         }

src/scale.cpp

@@ -14,15 +14,27 @@ TaskHandle_t ScaleTask;
 int16_t weight = 0;
 
 uint8_t weigthCouterToApi = 0;
+uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
 uint8_t scaleCalibrated = 1;
-
+bool autoTare = true;
-Preferences preferences;
-const char* NVS_NAMESPACE = "scale";
-const char* NVS_KEY_CALIBRATION = "cal_value";
 
 // ##### Funktionen für Waage #####
+uint8_t setAutoTare(bool autoTareValue) {
+  Serial.print("Set AutoTare to ");
+  Serial.println(autoTareValue);
+  autoTare = autoTareValue;
+
+  // Speichern mit NVS
+  Preferences preferences;
+  preferences.begin(NVS_NAMESPACE_SCALE, false); // false = readwrite
+  preferences.putBool(NVS_KEY_AUTOTARE, autoTare);
+  preferences.end();
+
+  return 1;
+}
+
 uint8_t tareScale() {
   Serial.println("Tare scale");
   scale.tare();
@@ -38,6 +50,14 @@ void scale_loop(void * parameter) {
   for(;;) {
     if (scale.is_ready()) 
     {
+      // Waage automatisch Taren, wenn zu lange Abweichung
+      if (autoTare && scale_tare_counter >= 5) 
+      {
+        Serial.println("Auto Tare scale");
+        scale.tare();
+        scale_tare_counter = 0;
+      }
+
       // Waage manuell Taren
       if (scaleTareRequest == true) 
       {
@@ -50,20 +70,32 @@ void scale_loop(void * parameter) {
         scaleTareRequest = false;
       }
 
-      weight = round(scale.get_units());
+      // Only update weight if median changed more than 1
+      int16_t newWeight = round(scale.get_units());
+      if(abs(weight-newWeight) > 1){
+        weight = newWeight;
+      }
     }
     
     vTaskDelay(pdMS_TO_TICKS(100));
   }
 }
 
-void start_scale() {
+void start_scale(bool touchSensorConnected) {
   Serial.println("Prüfe Calibration Value");
   float calibrationValue;
 
   // NVS lesen
-  preferences.begin(NVS_NAMESPACE, true); // true = readonly
+  Preferences preferences;
+  preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
   calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  
+  // auto Tare
+  // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
+  // Danach prüfen was in NVS gespeichert ist
+  autoTare = (touchSensorConnected) ? false : true;
+  autoTare = preferences.getBool(NVS_KEY_AUTOTARE, autoTare);
+
   preferences.end();
 
   Serial.print("Read Scale Calibration Value ");
@@ -83,7 +115,7 @@ void start_scale() {
     }
   }
 
-  oledShowMessage("Scale Tare Please remove all");
+  oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
   for (uint16_t i = 0; i < 2000; i++) {
     yield();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -130,7 +162,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();
@@ -142,7 +174,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();
@@ -162,21 +194,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++) {
@@ -185,7 +216,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();
@@ -199,13 +230,11 @@ uint8_t calibrate_scale() {
 
       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();
@@ -215,7 +244,6 @@ uint8_t calibrate_scale() {
       returnState = 0;
     } 
   }
-  }
   else 
   {
     Serial.println("HX711 not found.");

src/scale.h

@@ -4,17 +4,19 @@
 #include <Arduino.h>
 #include "HX711.h"
 
-
+uint8_t setAutoTare(bool autoTareValue);
-uint8_t start_scale();
+uint8_t start_scale(bool touchSensorConnected);
 uint8_t calibrate_scale();
 uint8_t tareScale();
 
 extern HX711 scale;
 extern int16_t weight;
 extern uint8_t weigthCouterToApi;
+extern uint8_t scale_tare_counter;
 extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
 extern uint8_t scaleCalibrated;
+extern bool autoTare;
 
 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());
             }
         }
 
@@ -75,6 +82,10 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
                 success = calibrate_scale();
             }
 
+            if (doc["payload"] == "setAutoTare") {
+                success = setAutoTare(doc["enabled"].as<bool>());
+            }
+
             if (success) {
                 ws.textAll("{\"type\":\"scale\",\"payload\":\"success\"}");
             } else {
@@ -109,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
@@ -136,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){
@@ -175,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);
     
@@ -191,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");
@@ -203,10 +220,14 @@ void setupWebserver(AsyncWebServer &server) {
     // Route für Waage
     server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /waage erhalten");
-        AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html");
+        //AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html");
-        response->addHeader("Content-Encoding", "gzip");
+        //response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Cache-Control", CACHE_CONTROL);
+        //response->addHeader("Cache-Control", CACHE_CONTROL);
-        request->send(response);
+
+        String html = loadHtmlWithHeader("/waage.html");
+        html.replace("{{autoTare}}", (autoTare) ? "checked" : "");
+
+        request->send(200, "text/html", html);
     });
 
     // Route für RFID
@@ -246,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();