docs: update changelog and header for version v1.5.8

Nfc write improvements

.gitignore

@@ -1,8 +1,41 @@
 .pio
-.vscode/.browse.c_cpp.db*
+.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/settings.json
+.vscode/launch.json
-data
+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,35 @@
 # Changelog
 
+## [1.5.8] - 2025-08-10
+### Added
+- Adds a link to the spool in spoolman when reading a spool tag
+- Fixes types and some issues in the new graphics
+
+### Changed
+- update platformio.ini for version v1.5.8
+- Merge pull request #45 from janecker/nfc_write_improvements
+- Introduces periodic Spoolman Healthcheck
+- Improves init - NFC reading now only starts after boot is finished
+- Further improvements on NFC writing
+- Merge pull request #44 from janecker/graphics_rework
+- Graphic rework of the NFC writing process
+- Remove unused parameter of sendNfcData()
+- Reworks startup graphics and timings
+
+### Fixed
+- Fixes issue that scale not calibrated message was not shown
+- Improves NFC writing workaround and removes debug output
+- Fixes typos in upgrade page
+- Reworks graphics of tag reading and some api fixes
+- Replaces usage of String with const char* in heap debug function
+
+
+## [1.5.7] - 2025-07-28
+### Changed
+- update platformio.ini for version v1.5.7
+- clean up unused variables and improve .gitignore entries
+
+
 ## [1.5.6] - 2025-07-28
 ### Added
 - Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags

html/rfid.js

@@ -7,6 +7,7 @@ let heartbeatTimer = null;
 let lastHeartbeatResponse = Date.now();
 const HEARTBEAT_TIMEOUT = 20000;
 let reconnectTimer = null;
