Add JSON structure comments for filament and spool creation

CHANGELOG.md

@@ -1,29 +1,5 @@
 # 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

html/rfid.js

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

platformio.ini

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

src/api.cpp

@@ -5,7 +5,7 @@
 #include <Preferences.h>
 #include "debug.h"
 
-volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
+volatile spoolmanApiStateType spoolmanApiState = API_INIT;
 //bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
@@ -13,9 +13,10 @@ bool sendOctoUpdate = false;
 String octoUrl = "";
 String octoToken = "";
 uint16_t remainingWeight = 0;
+uint16_t createdVendorId = 0;  // Store ID of newly created vendor
+uint16_t foundVendorId = 0;    // Store ID of found vendor
+uint16_t foundFilamentId = 0;  // Store ID of found filament
 bool spoolmanConnected = false;
-bool spoolmanExtraFieldsChecked = false;
-TaskHandle_t* apiTask;
 
 struct SendToApiParams {
     SpoolmanApiRequestType requestType;
@@ -96,11 +97,6 @@ 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;
 
@@ -121,6 +117,7 @@ void sendToApi(void *parameter) {
     int httpCode;
     if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
     else if (httpType == "POST") httpCode = http.POST(updatePayload);
+    else if (httpType == "GET") httpCode = http.GET();
     else httpCode = http.PUT(updatePayload);
 
     if (httpCode == HTTP_CODE_OK) {
@@ -160,6 +157,58 @@ void sendToApi(void *parameter) {
                 oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
                 remainingWeight = 0;
                 break;
+            case API_REQUEST_VENDOR_CREATE:
+                Serial.println("Vendor successfully created!");
+                createdVendorId = doc["id"].as<uint16_t>();
+                Serial.print("Created Vendor ID: ");
+                Serial.println(createdVendorId);
+                oledShowProgressBar(1, 1, "Vendor", "Created!");
+                break;
+            case API_REQUEST_VENDOR_CHECK:
+                if (doc.isNull() || doc.size() == 0) {
+                    Serial.println("Vendor not found in response");
+                    foundVendorId = 0;
+                } else {
+                    foundVendorId = doc[0]["id"].as<uint16_t>();
+                    Serial.print("Found Vendor ID: ");
+                    Serial.println(foundVendorId);
+                }
+                break;
+            case API_REQUEST_FILAMENT_CHECK:
+                if (doc.isNull() || doc.size() == 0) {
+                    Serial.println("Filament not found in response");
+                    foundFilamentId = 0;
+                } else {
+                    foundFilamentId = doc[0]["id"].as<uint16_t>();
+                    Serial.print("Found Filament ID: ");
+                    Serial.println(foundFilamentId);
+                }
+                break;
+            }
+        }
+        doc.clear();
+    } else if (httpCode == HTTP_CODE_CREATED) {
+        Serial.println("Spoolman erfolgreich erstellt");
+        
+        // Parse response for created resources
+        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 {
+            switch(requestType){
+            case API_REQUEST_VENDOR_CREATE:
+                Serial.println("Vendor successfully created!");
+                createdVendorId = doc["id"].as<uint16_t>();
+                Serial.print("Created Vendor ID: ");
+                Serial.println(createdVendorId);
+                oledShowProgressBar(1, 1, "Vendor", "Created!");
+                break;
+            default:
+                // Handle other create operations if needed
+                break;
             }
         }
         doc.clear();
@@ -176,6 +225,9 @@ void sendToApi(void *parameter) {
         case API_REQUEST_BAMBU_UPDATE:
             oledShowProgressBar(1, 1, "Failure!", "Bambu update");
             break;
+        case API_REQUEST_VENDOR_CREATE:
+            oledShowProgressBar(1, 1, "Failure!", "Vendor create");
+            break;
         }
         Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
 
@@ -243,7 +295,7 @@ bool updateSpoolTagId(String uidString, const char* payload) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        apiTask                      // Task-Handle (nicht benötigt)
+        NULL                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
@@ -289,7 +341,7 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        apiTask                      // Task-Handle (nicht benötigt)
+        NULL                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
@@ -326,17 +378,17 @@ uint8_t updateSpoolLocation(String spoolId, String location){
     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)
+    );
 
-    if(apiTask == nullptr){
-        // Erstelle die Task
-        BaseType_t result = xTaskCreate(
-            sendToApi,                // Task-Funktion
-            "SendToApiTask",          // Task-Name
-            6144,                     // Stackgröße in Bytes
-            (void*)params,            // Parameter
-            0,                        // Priorität
-            apiTask                   // Task-Handle
-        );
     }else{
         Serial.println("Not spawning new task, API still active!");
     }
@@ -381,7 +433,7 @@ bool updateSpoolOcto(int spoolId) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        apiTask                      // Task-Handle (nicht benötigt)
+        NULL                      // Task-Handle (nicht benötigt)
     );
 
     updateDoc.clear();
@@ -434,230 +486,438 @@ bool updateSpoolBambuData(String payload) {
         6144,                     // Stackgröße in Bytes
         (void*)params,            // Parameter
         0,                        // Priorität
-        apiTask                      // Task-Handle (nicht benötigt)
+        NULL                      // Task-Handle (nicht benötigt)
     );
 
     return true;
 }
 
-// #### Spoolman init
-bool checkSpoolmanExtraFields() {
-    // Only check extra fields if they have not been checked before
-    if(!spoolmanExtraFieldsChecked){
-        HTTPClient http;
-        String checkUrls[] = {
-            spoolmanUrl + apiUrl + "/field/spool",
-            spoolmanUrl + apiUrl + "/field/filament"
-        };
+// #### Filament Fabrik
+uint16_t checkVendor(String vendor) {
+    // Check if vendor exists using task system
+    foundVendorId = 0; // Reset previous value
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendor;
+    Serial.print("Check vendor with URL: ");
+    Serial.println(spoolsUrl);
 
-        String spoolExtra[] = {
-            "nfc_id"
-        };
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        return 0;
+    }
+    params->requestType = API_REQUEST_VENDOR_CHECK;
+    params->httpType = "GET";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = ""; // Empty for GET request
 
-        String filamentExtra[] = {
-            "nozzle_temperature",
-            "price_meter",
-            "price_gramm",
-            "bambu_setting_id",
-            "bambu_cali_id",
-            "bambu_idx",
-            "bambu_k",
-            "bambu_flow_ratio",
-            "bambu_max_volspeed"
-        };
+    // Check if API is idle before creating task
+    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!");
+        delete params;
+        return 0;
+    }
+    
+    // Wait for task completion
+    while(spoolmanApiState != API_IDLE) {
+        vTaskDelay(100 / portTICK_PERIOD_MS);
+    }
 
-        String spoolExtraFields[] = {
-            "{\"name\": \"NFC ID\","
-            "\"key\": \"nfc_id\","
-            "\"field_type\": \"text\"}"
-        };
-
-        String filamentExtraFields[] = {
-            "{\"name\": \"Nozzle Temp\","
-            "\"unit\": \"°C\","
-            "\"field_type\": \"integer_range\","
-            "\"default_value\": \"[190,230]\","
-            "\"key\": \"nozzle_temperature\"}",
-
-            "{\"name\": \"Price/m\","
-            "\"unit\": \"€\","
-            "\"field_type\": \"float\","
-            "\"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();
-        
-            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
-                            http.begin(checkUrls[i] + "/" + extraFields[s]);
-                            http.addHeader("Content-Type", "application/json");
-                            int httpCode = http.POST(extraFieldData[s]);
-
-                            if (httpCode > 0) {
-                                // Antwortscode und -nachricht abrufen
-                                String response = http.getString();
-                                //Serial.println("HTTP-Code: " + String(httpCode));
-                                //Serial.println("Antwort: " + response);
-                                if (httpCode != HTTP_CODE_OK) {
-
-                                    return false;
-                                }
-                            } else {
-                                // Fehler beim Senden der Anfrage
-                                Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
-                                return false;
-                            }
-                            //http.end();
-                        }
-                        yield();
-                        vTaskDelay(100 / portTICK_PERIOD_MS);
-                    }
-                }
-                doc.clear();
-            }
+    // Check if vendor was found
+    if (foundVendorId == 0) {
+        Serial.println("Vendor not found, creating new vendor...");
+        uint16_t vendorId = createVendor(vendor);
+        if (vendorId == 0) {
+            Serial.println("Failed to create vendor, returning 0.");
+            return 0; // Failed to create vendor
+        } else {
+            Serial.println("Vendor created with ID: " + String(vendorId));
+            checkFilament(vendorId);
+            return vendorId;
         }
-        
-        Serial.println("-------- ENDE Prüfe Felder --------");
-        Serial.println();
-
-        http.end();
-
-        spoolmanExtraFieldsChecked = true;
-        return true;
-    }else{
-        return true;
+    } else {
+        Serial.println("Vendor found: " + vendor);
+        Serial.print("Vendor ID: ");
+        Serial.println(foundVendorId);
+        return foundVendorId;
     }
 }
 