+let spoolDetected = false;
 
 // WebSocket Funktionen
 function startHeartbeat() {
@@ -508,12 +509,15 @@ function updateNfcStatusIndicator(data) {
     if (data.found === 0) {
         // Kein NFC Tag gefunden
         indicator.className = 'status-circle';
+        spoolDetected = false;
     } else if (data.found === 1) {
         // NFC Tag erfolgreich gelesen
         indicator.className = 'status-circle success';
+        spoolDetected = true;
     } else {
         // Fehler beim Lesen
         indicator.className = 'status-circle error';
+        spoolDetected = true;
     }
 }
 
@@ -574,7 +578,7 @@ function updateNfcData(data) {
         `;
 
         // Spoolman ID anzeigen
-        html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;
+        html += `<p><strong>Spoolman ID:</strong> ${data.sm_id} (<a href="${spoolmanUrl}/spool/show/${data.sm_id}">Open in Spoolman</a>)</p>`;
      }
      else if(data.location)
      {
@@ -618,76 +622,83 @@ function updateNfcData(data) {
 }
 
 function writeNfcTag() {
-    const selectedText = document.getElementById("selected-filament").textContent;
+    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
-    if (selectedText === "Please choose...") {
+        const selectedText = document.getElementById("selected-filament").textContent;
-        alert('Please select a Spool first.');
+        if (selectedText === "Please choose...") {
-        return;
+            alert('Please select a Spool first.');
-    }
+            return;
+        }
 
-    const spoolsData = window.getSpoolData();
+        const spoolsData = window.getSpoolData();
-    const selectedSpool = spoolsData.find(spool => 
+        const selectedSpool = spoolsData.find(spool => 
-        `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
+            `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
-    );
+        );
 
-    if (!selectedSpool) {
+        if (!selectedSpool) {
-        alert('Ausgewählte Spule konnte nicht gefunden werden.');
+            alert('Ausgewählte Spule konnte nicht gefunden werden.');
-        return;
+            return;
-    }
+        }
 
-    // Temperaturwerte korrekt extrahieren
+        // Temperaturwerte korrekt extrahieren
-    let minTemp = "175";
+        let minTemp = "175";
-    let maxTemp = "275";
+        let maxTemp = "275";
-    
+        
-    if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
+        if (Array.isArray(selectedSpool.filament.nozzle_temperature) && 
-        selectedSpool.filament.nozzle_temperature.length >= 2) {
+            selectedSpool.filament.nozzle_temperature.length >= 2) {
-        minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
+            minTemp = String(selectedSpool.filament.nozzle_temperature[0]);
-        maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
+            maxTemp = String(selectedSpool.filament.nozzle_temperature[1]);
-    }
+        }
 
-    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
-    const nfcData = {
+        const nfcData = {
-        color_hex: selectedSpool.filament.color_hex || "FFFFFF",
+            color_hex: selectedSpool.filament.color_hex || "FFFFFF",
-        type: selectedSpool.filament.material,
+            type: selectedSpool.filament.material,
-        min_temp: minTemp,
+            min_temp: minTemp,
-        max_temp: maxTemp,
+            max_temp: maxTemp,
-        brand: selectedSpool.filament.vendor.name,
+            brand: selectedSpool.filament.vendor.name,
-        sm_id: String(selectedSpool.id) // Konvertiere zu String
+            sm_id: String(selectedSpool.id) // Konvertiere zu String
-    };
+        };
 
-    if (socket?.readyState === WebSocket.OPEN) {
+        if (socket?.readyState === WebSocket.OPEN) {
-        const writeButton = document.getElementById("writeNfcButton");
+            const writeButton = document.getElementById("writeNfcButton");
-        writeButton.classList.add("writing");
+            writeButton.classList.add("writing");
-        writeButton.textContent = "Writing";
+            writeButton.textContent = "Writing";
-        socket.send(JSON.stringify({
+            socket.send(JSON.stringify({
-            type: 'writeNfcTag',
+                type: 'writeNfcTag',
-            payload: nfcData
+                tagType: 'spool',
-        }));
+                payload: nfcData
-    } else {
+            }));
-        alert('Not connected to Server. Please check connection.');
+        } else {
+            alert('Not connected to Server. Please check connection.');
+        }
     }
 }
 
 function writeLocationNfcTag() {
-    const selectedText = document.getElementById("locationSelect").value;
+    if(!spoolDetected || confirm("Are you sure you want to overwrite the Tag?") == true){
-    if (selectedText === "Please choose...") {
+        const selectedText = document.getElementById("locationSelect").value;
-        alert('Please select a location first.');
+        if (selectedText === "Please choose...") {
-        return;
+            alert('Please select a location first.');
-    }
+            return;
-    // Erstelle das NFC-Datenpaket mit korrekten Datentypen
+        }
-    const nfcData = {
+        // Erstelle das NFC-Datenpaket mit korrekten Datentypen
-        location: String(selectedText)
+        const nfcData = {
-    };
+            location: String(selectedText)
+        };
 
-    if (socket?.readyState === WebSocket.OPEN) {
+
-        const writeButton = document.getElementById("writeLocationNfcButton");
+        if (socket?.readyState === WebSocket.OPEN) {
-        writeButton.classList.add("writing");
+            const writeButton = document.getElementById("writeLocationNfcButton");
-        writeButton.textContent = "Writing";
+            writeButton.classList.add("writing");
-        socket.send(JSON.stringify({
+            writeButton.textContent = "Writing";
-            type: 'writeNfcTag',
+            socket.send(JSON.stringify({
-            payload: nfcData
+                type: 'writeNfcTag',
-        }));
+                tagType: 'location',
-    } else {
+                payload: nfcData
-        alert('Not connected to Server. Please check connection.');
+            }));
+        } else {
+            alert('Not connected to Server. Please check connection.');
+        }
     }
 }
 

html/upgrade.html

@@ -57,7 +57,7 @@
         <div class="update-options">
             <div class="update-section">
                 <h2>Firmware Update</h2>
-                <p>Upload a new firmware file (filaman_*.bin)</p>
+                <p>Upload a new firmware file (upgrade_filaman_firmware_*.bin)</p>
                 <div class="update-form">
                     <form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
                         <input type='file' name='update' accept='.bin' required>
@@ -68,7 +68,7 @@
 
             <div class="update-section">
                 <h2>Webpage Update</h2>
-                <p>Upload a new webpage file (webpage_*.bin)</p>
+                <p>Upload a new webpage file (upgrade_filaman_website_*.bin)</p>
                 <div class="update-form">
                     <form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
                         <input type='file' name='update' accept='.bin' required>

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.5.6"
+version = "1.5.8"
 to_old_version = "1.5.0"
 
 ##

src/api.cpp

@@ -5,12 +5,17 @@
 #include <Preferences.h>
 #include "debug.h"
 
-volatile spoolmanApiStateType spoolmanApiState = API_INIT;
+volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
 //bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
+bool sendOctoUpdate = false;
 String octoUrl = "";
 String octoToken = "";
+uint16_t remainingWeight = 0;
+bool spoolmanConnected = false;
+bool spoolmanExtraFieldsChecked = false;
+TaskHandle_t* apiTask;
 
 struct SendToApiParams {
     SpoolmanApiRequestType requestType;
@@ -91,6 +96,11 @@ JsonDocument fetchSingleSpoolInfo(int spoolId) {
 void sendToApi(void *parameter) {
     HEAP_DEBUG_MESSAGE("sendToApi begin");
 
+    // Wait until API is IDLE
+    while(spoolmanApiState != API_IDLE){
+        Serial.println("Waiting!");
+        yield();
+    }
     spoolmanApiState = API_TRANSMITTING;
     SendToApiParams* params = (SendToApiParams*)parameter;
 
@@ -124,23 +134,52 @@ void sendToApi(void *parameter) {
             Serial.print("Fehler beim Parsen der JSON-Antwort: ");
             Serial.println(error.c_str());
         } else {
-            if (requestType == API_REQUEST_SPOOL_WEIGHT_UPDATE) {
+            switch(requestType){
-                uint16_t remaining_weight = doc["remaining_weight"].as<float>();
+            case API_REQUEST_SPOOL_WEIGHT_UPDATE:
+                remainingWeight = doc["remaining_weight"].as<uint16_t>();
                 Serial.print("Aktuelles Gewicht: ");
-                Serial.println(remaining_weight);
+                Serial.println(remainingWeight);
-                oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
+                if(!octoEnabled){
+                    // 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;
             }
-            else if ( requestType == API_REQUEST_SPOOL_LOCATION_UPDATE) {
-                oledShowMessage("Location updated!");
-            }
-            
-            vTaskDelay(3000 / portTICK_PERIOD_MS);
         }
         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));
-        oledShowMessage("Spoolman update failed");
+
+        // TBD: really required?
         vTaskDelay(2000 / portTICK_PERIOD_MS);
     }
 
@@ -155,6 +194,8 @@ void sendToApi(void *parameter) {
 }
 
 bool updateSpoolTagId(String uidString, const char* payload) {
+    oledShowProgressBar(2, 3, "Write Tag", "Update Spoolman");
+
     JsonDocument doc;
     DeserializationError error = deserializeJson(doc, payload);
     
@@ -185,7 +226,7 @@ bool updateSpoolTagId(String uidString, const char* payload) {
     Serial.print("Update Payload: ");
     Serial.println(updatePayload);
 
-    SendToApiParams* params = new SendToApiParams();
+    SendToApiParams* params = new SendToApiParams();  
     if (params == nullptr) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return false;
@@ -202,19 +243,21 @@ bool updateSpoolTagId(String uidString, const char* payload) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
 
     // Update Spool weight
-    if (weight > 10) updateSpoolWeight(doc["sm_id"].as<String>(), 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);
@@ -230,6 +273,7 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
 
     SendToApiParams* params = new SendToApiParams();
     if (params == nullptr) {
+        // TBD: reset ESP instead of showing a message
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
         return 0;
     }
@@ -245,7 +289,7 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
@@ -257,6 +301,8 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
 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);
@@ -280,15 +326,20 @@ uint8_t updateSpoolLocation(String spoolId, String location){
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = updatePayload;
 
-    // Erstelle die Task
+
-    BaseType_t result = xTaskCreate(
+    if(apiTask == nullptr){
-        sendToApi,                // Task-Funktion
+        // Erstelle die Task
-        "SendToApiTask",          // Task-Name
+        BaseType_t result = xTaskCreate(
-        6144,                     // Stackgröße in Bytes
+            sendToApi,                // Task-Funktion
-        (void*)params,            // Parameter
+            "SendToApiTask",          // Task-Name
-        0,                        // Priorität
+            6144,                     // Stackgröße in Bytes
-        NULL                      // Task-Handle (nicht benötigt)
+            (void*)params,            // Parameter
-    );
+            0,                        // Priorität
+            apiTask                   // Task-Handle
+        );
+    }else{
+        Serial.println("Not spawning new task, API still active!");
+    }
 
     updateDoc.clear();
 
@@ -297,6 +348,8 @@ uint8_t updateSpoolLocation(String spoolId, String location){
 }
 
 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);
@@ -328,7 +381,7 @@ bool updateSpoolOcto(int spoolId) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
@@ -381,7 +434,7 @@ bool updateSpoolBambuData(String payload) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        NULL                      // Task-Handle (nicht benötigt)
+        apiTask                      // Task-Handle (nicht benötigt)
     );
 
     return true;
@@ -389,199 +442,222 @@ bool updateSpoolBambuData(String payload) {
 
 // #### Spoolman init
 bool checkSpoolmanExtraFields() {
-    HTTPClient http;
+    // Only check extra fields if they have not been checked before
-    String checkUrls[] = {
+    if(!spoolmanExtraFieldsChecked){
-        spoolmanUrl + apiUrl + "/field/spool",
+        HTTPClient http;
-        spoolmanUrl + apiUrl + "/field/filament"
+        String checkUrls[] = {
-    };
+            spoolmanUrl + apiUrl + "/field/spool",
+            spoolmanUrl + apiUrl + "/field/filament"
+        };
 
-    String spoolExtra[] = {
+        String spoolExtra[] = {
-        "nfc_id"
+            "nfc_id"
-    };
+        };
 
-    String filamentExtra[] = {
+        String filamentExtra[] = {
-        "nozzle_temperature",
+            "nozzle_temperature",
-        "price_meter",
+            "price_meter",
-        "price_gramm",
+            "price_gramm",
-        "bambu_setting_id",
+            "bambu_setting_id",
-        "bambu_cali_id",
+            "bambu_cali_id",
-        "bambu_idx",
+            "bambu_idx",
-        "bambu_k",
+            "bambu_k",
-        "bambu_flow_ratio",
+            "bambu_flow_ratio",
-        "bambu_max_volspeed"
+            "bambu_max_volspeed"
-    };
+        };
 
-    String spoolExtraFields[] = {
+        String spoolExtraFields[] = {
-        "{\"name\": \"NFC ID\","
+            "{\"name\": \"NFC ID\","
-        "\"key\": \"nfc_id\","
+            "\"key\": \"nfc_id\","
-        "\"field_type\": \"text\"}"
+            "\"field_type\": \"text\"}"
-    };
+        };
 
-    String filamentExtraFields[] = {
+        String filamentExtraFields[] = {
-        "{\"name\": \"Nozzle Temp\","
+            "{\"name\": \"Nozzle Temp\","
-        "\"unit\": \"°C\","
+            "\"unit\": \"°C\","
-        "\"field_type\": \"integer_range\","
+            "\"field_type\": \"integer_range\","
-        "\"default_value\": \"[190,230]\","
+            "\"default_value\": \"[190,230]\","
-        "\"key\": \"nozzle_temperature\"}",
+            "\"key\": \"nozzle_temperature\"}",
 
-        "{\"name\": \"Price/m\","
+            "{\"name\": \"Price/m\","
-        "\"unit\": \"€\","
+            "\"unit\": \"€\","
-        "\"field_type\": \"float\","
+            "\"field_type\": \"float\","
-        "\"key\": \"price_meter\"}",
+            "\"key\": \"price_meter\"}",
+            
+            "{\"name\": \"Price/g\","
+            "\"unit\": \"€\","
+            "\"field_type\": \"float\","
+            "\"key\": \"price_gramm\"}",
+
+            "{\"name\": \"Bambu Setting ID\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_setting_id\"}",
+
+            "{\"name\": \"Bambu Cali ID\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_cali_id\"}",
+
+            "{\"name\": \"Bambu Filament IDX\","
+            "\"field_type\": \"text\","
+            "\"key\": \"bambu_idx\"}",
+
+            "{\"name\": \"Bambu k\","
+            "\"field_type\": \"float\","
+            "\"key\": \"bambu_k\"}",
+
+            "{\"name\": \"Bambu Flow Ratio\","
+            "\"field_type\": \"float\","
+            "\"key\": \"bambu_flow_ratio\"}",
+
+            "{\"name\": \"Bambu Max Vol. Speed\","
+            "\"unit\": \"mm3/s\","
+            "\"field_type\": \"integer\","
+            "\"default_value\": \"12\","
+            "\"key\": \"bambu_max_volspeed\"}"
+        };
+
+        Serial.println("Überprüfe Extrafelder...");
+
+        int urlLength = sizeof(checkUrls) / sizeof(checkUrls[0]);
+
+        for (uint8_t i = 0; i < urlLength; i++) {
+            Serial.println();
+            Serial.println("-------- Prüfe Felder für "+checkUrls[i]+" --------");
+            http.begin(checkUrls[i]);
+            int httpCode = http.GET();
         
-        "{\"name\": \"Price/g\","
+            if (httpCode == HTTP_CODE_OK) {
-        "\"unit\": \"€\","
+                String payload = http.getString();
-        "\"field_type\": \"float\","
+                JsonDocument doc;
-        "\"key\": \"price_gramm\"}",
+                DeserializationError error = deserializeJson(doc, payload);
+                if (!error) {
+                    String* extraFields;
+                    String* extraFieldData;
+                    u16_t extraLength;
 
-        "{\"name\": \"Bambu Setting ID\","
+                    if (i == 0) {
-        "\"field_type\": \"text\","
+                        extraFields = spoolExtra;
-        "\"key\": \"bambu_setting_id\"}",
+                        extraFieldData = spoolExtraFields;
-
+                        extraLength = sizeof(spoolExtra) / sizeof(spoolExtra[0]);
-        "{\"name\": \"Bambu Cali ID\","
+                    } else {
-        "\"field_type\": \"text\","
+                        extraFields = filamentExtra;
-        "\"key\": \"bambu_cali_id\"}",
+                        extraFieldData = filamentExtraFields;
-
+                        extraLength = sizeof(filamentExtra) / sizeof(filamentExtra[0]);
-        "{\"name\": \"Bambu Filament IDX\","
-        "\"field_type\": \"text\","
-        "\"key\": \"bambu_idx\"}",
-
-        "{\"name\": \"Bambu k\","
-        "\"field_type\": \"float\","
-        "\"key\": \"bambu_k\"}",
-
-        "{\"name\": \"Bambu Flow Ratio\","
-        "\"field_type\": \"float\","
-        "\"key\": \"bambu_flow_ratio\"}",
-
-        "{\"name\": \"Bambu Max Vol. Speed\","
-        "\"unit\": \"mm3/s\","
-        "\"field_type\": \"integer\","
-        "\"default_value\": \"12\","
-        "\"key\": \"bambu_max_volspeed\"}"
-    };
-
-    Serial.println("Überprüfe Extrafelder...");
-
-    int urlLength = sizeof(checkUrls) / sizeof(checkUrls[0]);
-
-    for (uint8_t i = 0; i < urlLength; i++) {
-        Serial.println();
-        Serial.println("-------- Prüfe Felder für "+checkUrls[i]+" --------");
-        http.begin(checkUrls[i]);
-        int httpCode = http.GET();
-    
-        if (httpCode == HTTP_CODE_OK) {
-            String payload = http.getString();
-            JsonDocument doc;
-            DeserializationError error = deserializeJson(doc, payload);
-            if (!error) {
-                String* extraFields;
-                String* extraFieldData;
-                u16_t extraLength;
-
-                if (i == 0) {
-                    extraFields = spoolExtra;
-                    extraFieldData = spoolExtraFields;
-                    extraLength = sizeof(spoolExtra) / sizeof(spoolExtra[0]);
-                } else {
-                    extraFields = filamentExtra;
-                    extraFieldData = filamentExtraFields;
-                    extraLength = sizeof(filamentExtra) / sizeof(filamentExtra[0]);
-                }
-
-                for (uint8_t s = 0; s < extraLength; s++) {
-                    bool found = false;
-                    for (JsonObject field : doc.as<JsonArray>()) {
-                        if (field["key"].is<String>() && field["key"] == extraFields[s]) {
-                            Serial.println("Feld gefunden: " + extraFields[s]);
-                            found = true;
-                            break;
-                        }
                     }
-                    if (!found) {
-                        Serial.println("Feld nicht gefunden: " + extraFields[s]);
 
-                        // Extrafeld hinzufügen
+                    for (uint8_t s = 0; s < extraLength; s++) {
-                        http.begin(checkUrls[i] + "/" + extraFields[s]);
+                        bool found = false;
-                        http.addHeader("Content-Type", "application/json");
+                        for (JsonObject field : doc.as<JsonArray>()) {
-                        int httpCode = http.POST(extraFieldData[s]);
+                            if (field["key"].is<String>() && field["key"] == extraFields[s]) {
+                                Serial.println("Feld gefunden: " + extraFields[s]);
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found) {
+                            Serial.println("Feld nicht gefunden: " + extraFields[s]);
 
-                         if (httpCode > 0) {
+                            // Extrafeld hinzufügen
-                            // Antwortscode und -nachricht abrufen
+                            http.begin(checkUrls[i] + "/" + extraFields[s]);
-                            String response = http.getString();
+                            http.addHeader("Content-Type", "application/json");
-                            //Serial.println("HTTP-Code: " + String(httpCode));
+                            int httpCode = http.POST(extraFieldData[s]);
-                            //Serial.println("Antwort: " + response);
-                            if (httpCode != HTTP_CODE_OK) {
 
+                            if (httpCode > 0) {
+                                // Antwortscode und -nachricht abrufen
+                                String response = http.getString();
+                                //Serial.println("HTTP-Code: " + String(httpCode));
+                                //Serial.println("Antwort: " + response);
+                                if (httpCode != HTTP_CODE_OK) {
+
+                                    return false;
+                                }
+                            } else {
+                                // Fehler beim Senden der Anfrage
+                                Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
                                 return false;
                             }
-                        } else {
+                            //http.end();
-                            // Fehler beim Senden der Anfrage
-                            Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
-                            return false;
                         }
-                        //http.end();
+                        yield();
+                        vTaskDelay(100 / portTICK_PERIOD_MS);
                     }
-                    yield();
-                    vTaskDelay(100 / portTICK_PERIOD_MS);
                 }
+                doc.clear();
             }
-            doc.clear();
         }
+        
+        Serial.println("-------- ENDE Prüfe Felder --------");
+        Serial.println();
+
+        http.end();
+
+        spoolmanExtraFieldsChecked = true;
+        return true;
+    }else{
+        return true;
     }
-    
-    Serial.println("-------- ENDE Prüfe Felder --------");
-    Serial.println();
-
-    http.end();
-
-    return true;
 }
 
-bool checkSpoolmanInstance(const String& url) {
+bool checkSpoolmanInstance() {
     HTTPClient http;
-    String healthUrl = url + apiUrl + "/health";
+    bool returnValue = false;
 
-    Serial.print("Überprüfe Spoolman-Instanz unter: ");
+    // Only do the spoolman instance check if there is no active API request going on
-    Serial.println(healthUrl);
+    if(spoolmanApiState == API_IDLE){
+        spoolmanApiState = API_TRANSMITTING;
+        String healthUrl = spoolmanUrl + apiUrl + "/health";
 
-    http.begin(healthUrl);
+        Serial.print("Checking spoolman instance: ");
-    int httpCode = http.GET();
+        Serial.println(healthUrl);
 
-    if (httpCode > 0) {
+        http.begin(healthUrl);
-        if (httpCode == HTTP_CODE_OK) {
+        int httpCode = http.GET();
-            oledShowMessage("Spoolman available");
-            vTaskDelay(1000 / portTICK_PERIOD_MS);
 
-            String payload = http.getString();
+        if (httpCode > 0) {
-            JsonDocument doc;
+            if (httpCode == HTTP_CODE_OK) {
-            DeserializationError error = deserializeJson(doc, payload);
+                String payload = http.getString();
-            if (!error && doc["status"].is<String>()) {
+                JsonDocument doc;
-                const char* status = doc["status"];
+                DeserializationError error = deserializeJson(doc, payload);
-                http.end();
+                if (!error && doc["status"].is<String>()) {
+                    const char* status = doc["status"];
+                    http.end();
 
-                if (!checkSpoolmanExtraFields()) {
+                    if (!checkSpoolmanExtraFields()) {
-                    Serial.println("Fehler beim Überprüfen der Extrafelder.");
+                        Serial.println("Fehler beim Überprüfen der Extrafelder.");
 
-                    oledShowMessage("Spoolman Error creating Extrafields");
+                        // TBD
-                    vTaskDelay(2000 / portTICK_PERIOD_MS);
+                        oledShowMessage("Spoolman Error creating Extrafields");
-                    
+                        vTaskDelay(2000 / portTICK_PERIOD_MS);
-                    return false;
+                        
+                        return false;
+                    }
+
+                    spoolmanApiState = API_IDLE;
+                    oledShowTopRow();
+                    spoolmanConnected = true;
+                    returnValue = strcmp(status, "healthy") == 0;
+                }else{
+                    spoolmanConnected = false;
                 }
 
-                spoolmanApiState = API_IDLE;
+                doc.clear();
-                oledShowTopRow();
+            }else{
-                return strcmp(status, "healthy") == 0;
+                spoolmanConnected = false;
             }
-
+        } else {
-            doc.clear();
+            spoolmanConnected = false;
+            Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
         }
-    } else {
+        http.end();
-        Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
+        returnValue = false;
+        spoolmanApiState = API_IDLE;
+    }else{
+        // If the check is skipped, return the previous status
+        Serial.println("Skipping spoolman healthcheck, API is active.");
+        returnValue = spoolmanConnected;
     }
-    http.end();
+    Serial.println("Healthcheck completed!");
-    return false;
+    return returnValue;
 }
 
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octo_url, const String& octoTk) {
@@ -594,14 +670,13 @@ bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octo_url, con
     preferences.end();
 
     //TBD: This could be handled nicer in the future
+    spoolmanExtraFieldsChecked = false;
     spoolmanUrl = url;
     octoEnabled = octoOn;
     octoUrl = octo_url;
     octoToken = octoTk;
 
-    doc.clear();
+    return checkSpoolmanInstance();
-
-    return true;
 }
 
 String loadSpoolmanUrl() {
@@ -619,16 +694,12 @@ String loadSpoolmanUrl() {
 }
 
 bool initSpoolman() {
+    oledShowProgressBar(3, 7, DISPLAY_BOOT_TEXT, "Spoolman init");
     spoolmanUrl = loadSpoolmanUrl();
-    spoolmanUrl.trim();
+    
-    if (spoolmanUrl == "") {
+    bool success = checkSpoolmanInstance();
-        Serial.println("Keine Spoolman-URL gefunden.");
-        return false;
-    }
-
-    bool success = checkSpoolmanInstance(spoolmanUrl);
     if (!success) {
-        Serial.println("Spoolman nicht erreichbar.");
+        Serial.println("Spoolman not available");
         return false;
     }
 

src/api.h

@@ -24,10 +24,12 @@ extern volatile spoolmanApiStateType spoolmanApiState;
 extern bool spoolman_connected;
 extern String spoolmanUrl;
 extern bool octoEnabled;
+extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
+extern bool spoolmanConnected;
 
-bool checkSpoolmanInstance(const String& url);
+bool checkSpoolmanInstance();
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
 String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
 bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder

src/bambu.cpp

@@ -627,6 +627,7 @@ bool setupMqtt() {
 
     if (bambuCredentials.ip != "" && bambuCredentials.accesscode != "" && bambuCredentials.serial != "") 
     {
+        oledShowProgressBar(4, 7, DISPLAY_BOOT_TEXT, "Bambu init");
         bambuDisabled = false;
         sslClient.setCACert(root_ca);
         sslClient.setInsecure();

src/config.cpp

@@ -16,7 +16,6 @@ const uint8_t LOADCELL_DOUT_PIN = 16; //16;
 const uint8_t LOADCELL_SCK_PIN = 17; //17;
 const uint8_t calVal_eepromAdress = 0;
 const uint16_t SCALE_LEVEL_WEIGHT = 500;
-uint16_t defaultScaleCalibrationValue = 430;
 // ***** HX711
 
 // ***** TTP223 (Touch Sensor)
@@ -26,16 +25,11 @@ const uint8_t TTP223_PIN = 25;
 
 
 // ***** Display
-// Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
-// On an ESP32:   21(SDA),  22(SCL)
-const int8_t OLED_RESET = -1; // Reset pin # (or -1 if sharing Arduino reset pin)
-const uint8_t SCREEN_ADDRESS = 0x3C; ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
-const uint8_t SCREEN_WIDTH = 128; // OLED display width, in pixels
-const uint8_t SCREEN_HEIGHT = 64; // OLED display height, in pixels
 const uint8_t OLED_TOP_START = 0;
 const uint8_t OLED_TOP_END = 16;
 const uint8_t OLED_DATA_START = 17;
 const uint8_t OLED_DATA_END = SCREEN_HEIGHT;
+
 // ***** Display
 
 // ***** Webserver

src/config.h

@@ -3,28 +3,39 @@
 
 #include <Arduino.h>
 
-#define BAMBU_DEFAULT_AUTOSEND_TIME 60
+#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_API "api"
+#define NVS_NAMESPACE_BAMBU                 "bambu"
-#define NVS_KEY_SPOOLMAN_URL "spoolmanUrl"
+#define NVS_KEY_BAMBU_IP                    "bambuIp"
-#define NVS_KEY_OCTOPRINT_ENABLED "octoEnabled"
+#define NVS_KEY_BAMBU_ACCESSCODE            "bambuCode"
-#define NVS_KEY_OCTOPRINT_URL "octoUrl"
+#define NVS_KEY_BAMBU_SERIAL                "bambuSerial"
-#define NVS_KEY_OCTOPRINT_TOKEN "octoToken"
+#define NVS_KEY_BAMBU_AUTOSEND_ENABLE       "autosendEnable"
+#define NVS_KEY_BAMBU_AUTOSEND_TIME         "autosendTime"
 
-#define NVS_NAMESPACE_BAMBU "bambu"
+#define NVS_NAMESPACE_SCALE                 "scale"
-#define NVS_KEY_BAMBU_IP "bambuIp"
+#define NVS_KEY_CALIBRATION                 "cal_value"
-#define NVS_KEY_BAMBU_ACCESSCODE "bambuCode"
+#define NVS_KEY_AUTOTARE                    "auto_tare"
-#define NVS_KEY_BAMBU_SERIAL "bambuSerial"
+#define SCALE_DEFAULT_CALIBRATION_VALUE     430.0f;
-#define NVS_KEY_BAMBU_AUTOSEND_ENABLE "autosendEnable"
-#define NVS_KEY_BAMBU_AUTOSEND_TIME "autosendTime"
 
-#define NVS_NAMESPACE_SCALE "scale"
+#define BAMBU_USERNAME                      "bblp"
-#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"
 
+#define WIFI_CHECK_INTERVAL                 60000U
+#define DISPLAY_UPDATE_INTERVAL             1000U
+#define SPOOLMAN_HEALTHCHECK_INTERVAL       60000U
 
 extern const uint8_t PN532_IRQ;
 extern const uint8_t PN532_RESET;
@@ -36,10 +47,6 @@ extern const uint16_t SCALE_LEVEL_WEIGHT;
 
 extern const uint8_t TTP223_PIN;
 
-extern const int8_t OLED_RESET;
-extern const uint8_t SCREEN_ADDRESS;
-extern const uint8_t SCREEN_WIDTH;
-extern const uint8_t SCREEN_HEIGHT;
 extern const uint8_t OLED_TOP_START;
 extern const uint8_t OLED_TOP_END;
 extern const uint8_t OLED_DATA_START;

src/debug.h

@@ -7,6 +7,6 @@
     #define HEAP_DEBUG_MESSAGE(location) 
 #endif
 
-inline void printHeapDebugData(String location){
+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();
 
-    if (bambu_connected == 1) {
+    display.setTextSize(1);
-        display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
+    display.setCursor(0, 4);
-    } else {
+    display.print("v");
-        display.drawBitmap(50, 0, bitmap_off , 16, 16, WHITE);
+    display.print(VERSION);
-    }
 
-    if (spoolmanApiState != API_INIT) {
+    iconToggle = !iconToggle;
-        display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
-    } else {
-        display.drawBitmap(80, 0, bitmap_off , 16, 16, WHITE);
-    }
 
-    if (wifiOn == 1) {
+    // Do not show status indicators during boot
-        display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
+    if(!booting){
-    } else {
+        if(bambuDisabled == false) {
-        display.drawBitmap(107, 0, wifi_off , 16, 16, WHITE);
+            if (bambu_connected == 1) {
+                display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
+            } else {
+                if(iconToggle){
+                    display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
+                    display.drawLine(50, 15, 66, 0, WHITE);
+                    display.drawLine(51, 15, 67, 0, WHITE);
+                }
+            }
+        }
+
+        if (spoolmanConnected) {
+            display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
+        } else {
+            if(iconToggle){
+                display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
+                display.drawLine(80, 15, 96, 0, WHITE);
+                display.drawLine(81, 15, 97, 0, WHITE);
+            }
+        }
+
+        if (wifiOn == 1) {
+            display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
+        } else {
+            if(iconToggle){
+                display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
+                display.drawLine(107, 15, 123, 0, WHITE);
+                display.drawLine(108, 15, 124, 0, WHITE);
+            }
+        }
     }
     
     display.display();
@@ -214,6 +235,27 @@ void oledShowIcon(const char* icon) {
     display.display();
 }
 
+void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage){
+    assert(step <= numSteps);
+
+    // clear data and bar area
+    display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, SCREEN_HEIGHT-16, BLACK);
+
+    
+    display.setTextWrap(false);
+    display.setTextSize(2);
+    display.setCursor(0, OLED_DATA_START+4);
+    display.print(largeText);
+    display.setTextSize(1);
+    display.setCursor(0, OLED_DATA_END-SCREEN_PROGRESS_BAR_HEIGHT-10);
+    display.print(statusMessage);
+
+    const int barLength = ((SCREEN_WIDTH-2)*step)/numSteps;
+    display.drawRoundRect(0, SCREEN_HEIGHT-SCREEN_PROGRESS_BAR_HEIGHT, SCREEN_WIDTH, 12, 6, WHITE);
+    display.fillRoundRect(1, SCREEN_HEIGHT-SCREEN_PROGRESS_BAR_HEIGHT+1, barLength, 10, 6, WHITE);
+    display.display();
+}
+
 void oledShowWeight(uint16_t weight) {
     // Display Gewicht
     oledcleardata();

src/display.h

@@ -13,11 +13,13 @@ extern bool wifiOn;
 void setupDisplay();
 void oledclearline();
 void oledcleardata();
-int oled_center_h(String text);
+int oled_center_h(const String &text);
-int oled_center_v(String text);
+int oled_center_v(const String &text);
+
+void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
 
 void oledShowWeight(uint16_t weight);
-void oledShowMessage(String message, uint8_t size = 2);
+void oledShowMessage(const String &message, uint8_t size = 2);
 void oledShowTopRow();
 void oledShowIcon(const char* icon);
 

src/main.cpp

@@ -16,6 +16,7 @@
 bool mainTaskWasPaused = 0;
 uint8_t scaleTareCounter = 0;
 bool touchSensorConnected = false;
+bool booting = true;
 
 // ##### SETUP #####
 void setup() {
@@ -63,6 +64,7 @@ void setup() {
   bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
   esp_task_wdt_init(10, panic);
 
+  booting = false;
   // Aktuellen Task (loopTask) zum Watchdog hinzufügen
   esp_task_wdt_add(NULL);
 }
@@ -95,7 +97,8 @@ int16_t lastWeight = 0;
 
 // WIFI check variables
 unsigned long lastWifiCheckTime = 0;
-const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
+unsigned long lastTopRowUpdateTime = 0;
+unsigned long lastSpoolmanHealcheckTime = 0;
 
 // Button debounce variables
 unsigned long lastButtonPress = 0;
@@ -113,11 +116,23 @@ void loop() {
   }
 
   // Überprüfe regelmäßig die WLAN-Verbindung
-  if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL)) 
   {
     checkWiFiConnection();
   }
 
+  // Periodic display update
+  if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL)) 
+  {
+    oledShowTopRow();
+  }
+
+  // Periodic spoolman health check
+  if (intervalElapsed(currentMillis, lastSpoolmanHealcheckTime, SPOOLMAN_HEALTHCHECK_INTERVAL)) 
+  {
+    checkSpoolmanInstance();
+  }
+
   // Wenn Bambu auto set Spool aktiv
   if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0) 
   {
@@ -148,88 +163,92 @@ void loop() {
     }
   }
 
-  // Wenn Waage nicht Kalibriert
+  // If scale is not calibrated, only show a warning
-  if (scaleCalibrated == 3) 
+  if (!scaleCalibrated) 
   {
-    oledShowMessage("Scale not calibrated!");
+    // Do not show the warning if the calibratin process is onging
-    vTaskDelay(5000 / portTICK_PERIOD_MS);
+    if(!scaleCalibrationActive){
-    yield();
+      oledShowMessage("Scale not calibrated");
-    esp_task_wdt_reset();
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
-    
-    return;
-  } 
-
-  // Ausgabe der Waage auf Display
-  if(pauseMainTask == 0)
-  {
-    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
-    {
-      (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
     }
-    mainTaskWasPaused = false;
+  }else{
-  }
+    // Ausgabe der Waage auf Display
-  else
+    if(pauseMainTask == 0)
-  {
-    mainTaskWasPaused = true;
-  }
-
-
-  // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
-  {
-    lastWeightReadTime = currentMillis;
-
-    // Prüfen ob die Waage korrekt genullt ist
-    // Abweichung von 2g ignorieren
-    if (autoTare && (weight > 2 && weight < 7) || weight < -2)
     {
-      scale_tare_counter++;
+      if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
+      {
+        (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+      }
+      mainTaskWasPaused = false;
     }
     else
     {
-      scale_tare_counter = 0;
+      mainTaskWasPaused = true;
     }
 
-    // Prüfen ob das Gewicht gleich bleibt und dann senden
+
-    if (abs(weight - lastWeight) <= 2 && weight > 5)
+    // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
+    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
     {
-      weigthCouterToApi++;
+      lastWeightReadTime = currentMillis;
-    } 
+
-    else 
+      // Prüfen ob die Waage korrekt genullt ist
+      // Abweichung von 2g ignorieren
+      if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+      {
+        scale_tare_counter++;
+      }
+      else
+      {
+        scale_tare_counter = 0;
+      }
+
+      // Prüfen ob das Gewicht gleich bleibt und dann senden
+      if (abs(weight - lastWeight) <= 2 && weight > 5)
+      {
+        weigthCouterToApi++;
+      } 
+      else 
+      {
+        weigthCouterToApi = 0;
+        weightSend = 0;
+      }
+    }
+
+    // reset weight counter after writing tag
+    // TBD: what exactly is the logic behind this?
+    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
     {
       weigthCouterToApi = 0;
-      weightSend = 0;
     }
-  }
+    
+    lastWeight = weight;
 
-  // reset weight counter after writing tag
+    // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-  // TBD: what exactly is the logic behind this?
+    if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) {
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
+      // set the current tag as processed to prevent it beeing processed again
-  {
+      tagProcessed = true;
-    weigthCouterToApi = 0;
-  }
-  
-  lastWeight = weight;
 
-  // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
+      if (updateSpoolWeight(activeSpoolId, weight)) 
-  if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS) {
+      {
-    oledShowIcon("loading");
+        weightSend = 1;
-    if (updateSpoolWeight(activeSpoolId, weight)) 
+        
-    {
+      }
-      oledShowIcon("success");
+      else
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+      {
-      weightSend = 1;
+        oledShowIcon("failed");
+        vTaskDelay(2000 / portTICK_PERIOD_MS);
+      }
+    }
+
+    if(sendOctoUpdate && spoolmanApiState == API_IDLE){
       autoSetToBambuSpoolId = activeSpoolId.toInt();
 
-      if (octoEnabled) 
+      if(octoEnabled) 
       {
         updateSpoolOcto(autoSetToBambuSpoolId);
       }
-    }
+      sendOctoUpdate = false;
-    else
-    {
-      oledShowIcon("failed");
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
     }
   }
   

src/main.h

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

src/nfc.cpp

@@ -8,6 +8,7 @@
 #include "esp_task_wdt.h"
 #include "scale.h"
 #include "bambu.h"
+#include "main.h"
 
 //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
 Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -18,7 +19,15 @@ JsonDocument rfidData;
 String activeSpoolId = "";
 String lastSpoolId = "";
 String nfcJsonData = "";
+bool tagProcessed = false;
 volatile bool pauseBambuMqttTask = false;
+volatile bool nfcReadingTaskSuspendRequest = false;
+volatile bool nfcReadingTaskSuspendState = false;
+
+struct NfcWriteParameterType {
+  bool tagType;
+  char* payload;
+};
 
 volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
 // 0 = nicht gelesen
@@ -196,6 +205,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
 }
 
 bool decodeNdefAndReturnJson(const byte* encodedMessage) {
+  oledShowProgressBar(1, octoEnabled?5:4, "Reading", "Decoding data");
+
   byte typeLength = encodedMessage[3];
   byte payloadLength = encodedMessage[4];
 
@@ -219,35 +230,39 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
   } 
   else 
   {
-    // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
+    // If spoolman is unavailable, there is no point in continuing
-    Serial.println("JSON-Dokument erfolgreich verarbeitet");
+    if(spoolmanConnected){
-    Serial.println(doc.as<String>());
+      // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
-    if (doc["sm_id"].is<String>() && doc["sm_id"] != "") 
+      Serial.println("JSON-Dokument erfolgreich verarbeitet");
-    {
+      Serial.println(doc.as<String>());
-      Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
+      if (doc["sm_id"].is<String>() && doc["sm_id"] != "") 
-      activeSpoolId = doc["sm_id"].as<String>();
-      lastSpoolId = activeSpoolId;
-    }
-    else if(doc["location"].is<String>() && doc["location"] != "")
-    {
-      Serial.println("Location Tag found!");
-      String location = doc["location"].as<String>();
-      if(lastSpoolId != ""){
-        updateSpoolLocation(lastSpoolId, location);
-      }
-      else
       {
-        Serial.println("Location update tag scanned without scanning spool before!");
+        oledShowProgressBar(2, octoEnabled?5:4, "Spool Tag", "Weighing");
-        oledShowMessage("No spool scanned before!");
+        Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
+        activeSpoolId = doc["sm_id"].as<String>();
+        lastSpoolId = activeSpoolId;
       }
-
+      else if(doc["location"].is<String>() && doc["location"] != "")
-    }
+      {
-    else 
+        Serial.println("Location Tag found!");
-    {
+        String location = doc["location"].as<String>();
-      Serial.println("Keine SPOOL-ID gefunden.");
+        if(lastSpoolId != ""){
-      activeSpoolId = "";
+          updateSpoolLocation(lastSpoolId, location);
-      oledShowMessage("Unknown Spool");
+        }
-      vTaskDelay(2000 / portTICK_PERIOD_MS);
+        else
+        {
+          Serial.println("Location update tag scanned without scanning spool before!");
+          oledShowProgressBar(1, 1, "Failure", "Scan spool first");
+        }
+      }
+      else 
+      {
+        Serial.println("Keine SPOOL-ID gefunden.");
+        activeSpoolId = "";
+        oledShowProgressBar(1, 1, "Failure", "Unkown tag");
+      }
+    }else{
+      oledShowProgressBar(octoEnabled?5:4, octoEnabled?5:4, "Failure!", "Spoolman unavailable");
     }
   }
 
@@ -257,31 +272,37 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
 }
 
 void writeJsonToTag(void *parameter) {
-  const char* payload = (const char*)parameter;
+  NfcWriteParameterType* params = (NfcWriteParameterType*)parameter;
 
   // Gib die erstellte NDEF-Message aus
   Serial.println("Erstelle NDEF-Message...");
-  Serial.println(payload);
+  Serial.println(params->payload);
 
   nfcReaderState = NFC_WRITING;
-  vTaskSuspend(RfidReaderTask);
+
-  vTaskDelay(50 / portTICK_PERIOD_MS);
+  // First request the reading task to be suspended and than wait until it responds
+  nfcReadingTaskSuspendRequest = true;
+  while(nfcReadingTaskSuspendState == false){
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+  }
 
   //pauseBambuMqttTask = true;
   // aktualisieren der Website wenn sich der Status ändert
-  sendNfcData(nullptr);
+  sendNfcData();
   vTaskDelay(100 / portTICK_PERIOD_MS);
-  oledShowMessage("Waiting for NFC-Tag");
-  
   // Wait 10sec for tag
   uint8_t success = 0;
   String uidString = "";
   for (uint16_t i = 0; i < 20; i++) {
     uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
     uint8_t uidLength;
-    success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
+    // yield before potentially waiting for 400ms
+    yield();
+    esp_task_wdt_reset();
+    success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
     if (success) {
       for (uint8_t i = 0; i < uidLength; i++) {
+        //TBD: Rework to remove all the string operations
         uidString += String(uid[i], HEX);
         if (i < uidLength - 1) {
             uidString += ":"; // Optional: Trennzeichen hinzufügen
@@ -291,8 +312,6 @@ void writeJsonToTag(void *parameter) {
       break;
     }
 
-    if (i == 0) oledShowMessage("Waiting for NFC-Tag");
-
     yield();
     esp_task_wdt_reset();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -300,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){
-          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+          // TBD: should this be simplified?
-          uint8_t uidLength;
+          if (updateSpoolTagId(uidString, params->payload) && params->tagType) {
-          oledShowIcon("success");
+            
-          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+          }else{
-            yield();
+            // Potentially handle errors
           }
+        }else{
+          oledShowProgressBar(1, 1, "Write Tag", "Done!");
         }
-          
+        uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+        uint8_t uidLength;
+        yield();
+        esp_task_wdt_reset();
+        while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400)) {
+          yield();
+        } 
         vTaskResume(RfidReaderTask);
         vTaskDelay(500 / portTICK_PERIOD_MS);        
     } 
@@ -337,34 +364,40 @@ void writeJsonToTag(void *parameter) {
   else
   {
     Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
-    oledShowMessage("No NFC-Tag found");
+    oledShowProgressBar(1, 1, "Failure!", "No tag found");
     vTaskDelay(2000 / portTICK_PERIOD_MS);
     nfcReaderState = NFC_IDLE;
   }
   
   sendWriteResult(nullptr, success);
-  sendNfcData(nullptr);
+  sendNfcData();
 
-  vTaskResume(RfidReaderTask);
+  nfcReadingTaskSuspendRequest = false;
   pauseBambuMqttTask = false;
 
   vTaskDelete(NULL);
 }
 
-void startWriteJsonToTag(const char* payload) {
+void startWriteJsonToTag(const bool isSpoolTag, const char* payload) {
-  char* payloadCopy = strdup(payload);
+  NfcWriteParameterType* parameters = new NfcWriteParameterType();
+  parameters->tagType = isSpoolTag;
+  parameters->payload = strdup(payload);
   
   // Task nicht mehrfach starten
-  if (nfcReaderState != NFC_WRITING) {
+  if (nfcReaderState == NFC_IDLE || nfcReaderState == NFC_READ_ERROR || nfcReaderState == NFC_READ_SUCCESS) {
+    oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
     // Erstelle die Task
     xTaskCreate(
         writeJsonToTag,        // Task-Funktion
         "WriteJsonToTagTask",       // Task-Name
         5115,                        // Stackgröße in Bytes
-        (void*)payloadCopy,         // Parameter
+        (void*)parameters,         // Parameter
         rfidWriteTaskPrio,           // Priorität
         NULL                         // Task-Handle (nicht benötigt)
     );
+  }else{
+    oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
+    // TBD: Add proper error handling (website)
   }
 }
 
@@ -372,28 +405,34 @@ void scanRfidTask(void * parameter) {
   Serial.println("RFID Task gestartet");
   for(;;) {
     // Wenn geschrieben wird Schleife aussetzen
-    if (nfcReaderState != NFC_WRITING)
+    if (nfcReaderState != NFC_WRITING && !nfcReadingTaskSuspendRequest && !booting)
     {
+      nfcReadingTaskSuspendState = false;
       yield();
 
       uint8_t success;
       uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
       uint8_t uidLength;
 
-      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 1000);
+      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
 
       foundNfcTag(nullptr, success);
       
-      if (success && nfcReaderState != NFC_READ_SUCCESS)
+      // As long as there is still a tag on the reader, do not try to read it again
+      if (success && nfcReaderState == NFC_IDLE)
       {
+        // Set the current tag as not processed
+        tagProcessed = false;
+
         // Display some basic information about the card
         Serial.println("Found an ISO14443A card");
 
         nfcReaderState = NFC_READING;
 
-        oledShowIcon("transfer");
+        oledShowProgressBar(0, octoEnabled?5:4, "Reading", "Detecting tag");
-        vTaskDelay(500 / portTICK_PERIOD_MS);
 
+        //vTaskDelay(500 / portTICK_PERIOD_MS);
+        
         if (uidLength == 7)
         {
           uint16_t tagSize = readTagSize();
@@ -425,8 +464,7 @@ void scanRfidTask(void * parameter) {
 
             if (!decodeNdefAndReturnJson(data)) 
             {
-              oledShowMessage("NFC-Tag unknown");
+              oledShowProgressBar(1, 1, "Failure", "Unknown tag");
-              vTaskDelay(2000 / portTICK_PERIOD_MS);
               nfcReaderState = NFC_READ_ERROR;
             }
             else 
@@ -438,17 +476,19 @@ void scanRfidTask(void * parameter) {
           }
           else
           {
-            oledShowMessage("NFC-Tag read error");
+            oledShowProgressBar(1, 1, "Failure", "Tag read error");
             nfcReaderState = NFC_READ_ERROR;
           }
         }
         else
         {
+          //TBD: Show error here?!
+          oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
           Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
         }
       }
 
-      if (!success && nfcReaderState != NFC_IDLE)
+      if (!success && nfcReaderState != NFC_IDLE && !nfcReadingTaskSuspendRequest)
       {
         nfcReaderState = NFC_IDLE;
         //uidString = "";
@@ -459,22 +499,27 @@ void scanRfidTask(void * parameter) {
       }
 
       // aktualisieren der Website wenn sich der Status ändert
-      sendNfcData(nullptr);
+      sendNfcData();
+    }
+    else
+    {
+      nfcReadingTaskSuspendState = true;
+      Serial.println("NFC Reading disabled");
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
     }
     yield();
   }
 }
 
 void startNfc() {
+  oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, "NFC init");
   nfc.begin();                                           // Beginne Kommunikation mit RFID Leser
   delay(1000);
   unsigned long versiondata = nfc.getFirmwareVersion();  // Lese Versionsnummer der Firmware aus
   if (! versiondata) {                                   // Wenn keine Antwort kommt
     Serial.println("Kann kein RFID Board finden !");            // Sende Text "Kann kein..." an seriellen Monitor
-    //delay(5000);
-    //ESP.restart();
     oledShowMessage("No RFID Board found");
-    delay(2000);
+    vTaskDelay(2000 / portTICK_PERIOD_MS);
   }
   else {
     Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen

src/nfc.h

@@ -15,7 +15,7 @@ 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;
@@ -23,6 +23,7 @@ extern String activeSpoolId;
 extern String lastSpoolId;
 extern volatile nfcReaderStateType nfcReaderState;
 extern volatile bool pauseBambuMqttTask;
+extern bool tagProcessed;
 
 
 

src/ota.cpp

@@ -224,7 +224,7 @@ void handleUpdate(AsyncWebServer &server) {
             static int lastProgress = -1;
             if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
                 sendUpdateProgress(currentProgress, "uploading");
-                oledShowMessage("Update: " + String(currentProgress) + "%");
+                oledShowProgressBar(currentProgress, 100, "Update", "Download");
                 vTaskDelay(50 / portTICK_PERIOD_MS);
                 lastProgress = currentProgress;
             }

src/scale.cpp

@@ -17,8 +17,9 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
-uint8_t scaleCalibrated = 1;
+bool scaleCalibrated;
 bool autoTare = true;
+bool scaleCalibrationActive = false;
 
 // ##### Funktionen für Waage #####
 uint8_t setAutoTare(bool autoTareValue) {
@@ -88,7 +89,13 @@ void start_scale(bool touchSensorConnected) {
   // NVS lesen
   Preferences preferences;
   preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
-  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+  if(preferences.isKey(NVS_KEY_CALIBRATION)){
+    calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION);
+    scaleCalibrated = true;
+  }else{
+    calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
+    scaleCalibrated = false;
+  }
   
   // auto Tare
   // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
@@ -103,19 +110,7 @@ void start_scale(bool touchSensorConnected) {
 
   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
 
-  if (isnan(calibrationValue) || calibrationValue < 1) {
+  oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
-    calibrationValue = defaultScaleCalibrationValue;
-    scaleCalibrated = 0;
-
-    oledShowMessage("Scale not calibrated!");
-    for (uint16_t i = 0; i < 50000; i++) {
-      yield();
-      vTaskDelay(pdMS_TO_TICKS(1));
-      esp_task_wdt_reset();
-    }
-  }
-
-  oledShowMessage("Scale Tare Please remove all");
   for (uint16_t i = 0; i < 2000; i++) {
     yield();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -152,6 +147,8 @@ uint8_t calibrate_scale() {
   uint8_t returnState = 0;
   float newCalibrationValue;
 
+  scaleCalibrationActive = true;
+
   vTaskSuspend(RfidReaderTask);
   vTaskSuspend(ScaleTask);
 
@@ -162,7 +159,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();
@@ -174,7 +171,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();
@@ -207,9 +204,7 @@ uint8_t calibrate_scale() {
       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++) {
@@ -218,7 +213,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();
@@ -230,23 +225,21 @@ uint8_t calibrate_scale() {
         esp_task_wdt_reset();
       }
 
+      scaleCalibrated = true;
       returnState = 1;
     }
-   
     else
     {
-      {
+      Serial.println("Calibration value is invalid. Please recalibrate.");
-        Serial.println("Calibration value is invalid. Please recalibrate.");
 
-        oledShowMessage("Calibration ERROR Try again");
+      oledShowProgressBar(3, 3, "Failure", "Calibration error");
 
-        for (uint16_t i = 0; i < 50000; i++) {
+      for (uint16_t i = 0; i < 50000; i++) {
-          yield();
+        yield();
-          vTaskDelay(pdMS_TO_TICKS(1));
+        vTaskDelay(pdMS_TO_TICKS(1));
-          esp_task_wdt_reset();
+        esp_task_wdt_reset();
-        }
-        returnState = 0;
       }
+      returnState = 0;
     } 
   }
   else 
@@ -267,6 +260,7 @@ uint8_t calibrate_scale() {
   vTaskResume(ScaleTask);
   pauseBambuMqttTask = false;
   pauseMainTask = 0;
+  scaleCalibrationActive = false;
 
   return returnState;
 }

src/scale.h

@@ -15,8 +15,9 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
-extern uint8_t scaleCalibrated;
+extern bool scaleCalibrated;
 extern bool autoTare;
+extern bool scaleCalibrationActive;
 
 extern TaskHandle_t ScaleTask;
 

src/website.cpp

@@ -34,7 +34,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
         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);
 
@@ -52,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(), "{"
@@ -69,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());
             }
         }
 
@@ -150,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){
@@ -189,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);
     
@@ -273,8 +273,6 @@ void setupWebserver(AsyncWebServer &server) {
         html.replace("{{autoSendToBambu}}", bambuCredentials.autosend_enable ? "checked" : "");
         html.replace("{{autoSendTime}}", (bambuCredentials.autosend_time != 0) ? String(bambuCredentials.autosend_time) : String(BAMBU_DEFAULT_AUTOSEND_TIME));
 
-        doc.clear();
-
         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();