-bool checkSpoolmanInstance() {
-    HTTPClient http;
-    bool returnValue = false;
+uint16_t createVendor(String vendor) {
+    // Create new vendor in Spoolman database using task system
+    // Note: Due to async nature, the ID will be stored in createdVendorId global variable
+    createdVendorId = 0; // Reset previous value
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor";
+    Serial.print("Create vendor with URL: ");
+    Serial.println(spoolsUrl);
 
-    // Only do the spoolman instance check if there is no active API request going on
+    // Create JSON payload for vendor creation
+    JsonDocument vendorDoc;
+    vendorDoc["name"] = vendor;
+    vendorDoc["comment"] = "automatically generated";
+    vendorDoc["empty_spool_weight"] = 180;
+    vendorDoc["external_id"] = vendor;
+
+    String vendorPayload;
+    serializeJson(vendorDoc, vendorPayload);
+    Serial.print("Vendor Payload: ");
+    Serial.println(vendorPayload);
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        vendorDoc.clear();
+        return 0;
+    }
+    params->requestType = API_REQUEST_VENDOR_CREATE;
+    params->httpType = "POST";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = vendorPayload;
+
+    // Check if API is idle before creating task
     if(spoolmanApiState == API_IDLE){
-        spoolmanApiState = API_TRANSMITTING;
-        String healthUrl = spoolmanUrl + apiUrl + "/health";
+        // 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!");
+        delete params;
+        vendorDoc.clear();
+        return 0;
+    }
 
-        Serial.print("Checking spoolman instance: ");
-        Serial.println(healthUrl);
+    vendorDoc.clear();
+    
+    // Wait for task completion and return the created vendor ID
+    // Note: createdVendorId will be set by sendToApi when response is received
+    while(spoolmanApiState != API_IDLE) {
+        vTaskDelay(100 / portTICK_PERIOD_MS);
+    }
+    
+    return createdVendorId;
+}
 
-        http.begin(healthUrl);
+uint16_t checkFilament(uint16_t vendorId) {
+    // Check if filament exists using task system
+    foundFilamentId = 0; // Reset previous value
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/filament?vendor.id=" + String(vendorId);
+    Serial.print("Check filament with URL: ");
+    Serial.println(spoolsUrl);
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        return 0;
+    }
+    params->requestType = API_REQUEST_FILAMENT_CHECK;
+    params->httpType = "GET";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = ""; // Empty for GET request
+
+    // Check if API is idle before creating task
+    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!");
+        delete params;
+        return 0;
+    }
+    
+    // Wait for task completion
+    while(spoolmanApiState != API_IDLE) {
+        vTaskDelay(100 / portTICK_PERIOD_MS);
+    }
+
+    // Check if filament was found
+    if (foundFilamentId == 0) {
+        Serial.println("Filament not found, creating new filament...");
+        uint16_t filamentId = createFilament();
+        if (filamentId == 0) {
+            Serial.println("Failed to create filament, returning 0.");
+            return 0; // Failed to create filament
+        } else {
+            Serial.println("Filament created with ID: " + String(filamentId));
+            checkSpool();
+            return filamentId;
+        }
+    } else {
+        Serial.println("Filament found for vendor ID: " + String(vendorId));
+        Serial.print("Filament ID: ");
+        Serial.println(foundFilamentId);
+        return foundFilamentId;
+    }
+}
+
+bool createFilament() {
+    // {
+    //     "name": "PolyTerra Charcoal Black",
+    //     "vendor_id": 0,
+    //     "material": "PLA",
+    //     "price": 20,
+    //     "density": 1.24,
+    //     "diameter": 1.75,
+    //     "weight": 1000,
+    //     "spool_weight": 140,
+    //     "article_number": "PM70820",
+    //     "comment": "automatically generated",
+    //     "settings_extruder_temp": 210,
+    //     "settings_bed_temp": 60,
+    //     "color_hex": "FF0000",
+    //     "multi_color_hexes": "FF0000,00FF00,0000FF",
+    //     "multi_color_direction": "coaxial",
+    //     "external_id": "polymaker_pla_polysonicblack_1000_175",
+    //     "extra": {
+    //         "nozzle_temperature": "string"
+    //     }
+    // }
+
+}
+
+uint16_t checkSpool() {
+
+}
+
+bool createSpool() {
+    // Implement specific handling for Spool creation
+    // {
+    //     "first_used": "2019-08-24T14:15:22Z",
+    //     "last_used": "2019-08-24T14:15:22Z",
+    //     "filament_id": 0,
+    //     "price": 20,
+    //     "initial_weight": 200,
+    //     "spool_weight": 200,
+    //     "remaining_weight": 800,
+    //     "used_weight": 200,
+    //     "location": "Shelf A",
+    //     "lot_nr": "52342",
+    //     "comment": "",
+    //     "archived": false,
+    //     "extra": {
+    //         "nfc_id": "string"
+    //     }
+    // }
+}
+
+// #### Spoolman init
+bool checkSpoolmanExtraFields() {
+    HTTPClient http;
+    String checkUrls[] = {
+        spoolmanUrl + apiUrl + "/field/spool",
+        spoolmanUrl + apiUrl + "/field/filament"
+    };
+
+    String spoolExtra[] = {
+        "nfc_id"
+    };
+
+    String filamentExtra[] = {
+        "nozzle_temperature",
+        "price_meter",
+        "price_gramm",
+        "bambu_setting_id",
+        "bambu_cali_id",
+        "bambu_idx",
+        "bambu_k",
+        "bambu_flow_ratio",
+        "bambu_max_volspeed"
+    };
+
+    String spoolExtraFields[] = {
+        "{\"name\": \"NFC ID\","
+        "\"key\": \"nfc_id\","
+        "\"field_type\": \"text\"}"
+    };
+
+    String filamentExtraFields[] = {
+        "{\"name\": \"Nozzle Temp\","
+        "\"unit\": \"°C\","
+        "\"field_type\": \"integer_range\","
+        "\"default_value\": \"[190,230]\","
+        "\"key\": \"nozzle_temperature\"}",
+
+        "{\"name\": \"Price/m\","
+        "\"unit\": \"€\","
+        "\"field_type\": \"float\","
+        "\"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();
+    
+        if (httpCode == HTTP_CODE_OK) {
+            String payload = http.getString();
+            JsonDocument doc;
+            DeserializationError error = deserializeJson(doc, payload);
+            if (!error) {
+                String* extraFields;
+                String* extraFieldData;
+                u16_t extraLength;
 
-        if (httpCode > 0) {
-            if (httpCode == HTTP_CODE_OK) {
-                String payload = http.getString();
-                JsonDocument doc;
-                DeserializationError error = deserializeJson(doc, payload);
-                if (!error && doc["status"].is<String>()) {
-                    const char* status = doc["status"];
-                    http.end();
-
-                    if (!checkSpoolmanExtraFields()) {
-                        Serial.println("Fehler beim Überprüfen der Extrafelder.");
-
-                        // TBD
-                        oledShowMessage("Spoolman Error creating Extrafields");
-                        vTaskDelay(2000 / portTICK_PERIOD_MS);
-                        
-                        return false;
-                    }
-
-                    spoolmanApiState = API_IDLE;
-                    oledShowTopRow();
-                    spoolmanConnected = true;
-                    returnValue = strcmp(status, "healthy") == 0;
-                }else{
-                    spoolmanConnected = false;
+                if (i == 0) {
+                    extraFields = spoolExtra;
+                    extraFieldData = spoolExtraFields;
+                    extraLength = sizeof(spoolExtra) / sizeof(spoolExtra[0]);
+                } else {
+                    extraFields = filamentExtra;
+                    extraFieldData = filamentExtraFields;
+                    extraLength = sizeof(filamentExtra) / sizeof(filamentExtra[0]);
                 }
 
-                doc.clear();
-            }else{
-                spoolmanConnected = false;
+                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
+                        http.begin(checkUrls[i] + "/" + extraFields[s]);
+                        http.addHeader("Content-Type", "application/json");
+                        int httpCode = http.POST(extraFieldData[s]);
+
+                         if (httpCode > 0) {
+                            // Antwortscode und -nachricht abrufen
+                            String response = http.getString();
+                            //Serial.println("HTTP-Code: " + String(httpCode));
+                            //Serial.println("Antwort: " + response);
+                            if (httpCode != HTTP_CODE_OK) {
+
+                                return false;
+                            }
+                        } else {
+                            // Fehler beim Senden der Anfrage
+                            Serial.println("Fehler beim Senden der Anfrage: " + String(http.errorToString(httpCode)));
+                            return false;
+                        }
+                        //http.end();
+                    }
+                    yield();
+                    vTaskDelay(100 / portTICK_PERIOD_MS);
+                }
             }
-        } else {
-            spoolmanConnected = false;
-            Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
+            doc.clear();
         }
-        http.end();
-        returnValue = false;
-        spoolmanApiState = API_IDLE;
-    }else{
-        // If the check is skipped, return the previous status
-        Serial.println("Skipping spoolman healthcheck, API is active.");
-        returnValue = spoolmanConnected;
     }
-    Serial.println("Healthcheck completed!");
-    return returnValue;
+    
+    Serial.println("-------- ENDE Prüfe Felder --------");
+    Serial.println();
+
+    http.end();
+
+    return true;
+}
+
+bool checkSpoolmanInstance(const String& url) {
+    HTTPClient http;
+    String healthUrl = url + apiUrl + "/health";
+
+    Serial.print("Überprüfe Spoolman-Instanz unter: ");
+    Serial.println(healthUrl);
+
+    http.begin(healthUrl);
+    int httpCode = http.GET();
+
+    if (httpCode > 0) {
+        if (httpCode == HTTP_CODE_OK) {
+            String payload = http.getString();
+            JsonDocument doc;
+            DeserializationError error = deserializeJson(doc, payload);
+            if (!error && doc["status"].is<String>()) {
+                const char* status = doc["status"];
+                http.end();
+
+                if (!checkSpoolmanExtraFields()) {
+                    Serial.println("Fehler beim Überprüfen der Extrafelder.");
+
+                    // TBD
+                    oledShowMessage("Spoolman Error creating Extrafields");
+                    vTaskDelay(2000 / portTICK_PERIOD_MS);
+                    
+                    return false;
+                }
+
+                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& octo_url, const String& octoTk) {
@@ -670,13 +930,12 @@ 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;
 
-    return checkSpoolmanInstance();
+    return true;
 }
 
 String loadSpoolmanUrl() {
@@ -696,10 +955,15 @@ String loadSpoolmanUrl() {
 bool initSpoolman() {
     oledShowProgressBar(3, 7, DISPLAY_BOOT_TEXT, "Spoolman init");
     spoolmanUrl = loadSpoolmanUrl();
-    
-    bool success = checkSpoolmanInstance();
+    spoolmanUrl.trim();
+    if (spoolmanUrl == "") {
+        Serial.println("Keine Spoolman-URL gefunden.");
+        return false;
+    }
+
+    bool success = checkSpoolmanInstance(spoolmanUrl);
     if (!success) {
-        Serial.println("Spoolman not available");
+        Serial.println("Spoolman nicht erreichbar.");
         return false;
     }
 

src/api.h

@@ -17,7 +17,10 @@ typedef enum {
     API_REQUEST_BAMBU_UPDATE,
     API_REQUEST_SPOOL_TAG_ID_UPDATE,
     API_REQUEST_SPOOL_WEIGHT_UPDATE,
-    API_REQUEST_SPOOL_LOCATION_UPDATE
+    API_REQUEST_SPOOL_LOCATION_UPDATE,
+    API_REQUEST_VENDOR_CREATE,
+    API_REQUEST_VENDOR_CHECK,
+    API_REQUEST_FILAMENT_CHECK
 } SpoolmanApiRequestType;
 
 extern volatile spoolmanApiStateType spoolmanApiState;
@@ -27,9 +30,12 @@ extern bool octoEnabled;
 extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
+extern uint16_t createdVendorId;  // ID of newly created vendor
+extern uint16_t foundVendorId;    // ID of found vendor
+extern uint16_t foundFilamentId;  // ID of found filament
 extern bool spoolmanConnected;
 
-bool checkSpoolmanInstance();
+bool checkSpoolmanInstance(const String& url);
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
 String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
 bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder
@@ -40,5 +46,12 @@ 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
+uint16_t checkVendor(String vendor); // Check if vendor exists, return ID
+uint16_t createVendor(String vendor); // Create vendor, return ID
+uint16_t checkFilament(); // Check if filament exists, return ID
+bool createFilament(); // Create filament
+uint16_t checkSpool(); // Check if spool exists, return ID
+bool createSpool(); // Create spool
+void createFilamentFabrik(JsonDocument payload);
 
 #endif

src/config.cpp

@@ -16,6 +16,7 @@ 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)

src/config.h

@@ -3,39 +3,36 @@
 
 #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_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_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_SCALE                 "scale"
-#define NVS_KEY_CALIBRATION                 "cal_value"
-#define NVS_KEY_AUTOTARE                    "auto_tare"
-#define SCALE_DEFAULT_CALIBRATION_VALUE     430.0f;
+#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 BAMBU_USERNAME                      "bblp"
+#define NVS_NAMESPACE_SCALE "scale"
+#define NVS_KEY_CALIBRATION "cal_value"
+#define NVS_KEY_AUTOTARE "auto_tare"
 
-#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 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;

src/main.cpp

@@ -97,8 +97,7 @@ int16_t lastWeight = 0;
 
 // WIFI check variables
 unsigned long lastWifiCheckTime = 0;
-unsigned long lastTopRowUpdateTime = 0;
-unsigned long lastSpoolmanHealcheckTime = 0;
+const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
 
 // Button debounce variables
 unsigned long lastButtonPress = 0;
@@ -116,23 +115,17 @@ void loop() {
   }
 
   // Überprüfe regelmäßig die WLAN-Verbindung
-  if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) 
   {
     checkWiFiConnection();
   }
 
   // Periodic display update
-  if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL)) 
+  if (intervalElapsed(currentMillis, lastWifiCheckTime, 1000)) 
   {
     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) 
   {
@@ -163,94 +156,95 @@ void loop() {
     }
   }
 
-  // If scale is not calibrated, only show a warning
-  if (!scaleCalibrated) 
+  // Wenn Waage nicht Kalibriert
+  if (scaleCalibrated == 3) 
   {
-    // Do not show the warning if the calibratin process is onging
-    if(!scaleCalibrationActive){
-      oledShowMessage("Scale not calibrated");
-      vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
-  }else{
-    // Ausgabe der Waage auf Display
-    if(pauseMainTask == 0)
+    oledShowMessage("Scale not calibrated!");
+    vTaskDelay(5000 / portTICK_PERIOD_MS);
+    yield();
+    esp_task_wdt_reset();
+    
+    return;
+  } 
+
+  // Ausgabe der Waage auf Display
+  if(pauseMainTask == 0)
+  {
+    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 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;
+      (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
+    }
+    mainTaskWasPaused = false;
+  }
+  else
+  {
+    mainTaskWasPaused = true;
+  }
+
+
+  // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
+  {
+    lastWeightReadTime = currentMillis;
+
+    // Prüfen ob die Waage korrekt genullt ist
+    // Abweichung von 2g ignorieren
+    if (autoTare && (weight > 2 && weight < 7) || weight < -2)
+    {
+      scale_tare_counter++;
     }
     else
     {
-      mainTaskWasPaused = true;
+      scale_tare_counter = 0;
     }
 
-
-    // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
-    if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
+    // Prüfen ob das Gewicht gleich bleibt und dann senden
+    if (abs(weight - lastWeight) <= 2 && weight > 5)
     {
-      lastWeightReadTime = currentMillis;
-
-      // Prüfen ob die Waage korrekt genullt ist
-      // Abweichung von 2g ignorieren
-      if (autoTare && (weight > 2 && weight < 7) || weight < -2)
-      {
-        scale_tare_counter++;
-      }
-      else
-      {
-        scale_tare_counter = 0;
-      }
-
-      // Prüfen ob das Gewicht gleich bleibt und dann senden
-      if (abs(weight - lastWeight) <= 2 && weight > 5)
-      {
-        weigthCouterToApi++;
-      } 
-      else 
-      {
-        weigthCouterToApi = 0;
-        weightSend = 0;
-      }
-    }
-
-    // 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++;
+    } 
+    else 
     {
       weigthCouterToApi = 0;
+      weightSend = 0;
     }
-    
-    lastWeight = weight;
+  }
 
-    // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-    if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) {
-      // set the current tag as processed to prevent it beeing processed again
-      tagProcessed = true;
+  // reset weight counter after writing tag
+  // TBD: what exactly is the logic behind this?
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
+  {
+    weigthCouterToApi = 0;
+  }
+  
+  lastWeight = weight;
 
-      if (updateSpoolWeight(activeSpoolId, weight)) 
-      {
-        weightSend = 1;
-        
-      }
-      else
-      {
-        oledShowIcon("failed");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
-      }
+  // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
+  if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) {
+    // set the current tag as processed to prevent it beeing processed again
+    tagProcessed = true;
+
+    if (updateSpoolWeight(activeSpoolId, weight)) 
+    {
+      weightSend = 1;
+      
     }
-
-    if(sendOctoUpdate && spoolmanApiState == API_IDLE){
-      autoSetToBambuSpoolId = activeSpoolId.toInt();
-
-      if(octoEnabled) 
-      {
-        updateSpoolOcto(autoSetToBambuSpoolId);
-      }
-      sendOctoUpdate = false;
+    else
+    {
+      oledShowIcon("failed");
+      vTaskDelay(2000 / portTICK_PERIOD_MS);
     }
   }
+
+  if(sendOctoUpdate && spoolmanApiState == API_IDLE){
+    autoSetToBambuSpoolId = activeSpoolId.toInt();
+
+    if(octoEnabled) 
+    {
+      updateSpoolOcto(autoSetToBambuSpoolId);
+    }
+    sendOctoUpdate = false;
+  }
   
   esp_task_wdt_reset();
 }

src/nfc.cpp

@@ -8,7 +8,6 @@
 #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);
@@ -21,8 +20,6 @@ String lastSpoolId = "";
 String nfcJsonData = "";
 bool tagProcessed = false;
 volatile bool pauseBambuMqttTask = false;
-volatile bool nfcReadingTaskSuspendRequest = false;
-volatile bool nfcReadingTaskSuspendState = false;
 
 struct NfcWriteParameterType {
   bool tagType;
@@ -40,6 +37,11 @@ volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
 // ***** PN532
 
 
+// ##### Recycling Fabrik #####
+bool isRecyclingFabrik(const char* brand) {
+    return strcmp(brand, "Recycling Fabrik") == 0;
+}
+
 // ##### Funktionen für RFID #####
 void payloadToJson(uint8_t *data) {
     const char* startJson = strchr((char*)data, '{');
@@ -60,7 +62,13 @@ void payloadToJson(uint8_t *data) {
         int min_temp = doc["min_temp"];
         int max_temp = doc["max_temp"];
         const char* brand = doc["brand"];
-  
+
+        // Recycling Fabrik
+        if (isRecyclingFabrik(brand)) {
+          // TODO: Implement specific handling for Recycling Fabrik
+          Serial.println("Recycling Fabrik erkannt.");
+        }
+
         Serial.println();
         Serial.println("-----------------");
         Serial.println("JSON-Parsed Data:");
@@ -218,7 +226,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
   }
 
   // JSON-Dokument verarbeiten
-  JsonDocument doc;  // Passen Sie die Größe an den JSON-Inhalt an
+  JsonDocument doc;
   DeserializationError error = deserializeJson(doc, nfcJsonData);
   if (error) 
   {
@@ -235,12 +243,14 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
       // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
       Serial.println("JSON-Dokument erfolgreich verarbeitet");
       Serial.println(doc.as<String>());
-      if (doc["sm_id"].is<String>() && doc["sm_id"] != "") 
+      if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
       {
         oledShowProgressBar(2, octoEnabled?5:4, "Spool Tag", "Weighing");
         Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
         activeSpoolId = doc["sm_id"].as<String>();
         lastSpoolId = activeSpoolId;
+
+        Serial.println("Api state: " + String(spoolmanApiState));
       }
       else if(doc["location"].is<String>() && doc["location"] != "")
       {
@@ -255,6 +265,13 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
           oledShowProgressBar(1, 1, "Failure", "Scan spool first");
         }
       }
+      // Recycling Fabrik
+      else if (isRecyclingFabrik(doc["type"].as<String>().c_str())) {
+        // If no sm_id is present but the brand is Recycling Fabrik then
+        // create a new spool, maybe brand too, in Spoolman
+        Serial.println("Recycling Fabrik Tag found!");
+        createFilamentFabrik(doc);
+      }
       else 
       {
         Serial.println("Keine SPOOL-ID gefunden.");
@@ -279,21 +296,19 @@ void writeJsonToTag(void *parameter) {
   Serial.println(params->payload);
 
   nfcReaderState = NFC_WRITING;
-
-  // First request the reading task to be suspended and than wait until it responds
-  nfcReadingTaskSuspendRequest = true;
-  while(nfcReadingTaskSuspendState == false){
-    vTaskDelay(100 / portTICK_PERIOD_MS);
-  }
+  vTaskSuspend(RfidReaderTask);
+  vTaskDelay(50 / portTICK_PERIOD_MS);
 
   //pauseBambuMqttTask = true;
   // aktualisieren der Website wenn sich der Status ändert
   sendNfcData();
   vTaskDelay(100 / portTICK_PERIOD_MS);
+  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;
     // yield before potentially waiting for 400ms
@@ -301,6 +316,7 @@ void writeJsonToTag(void *parameter) {
     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);
@@ -310,6 +326,8 @@ void writeJsonToTag(void *parameter) {
       }
       foundNfcTag(nullptr, success);
       break;
+    }else{
+      Serial.println("CP 3.2");
     }
 
     yield();
@@ -372,7 +390,7 @@ void writeJsonToTag(void *parameter) {
   sendWriteResult(nullptr, success);
   sendNfcData();
 
-  nfcReadingTaskSuspendRequest = false;
+  vTaskResume(RfidReaderTask);
   pauseBambuMqttTask = false;
 
   vTaskDelete(NULL);
@@ -384,7 +402,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload) {
   parameters->payload = strdup(payload);
   
   // Task nicht mehrfach starten
-  if (nfcReaderState == NFC_IDLE || nfcReaderState == NFC_READ_ERROR || nfcReaderState == NFC_READ_SUCCESS) {
+  if (nfcReaderState == NFC_IDLE) {
     oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
     // Erstelle die Task
     xTaskCreate(
@@ -405,16 +423,15 @@ void scanRfidTask(void * parameter) {
   Serial.println("RFID Task gestartet");
   for(;;) {
     // Wenn geschrieben wird Schleife aussetzen
-    if (nfcReaderState != NFC_WRITING && !nfcReadingTaskSuspendRequest && !booting)
+    if (nfcReaderState != NFC_WRITING)
     {
-      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, 500);
+      success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 1000);
 
       foundNfcTag(nullptr, success);
       
@@ -431,8 +448,8 @@ void scanRfidTask(void * parameter) {
 
         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();
@@ -488,7 +505,7 @@ void scanRfidTask(void * parameter) {
         }
       }
 
-      if (!success && nfcReaderState != NFC_IDLE && !nfcReadingTaskSuspendRequest)
+      if (!success && nfcReaderState != NFC_IDLE)
       {
         nfcReaderState = NFC_IDLE;
         //uidString = "";
@@ -501,12 +518,6 @@ void scanRfidTask(void * parameter) {
       // aktualisieren der Website wenn sich der Status ändert
       sendNfcData();
     }
-    else
-    {
-      nfcReadingTaskSuspendState = true;
-      Serial.println("NFC Reading disabled");
-      vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
     yield();
   }
 }

src/scale.cpp

@@ -17,9 +17,8 @@ uint8_t weigthCouterToApi = 0;
 uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
-bool scaleCalibrated;
+uint8_t scaleCalibrated = 1;
 bool autoTare = true;
-bool scaleCalibrationActive = false;
 
 // ##### Funktionen für Waage #####
 uint8_t setAutoTare(bool autoTareValue) {
@@ -89,13 +88,7 @@ void start_scale(bool touchSensorConnected) {
   // NVS lesen
   Preferences preferences;
   preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
-  if(preferences.isKey(NVS_KEY_CALIBRATION)){
-    calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION);
-    scaleCalibrated = true;
-  }else{
-    calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
-    scaleCalibrated = false;
-  }
+  calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
   
   // auto Tare
   // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
@@ -110,6 +103,18 @@ void start_scale(bool touchSensorConnected) {
 
   scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
 
+  if (isnan(calibrationValue) || calibrationValue < 1) {
+    calibrationValue = defaultScaleCalibrationValue;
+    scaleCalibrated = 0;
+
+    oledShowMessage("Scale not calibrated!");
+    for (uint16_t i = 0; i < 50000; i++) {
+      yield();
+      vTaskDelay(pdMS_TO_TICKS(1));
+      esp_task_wdt_reset();
+    }
+  }
+
   oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
   for (uint16_t i = 0; i < 2000; i++) {
     yield();
@@ -147,8 +152,6 @@ uint8_t calibrate_scale() {
   uint8_t returnState = 0;
   float newCalibrationValue;
 
-  scaleCalibrationActive = true;
-
   vTaskSuspend(RfidReaderTask);
   vTaskSuspend(ScaleTask);
 
@@ -225,7 +228,6 @@ uint8_t calibrate_scale() {
         esp_task_wdt_reset();
       }
 
-      scaleCalibrated = true;
       returnState = 1;
     }
     else
@@ -260,7 +262,6 @@ uint8_t calibrate_scale() {
   vTaskResume(ScaleTask);
   pauseBambuMqttTask = false;
   pauseMainTask = 0;
-  scaleCalibrationActive = false;
 
   return returnState;
 }

src/scale.h

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