fix: update createdFilamentId reset value to 65535 for better task handling

refactor: improve readability of checkSpoolmanInstance function

CHANGELOG.md

@@ -1,5 +1,121 @@
 # Changelog
 
+## [1.5.12-beta11] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta11
+
+### Fixed
+- update spoolman ID reset values to 65535 for better API response detection
+
+
+## [1.5.12-beta10] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta10
+- streamline task creation in checkVendor and checkFilament functions
+
+
+## [1.5.12-beta9] - 2025-08-29
+### Added
+- update vendor and filament ID handling to use NULL and add delays for stability
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta9
+
+
+## [1.5.12-beta8] - 2025-08-29
+### Added
+- add delay to ensure proper setting of vendor and filament IDs after API state changes
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta8
+
+### Fixed
+- correct color_hex key usage and comment out unused date fields in spool creation
+
+
+## [1.5.12-beta7] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta7
+
+### Fixed
+- improve API state handling and vendor name formatting
+
+
+## [1.5.12-beta6] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta6
+- improve task synchronization in vendor, filament, and spool creation functions
+
+
+## [1.5.12-beta5] - 2025-08-29
+### Added
+- enhance NDEF decoding with detailed validation and debugging output
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta5
+
+
+## [1.5.12-beta4] - 2025-08-29
+### Added
+- enhance NDEF decoding to validate structure and extract JSON payload
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta4
+
+
+## [1.5.12-beta3] - 2025-08-29
+### Added
+- add logging for decoded JSON data in NFC processing
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta3
+
+
+## [1.5.12-beta2] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta2
+
+### Fixed
+- enhance filament creation logic to include dynamic comments based on payload
+
+
+## [1.5.12-beta1] - 2025-08-28
+### Added
+- implement filament and spool creation in Spoolman API
+- Add JSON structure comments for filament and spool creation
+- Add vendor and filament management to API; implement recycling factory handling in NFC
+
+### Changed
+- update platformio.ini for beta version v1.5.12-beta1
+- Merge branch 'main' into recyclingfabrik
+- Merge branch 'main' into recyclingfabrik
+
+
+## [1.5.12] - 2025-08-28
+### Added
+- add numbering to update sections in upgrade.html refactor: improve readability of checkSpoolmanInstance function
+
+### Changed
+- update platformio.ini for version v1.5.12
+- clean up library dependencies in platformio.ini
+
+
+## [1.5.11-beta4] - 2025-08-28
+### Changed
+- update platformio.ini for beta version v1.5.11-beta4
+
+### Fixed
+- remove debug logging from checkSpoolmanInstance function
+
+
+## [1.5.11-beta3] - 2025-08-28
+### Added
+- add logging for spoolman status in checkSpoolmanInstance function
+
+### Changed
+- update platformio.ini for beta version v1.5.11-beta3
+
+
 ## [1.5.11-beta2] - 2025-08-28
 ### Added
 - add logging for healthy spoolman instance check

html/upgrade.html

@@ -56,7 +56,7 @@
 
         <div class="update-options">
             <div class="update-section">
-                <h2>Firmware Update</h2>
+                <h2>1) Firmware Update</h2>
                 <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">
@@ -67,7 +67,7 @@
             </div>
 
             <div class="update-section">
-                <h2>Webpage Update</h2>
+                <h2>2) Webpage Update</h2>
                 <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">

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.5.11-beta2"
+version = "1.5.12-beta11"
 to_old_version = "1.5.0"
 
 ##
@@ -23,10 +23,7 @@ monitor_speed = 115200
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
     https://github.com/me-no-dev/ESPAsyncWebServer.git#master
-    #me-no-dev/AsyncTCP @ ^1.1.1
     https://github.com/esphome/AsyncTCP.git
-    #mathieucarbou/ESPAsyncWebServer @ ^3.6.0
-    #esp32async/AsyncTCP @ ^3.3.5
     bogde/HX711 @ ^0.7.5
     adafruit/Adafruit SSD1306 @ ^2.5.13
     adafruit/Adafruit GFX Library @ ^1.11.11
@@ -36,7 +33,6 @@ lib_deps =
     digitaldragon/SSLClient @ ^1.3.2
     
 ; Enable SPIFFS upload
-#board_build.filesystem = spiffs
 board_build.filesystem = littlefs
 ; Update partition settings
 board_build.partitions = partitions.csv

src/api.cpp

@@ -5,8 +5,22 @@
 #include <Preferences.h>
 #include "debug.h"
 #include "scale.h"
-
+#include "nfc.h"
+#include <time.h>
 volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
+
+// Returns current date and time in ISO8601 format
+String getCurrentDateISO8601() {
+    struct tm timeinfo;
+    if(!getLocalTime(&timeinfo)) {
+        Serial.println("Failed to obtain time");
+        return "1970-01-01T00:00:00Z";
+    }
+    char timeStringBuff[25];
+    strftime(timeStringBuff, sizeof(timeStringBuff), "%Y-%m-%dT%H:%M:%SZ", &timeinfo);
+    return String(timeStringBuff);
+}
+
 //bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
@@ -14,6 +28,11 @@ 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
+uint16_t createdFilamentId = 0;  // Store ID of newly created filament
+uint16_t createdSpoolId = 0;  // Store ID of newly created spool
 bool spoolmanConnected = false;
 bool spoolmanExtraFieldsChecked = false;
 TaskHandle_t* apiTask;
@@ -103,7 +122,7 @@ void sendToApi(void *parameter) {
 
     // Wait until API is IDLE
     while(spoolmanApiState != API_IDLE){
-        Serial.println("Waiting!");
+        vTaskDelay(100 / portTICK_PERIOD_MS);
         yield();
     }
     spoolmanApiState = API_TRANSMITTING;
@@ -129,10 +148,11 @@ 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) {
-        Serial.println("Spoolman erfolgreich aktualisiert");
+        Serial.println("Spoolman Abfrage erfolgreich");
 
         // Restgewicht der Spule auslesen
         String payload = http.getString();
@@ -168,6 +188,86 @@ 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;
+            case API_REQUEST_FILAMENT_CREATE:
+                Serial.println("Filament successfully created!");
+                createdFilamentId = doc["id"].as<uint16_t>();
+                Serial.print("Created Filament ID: ");
+                Serial.println(createdFilamentId);
+                oledShowProgressBar(1, 1, "Filament", "Created!");
+                break;
+            case API_REQUEST_SPOOL_CREATE:
+                Serial.println("Spool successfully created!");
+                createdSpoolId = doc["id"].as<uint16_t>();
+                Serial.print("Created Spool ID: ");
+                Serial.println(createdSpoolId);
+                oledShowProgressBar(1, 1, "Spool", "Created!");
+                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;
+            case API_REQUEST_FILAMENT_CREATE:
+                Serial.println("Filament successfully created!");
+                createdFilamentId = doc["id"].as<uint16_t>();
+                Serial.print("Created Filament ID: ");
+                Serial.println(createdFilamentId);
+                oledShowProgressBar(1, 1, "Filament", "Created!");
+                break;
+            case API_REQUEST_SPOOL_CREATE:
+                Serial.println("Spool successfully created!");
+                createdSpoolId = doc["id"].as<uint16_t>();
+                Serial.print("Created Spool ID: ");
+                Serial.println(createdSpoolId);
+                oledShowProgressBar(1, 1, "Spool", "Created!");
+                break;
+            default:
+                // Handle other create operations if needed
+                break;
             }
         }
         doc.clear();
@@ -235,6 +335,15 @@ 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;
+        case API_REQUEST_FILAMENT_CREATE:
+            oledShowProgressBar(1, 1, "Failure!", "Filament create");
+            break;
+        case API_REQUEST_SPOOL_CREATE:
+            oledShowProgressBar(1, 1, "Failure!", "Spool create");
+            break;
         }
         Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
 
@@ -504,6 +613,367 @@ bool updateSpoolBambuData(String payload) {
     return true;
 }
 
+// #### Brand Filament
+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
+    // Note: This function assumes that the caller has already ensured API is IDLE
+    createdVendorId = 65535; // Reset previous value
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor";
+    Serial.print("Create vendor with URL: ");
+    Serial.println(spoolsUrl);
+
+    // 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;
+
+    // Create task without additional API state check since caller ensures synchronization
+    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 (result != pdPASS) {
+        Serial.println("Failed to create vendor task!");
+        delete params;
+        vendorDoc.clear();
+        return 0;
+    }
+
+    vendorDoc.clear();
+    
+    // Wait for task completion and return the created vendor ID
+    // Note: createdVendorId will be set by sendToApi when response is received
+    while(createdVendorId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
+    }
+    
+    return createdVendorId;
+}
+
+uint16_t checkVendor(String vendor) {
+    // Check if vendor exists using task system
+    foundVendorId = 65535; // Reset to invalid value to detect when API response is received
+    
+    String vendorName = vendor;
+    vendorName.trim();
+    vendorName.replace(" ", "+");
+    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendorName;
+    Serial.print("Check vendor 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_VENDOR_CHECK;
+    params->httpType = "GET";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = ""; // Empty for GET request
+
+    // Check if API is idle before creating task
+    while (spoolmanApiState != API_IDLE)
+    {
+        vTaskDelay(100 / portTICK_PERIOD_MS);
+    }
+    
+    // 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)
+    );
+    
+    // Wait until foundVendorId is updated by the API response (not 65535 anymore)
+    while (foundVendorId == 65535)
+    {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
+    }
+
+    // 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));
+            return vendorId;
+        }
+    } else {
+        Serial.println("Vendor found: " + vendor);
+        Serial.print("Vendor ID: ");
+        Serial.println(foundVendorId);
+        return foundVendorId;
+    }
+}
+
+uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
+    // Create new filament in Spoolman database using task system
+    // Note: Due to async nature, the ID will be stored in createdFilamentId global variable
+    // Note: This function assumes that the caller has already ensured API is IDLE
+    createdFilamentId = 65535; // Reset previous value
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/filament";
+    Serial.print("Create filament with URL: ");
+    Serial.println(spoolsUrl);
+
+    // Create JSON payload for filament creation
+    JsonDocument filamentDoc;
+    filamentDoc["name"] = payload["color_name"].as<String>();
+    filamentDoc["vendor_id"] = String(vendorId);
+    filamentDoc["material"] = payload["type"].as<String>();
+    filamentDoc["density"] = (payload["density"].is<String>() && payload["density"].as<String>().length() > 0) ? payload["density"].as<String>() : "1.24";
+    filamentDoc["diameter"] = (payload["diameter"].is<String>() && payload["diameter"].as<String>().length() > 0) ? payload["diameter"].as<String>() : "1.75";
+    filamentDoc["weight"] = String(weight);
+    filamentDoc["spool_weight"] = payload["spool_weight"].as<String>();
+    filamentDoc["article_number"] = payload["artnr"].as<String>();
+    filamentDoc["settings_extruder_temp"] = payload["extruder_temp"].is<String>() ? payload["extruder_temp"].as<String>() : "";
+    filamentDoc["settings_bed_temp"] = payload["bed_temp"].is<String>() ? payload["bed_temp"].as<String>() : "";
+    
+    if (payload["artnr"].is<String>())
+    {
+        filamentDoc["external_id"] = payload["artnr"].as<String>();
+        filamentDoc["comment"] = payload["url"].is<String>() ? payload["url"].as<String>() + payload["artnr"].as<String>() : "automatically generated";
+    }
+    else
+    {
+        filamentDoc["comment"] = payload["url"].is<String>() ? payload["url"].as<String>() : "automatically generated";
+    }
+
+    if (payload["multi_color_hexes"].is<String>()) {
+        filamentDoc["multi_color_hexes"] = payload["multi_color_hexes"].as<String>();
+        filamentDoc["multi_color_direction"] = payload["multi_color_direction"].is<String>() ? payload["multi_color_direction"].as<String>() : "";
+    }
+    else
+    {
+        filamentDoc["color_hex"] = (payload["color_hex"].is<String>() && payload["color_hex"].as<String>().length() >= 6) ? payload["color_hex"].as<String>() : "FFFFFF";
+    }
+
+    String filamentPayload;
+    serializeJson(filamentDoc, filamentPayload);
+    Serial.print("Filament Payload: ");
+    Serial.println(filamentPayload);
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        filamentDoc.clear();
+        return 0;
+    }
+    params->requestType = API_REQUEST_FILAMENT_CREATE;
+    params->httpType = "POST";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = filamentPayload;
+
+    // Create task without additional API state check since caller ensures synchronization
+    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 (result != pdPASS) {
+        Serial.println("Failed to create filament task!");
+        delete params;
+        filamentDoc.clear();
+        return 0;
+    }
+
+    filamentDoc.clear();
+    
+    // Wait for task completion and return the created filament ID
+    // Note: createdFilamentId will be set by sendToApi when response is received
+    while(createdFilamentId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
+    }
+    
+    return createdFilamentId;
+}
+
+uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
+    // Check if filament exists using task system
+    foundFilamentId = 65535; // Reset to invalid value to detect when API response is received
+
+    String spoolsUrl = spoolmanUrl + apiUrl + "/filament?vendor.id=" + String(vendorId) + "&external_id=" + String(payload["artnr"].as<String>());
+    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
+
+     // 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)
+    );
+    
+    // Wait until foundFilamentId is updated by the API response (not 65535 anymore)
+    while (foundFilamentId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
+    }
+
+    // Check if filament was found
+    if (foundFilamentId == 0) {
+        Serial.println("Filament not found, creating new filament...");
+        uint16_t filamentId = createFilament(vendorId, payload);
+        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));
+            return filamentId;
+        }
+    } else {
+        Serial.println("Filament found for vendor ID: " + String(vendorId));
+        Serial.print("Filament ID: ");
+        Serial.println(foundFilamentId);
+        return foundFilamentId;
+    }
+}
+
+uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& payload, String uidString) {
+    // Create new spool in Spoolman database using task system
+    // Note: Due to async nature, the ID will be stored in createdSpoolId global variable
+    // Note: This function assumes that the caller has already ensured API is IDLE
+    createdSpoolId = 65535; // Reset to invalid value to detect when API response is received
+    
+    String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
+    Serial.print("Create spool with URL: ");
+    Serial.println(spoolsUrl);
+    //String currentDate = getCurrentDateISO8601();
+
+    // Create JSON payload for spool creation
+    JsonDocument spoolDoc;
+    //spoolDoc["first_used"] = String(currentDate);
+    //spoolDoc["last_used"] = String(currentDate);
+    spoolDoc["filament_id"] = String(filamentId);
+    spoolDoc["initial_weight"] = weight > 10 ? String(weight-payload["spool_weight"].as<int>()) : "1000";
+    spoolDoc["spool_weight"] = (payload["spool_weight"].is<String>() && payload["spool_weight"].as<String>().length() > 0) ? payload["spool_weight"].as<String>() : "180";
+    spoolDoc["remaining_weight"] = (payload["weight"].is<String>() && payload["weight"].as<String>().length() > 0) ? payload["weight"].as<String>() : "1000";
+    spoolDoc["lot_nr"] = (payload["lotnr"].is<String>() && payload["lotnr"].as<String>().length() > 0) ? payload["lotnr"].as<String>() : "";
+    spoolDoc["comment"] = "automatically generated";
+    spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\"";
+
+    String spoolPayload;
+    serializeJson(spoolDoc, spoolPayload);
+    Serial.print("Spool Payload: ");
+    Serial.println(spoolPayload);
+    spoolDoc.clear();
+
+    SendToApiParams* params = new SendToApiParams();
+    if (params == nullptr) {
+        Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
+        spoolDoc.clear();
+        return 0;
+    }
+    params->requestType = API_REQUEST_SPOOL_CREATE;
+    params->httpType = "POST";
+    params->spoolsUrl = spoolsUrl;
+    params->updatePayload = spoolPayload;
+
+    // Create task without additional API state check since caller ensures synchronization
+    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 (result != pdPASS) {
+        Serial.println("Failed to create spool task!");
+        delete params;
+        return 0;
+    }
+    
+    // Wait for task completion and return the created spool ID
+    // Note: createdSpoolId will be set by sendToApi when response is received
+    while(createdSpoolId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
+    }
+
+    // Write data to tag with startWriteJsonToTag
+    // void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
+    payload["sm_id"].set(String(createdSpoolId));
+    
+    String payloadString;
+    serializeJson(payload, payloadString);
+    
+    nfcReaderState = NFC_IDLE;
+    vTaskDelay(50 / portTICK_PERIOD_MS);
+    startWriteJsonToTag(true, payloadString.c_str());
+
+    return createdSpoolId;
+}
+
+bool createBrandFilament(JsonDocument& payload, String uidString) {
+    uint16_t vendorId = checkVendor(payload["brand"].as<String>());
+    if (vendorId == 0) {
+        Serial.println("ERROR: Failed to create/find vendor");
+        return false;
+    }
+    
+    uint16_t filamentId = checkFilament(vendorId, payload);
+    if (filamentId == 0) {
+        Serial.println("ERROR: Failed to create/find filament");
+        return false;
+    }
+    
+    uint16_t spoolId = createSpool(vendorId, filamentId, payload, uidString);
+    if (spoolId == 0) {
+        Serial.println("ERROR: Failed to create spool");
+        return false;
+    }
+    
+    Serial.println("SUCCESS: Brand filament created with Spool ID: " + String(spoolId));
+    return true;
+}
+
 // #### Spoolman init
 bool checkSpoolmanExtraFields() {
     // Only check extra fields if they have not been checked before
@@ -700,8 +1170,6 @@ bool checkSpoolmanInstance() {
                     oledShowTopRow();
                     spoolmanConnected = true;
                     returnValue = strcmp(status, "healthy") == 0;
-                    Serial.print("Spoolman instance is healthy: ");
-                    Serial.println(returnValue);
                 }else{
                     spoolmanConnected = false;
                 }
@@ -715,9 +1183,10 @@ bool checkSpoolmanInstance() {
             Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
         }
         http.end();
-        returnValue = false;
         spoolmanApiState = API_IDLE;
-    }else{
+    }
+    else
+    {
         // If the check is skipped, return the previous status
         Serial.println("Skipping spoolman healthcheck, API is active.");
         returnValue = spoolmanConnected;

src/api.h

@@ -17,7 +17,12 @@ 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,
+    API_REQUEST_FILAMENT_CREATE,
+    API_REQUEST_SPOOL_CREATE
 } SpoolmanApiRequestType;
 
 extern volatile spoolmanApiStateType spoolmanApiState;
@@ -40,5 +45,6 @@ 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
+bool createBrandFilament(JsonDocument& payload, String uidString);
 
 #endif

src/bambu.cpp

@@ -33,6 +33,7 @@ AMSData ams_data[MAX_AMS];  // Definition des Arrays;
 bool removeBambuCredentials() {
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
+        BambuMqttTask = NULL;
     }
     
     Preferences preferences;
@@ -63,6 +64,7 @@ bool removeBambuCredentials() {
 bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) {
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
+        BambuMqttTask = NULL;
     }
 
     bambuCredentials.ip = ip.c_str();
@@ -593,6 +595,7 @@ void reconnect() {
                 Serial.println("Disable Bambu MQTT Task after 5 retries");
                 //vTaskSuspend(BambuMqttTask);
                 vTaskDelete(BambuMqttTask);
+                BambuMqttTask = NULL;
                 break;
             }
 
@@ -681,6 +684,7 @@ void bambu_restart() {
 
     if (BambuMqttTask) {
         vTaskDelete(BambuMqttTask);
+        BambuMqttTask = NULL;
         delay(10);
     }
     setupMqtt();

src/nfc.cpp

@@ -39,7 +39,6 @@ volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
 // 6 = reading
 // ***** PN532
 
-
 // ##### Funktionen für RFID #####
 void payloadToJson(uint8_t *data) {
     const char* startJson = strchr((char*)data, '{');
@@ -204,21 +203,187 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
   return 1;
 }
 
-bool decodeNdefAndReturnJson(const byte* encodedMessage) {
+bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
   oledShowProgressBar(1, octoEnabled?5:4, "Reading", "Decoding data");
 
-  byte typeLength = encodedMessage[3];
+  // Debug: Print first 32 bytes of the raw data
-  byte payloadLength = encodedMessage[4];
+  Serial.println("Raw NDEF data (first 32 bytes):");
+  for (int i = 0; i < 32; i++) {
+    if (encodedMessage[i] < 0x10) Serial.print("0");
+    Serial.print(encodedMessage[i], HEX);
+    Serial.print(" ");
+    if ((i + 1) % 16 == 0) Serial.println();
+  }
+  Serial.println();
+
+  // Look for the NDEF TLV structure starting from the beginning
+  int tlvOffset = 0;
+  bool foundNdefTlv = false;
+  
+  // Search for NDEF TLV (0x03) in the first few bytes
+  for (int i = 0; i < 16; i++) {
+    if (encodedMessage[i] == 0x03) {
+      tlvOffset = i;
+      foundNdefTlv = true;
+      Serial.print("Found NDEF TLV at offset: ");
+      Serial.println(tlvOffset);
+      break;
+    }
+  }
+
+  if (!foundNdefTlv) {
+    Serial.println("No NDEF TLV found in tag data");
+    return false;
+  }
+
+  // Get the NDEF message length from TLV
+  uint16_t ndefMessageLength = 0;
+  int ndefRecordOffset = 0;
+  
+  if (encodedMessage[tlvOffset + 1] == 0xFF) {
+    // Extended length format: next 2 bytes contain the actual length
+    ndefMessageLength = (encodedMessage[tlvOffset + 2] << 8) | encodedMessage[tlvOffset + 3];
+    ndefRecordOffset = tlvOffset + 4; // Skip TLV tag + 0xFF + 2 length bytes
+    Serial.print("NDEF Message Length (extended): ");
+  } else {
+    // Standard length format: single byte contains the length
+    ndefMessageLength = encodedMessage[tlvOffset + 1];
+    ndefRecordOffset = tlvOffset + 2; // Skip TLV tag + 1 length byte
+    Serial.print("NDEF Message Length (standard): ");
+  }
+  Serial.println(ndefMessageLength);
+
+  // Get pointer to NDEF record
+  const byte* ndefRecord = &encodedMessage[ndefRecordOffset];
+  
+  // Parse NDEF record header
+  byte recordHeader = ndefRecord[0];
+  byte typeLength = ndefRecord[1];
+  
+  Serial.print("NDEF Record Header: 0x");
+  Serial.println(recordHeader, HEX);
+  Serial.print("Type Length: ");
+  Serial.println(typeLength);
+
+  // Determine payload length (can be 1 or 4 bytes depending on SR flag)
+  uint32_t payloadLength = 0;
+  byte payloadLengthBytes = 1;
+  byte payloadLengthOffset = 2;
+  
+  // Check if Short Record (SR) flag is set (bit 4)
+  if (recordHeader & 0x10) { // SR flag
+    payloadLength = ndefRecord[2];
+    payloadLengthBytes = 1;
+    payloadLengthOffset = 2;
+  } else {
+    // Long record format (4 bytes for payload length)
+    payloadLength = (ndefRecord[2] << 24) | (ndefRecord[3] << 16) | 
+                   (ndefRecord[4] << 8) | ndefRecord[5];
+    payloadLengthBytes = 4;
+    payloadLengthOffset = 2;
+  }
+
+  Serial.print("Payload Length: ");
+  Serial.println(payloadLength);
+  Serial.print("Payload Length Bytes: ");
+  Serial.println(payloadLengthBytes);
+
+  // Check for ID field (if IL flag is set)
+  byte idLength = 0;
+  if (recordHeader & 0x08) { // IL flag
+    idLength = ndefRecord[payloadLengthOffset + payloadLengthBytes];
+    Serial.print("ID Length: ");
+    Serial.println(idLength);
+  }
+
+  // Calculate offset to payload
+  byte payloadOffset = 1 + 1 + payloadLengthBytes + typeLength + idLength;
+  
+  Serial.print("Calculated payload offset: ");
+  Serial.println(payloadOffset);
+
+  // Verify we have enough data
+  if (payloadOffset + payloadLength > ndefMessageLength) {
+    Serial.println("Invalid NDEF structure - payload extends beyond message");
+    Serial.print("Payload offset + length: ");
+    Serial.print(payloadOffset + payloadLength);
+    Serial.print(", NDEF message length: ");
+    Serial.println(ndefMessageLength);
+    return false;
+  }
+
+  // Print the record type for debugging
+  Serial.print("Record Type: ");
+  for (int i = 0; i < typeLength; i++) {
+    Serial.print((char)ndefRecord[1 + 1 + payloadLengthBytes + i]);
+  }
+  Serial.println();
 
   nfcJsonData = "";
 
-  for (int i = 2; i < payloadLength+2; i++) 
+  // Extract JSON payload with validation
-  {
+  uint32_t actualJsonLength = 0;
-    nfcJsonData += (char)encodedMessage[3 + typeLength + i];
+  for (uint32_t i = 0; i < payloadLength; i++) {
+    byte currentByte = ndefRecord[payloadOffset + i];
+    
+    // Stop at null terminator or if we find the end of JSON
+    if (currentByte == 0x00) {
+      Serial.print("Found null terminator at position: ");
+      Serial.println(i);
+      break;
+    }
+    
+    // Only add printable characters and common JSON characters
+    if (currentByte >= 32 && currentByte <= 126) {
+      nfcJsonData += (char)currentByte;
+      actualJsonLength++;
+    } else {
+      Serial.print("Skipping non-printable byte at position ");
+      Serial.print(i);
+      Serial.print(": 0x");
+      Serial.println(currentByte, HEX);
+    }
+    
+    // Check if we've reached the end of a JSON object
+    if (currentByte == '}') {
+      // Count opening and closing braces to detect complete JSON
+      int braceCount = 0;
+      for (uint32_t j = 0; j <= i; j++) {
+        if (ndefRecord[payloadOffset + j] == '{') braceCount++;
+        else if (ndefRecord[payloadOffset + j] == '}') braceCount--;
+      }
+      
+      if (braceCount == 0) {
+        Serial.print("Found complete JSON object at position: ");
+        Serial.println(i);
+        actualJsonLength = i + 1;
+        break;
+      }
+    }
   }
 
+  Serial.print("Actual JSON length extracted: ");
+  Serial.println(actualJsonLength);
+  Serial.print("Total nfcJsonData length: ");
+  Serial.println(nfcJsonData.length());
+  Serial.println("=== DECODED JSON DATA START ===");
+  Serial.println(nfcJsonData);
+  Serial.println("=== DECODED JSON DATA END ===");
+  
+  // Check if JSON was truncated
+  if (nfcJsonData.length() < payloadLength && !nfcJsonData.endsWith("}")) {
+    Serial.println("WARNING: JSON payload appears to be truncated!");
+    Serial.print("Expected payload length: ");
+    Serial.println(payloadLength);
+    Serial.print("Actual extracted length: ");
+    Serial.println(nfcJsonData.length());
+  }
+  
+  // Trim any trailing whitespace or invalid characters
+  nfcJsonData.trim();
+
   // 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,7 +400,7 @@ 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>());
@@ -255,6 +420,16 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
           oledShowProgressBar(1, 1, "Failure", "Scan spool first");
         }
       }
+      // Brand Filament not registered to Spoolman
+      else if ((!doc["sm_id"].is<String>() || (doc["sm_id"].is<String>() && (doc["sm_id"] == "0" || doc["sm_id"] == "")))
+              && doc["brand"].is<String>() && doc["artnr"].is<String>())
+      {
+        doc["sm_id"] = "0"; // Ensure sm_id is set to 0
+        // If no sm_id is present but the brand is Brand Filament then
+        // create a new spool, maybe brand too, in Spoolman
+        Serial.println("New Brand Filament Tag found!");
+        createBrandFilament(doc, uidString);
+      }
       else 
       {
         Serial.println("Keine SPOOL-ID gefunden.");
@@ -375,6 +550,9 @@ void writeJsonToTag(void *parameter) {
   nfcReadingTaskSuspendRequest = false;
   pauseBambuMqttTask = false;
 
+  free(params->payload);
+  delete params;
+
   vTaskDelete(NULL);
 }
 
@@ -431,7 +609,19 @@ void scanRfidTask(void * parameter) {
 
         oledShowProgressBar(0, octoEnabled?5:4, "Reading", "Detecting tag");
 
-        //vTaskDelay(500 / portTICK_PERIOD_MS);
+        // Wait 1 second after tag detection to stabilize connection
+        Serial.println("Tag detected, waiting 1 second for stabilization...");
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
+
+        // create Tag UID string
+        String uidString = "";
+        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
+          }
+        }
         
         if (uidLength == 7)
         {
@@ -444,25 +634,35 @@ void scanRfidTask(void * parameter) {
 
             // We probably have an NTAG2xx card (though it could be Ultralight as well)
             Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
+            Serial.print("Tag size: ");
+            Serial.print(tagSize);
+            Serial.println(" bytes");
             
             uint8_t numPages = readTagSize()/4;
+            
             for (uint8_t i = 4; i < 4+numPages; i++) {
+              
               if (!nfc.ntag2xx_ReadPage(i, data+(i-4) * 4))
               {
                 break; // Stop if reading fails
               }
+             
               // Check for NDEF message end
               if (data[(i - 4) * 4] == 0xFE) 
               {
+                Serial.println("Found NDEF message end marker");
                 break; // End of NDEF message
               }
 
               yield();
               esp_task_wdt_reset();
-              vTaskDelay(pdMS_TO_TICKS(1));
+              // Increased delay to ensure stable reading
+              vTaskDelay(pdMS_TO_TICKS(5)); // Increased from 1ms to 5ms
             }
             
-            if (!decodeNdefAndReturnJson(data)) 
+            Serial.println("Tag reading completed, starting NDEF decode...");
+            
+            if (!decodeNdefAndReturnJson(data, uidString)) 
             {
               oledShowProgressBar(1, 1, "Failure", "Unknown tag");
               nfcReaderState = NFC_READ_ERROR;
@@ -497,6 +697,18 @@ void scanRfidTask(void * parameter) {
         Serial.println("Tag entfernt");
         if (!bambuCredentials.autosend_enable) oledShowWeight(weight);
       }
+      // Reset state after successful read when tag is removed
+      else if (!success && nfcReaderState == NFC_READ_SUCCESS)
+      {
+        nfcReaderState = NFC_IDLE;
+        Serial.println("Tag nach erfolgreichem Lesen entfernt - bereit für nächsten Tag");
+      }
+
+      // Add a longer pause after successful reading to prevent immediate re-reading
+      if (nfcReaderState == NFC_READ_SUCCESS) {
+        Serial.println("Tag erfolgreich gelesen - warte 5 Sekunden vor nächstem Scan");
+        vTaskDelay(5000 / portTICK_PERIOD_MS); // 5 second pause
+      }
 
       // aktualisieren der Website wenn sich der Status ändert
       sendNfcData();

src/scale.cpp

@@ -48,7 +48,8 @@ void scale_loop(void * parameter) {
   Serial.println("Scale Loop started");
   Serial.println("++++++++++++++++++++++++++++++");
 
-  scale.tare();
+  vTaskDelay(pdMS_TO_TICKS(500));
+  scale_tare_counter = 10; // damit beim Starten der Waage automatisch getart wird
   
   for(;;) {
     if (scale.is_ready()) 

src/website.cpp

@@ -48,9 +48,15 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
     } else if (type == WS_EVT_PONG) {
         Serial.printf("WebSocket Client #%u pong\n", client->id());
     } else if (type == WS_EVT_DATA) {
-        String message = String((char*)data);
         JsonDocument doc;
-        deserializeJson(doc, message);
+        DeserializationError error = deserializeJson(doc, (char*)data, len);
+        //String message = String((char*)data);
+        //deserializeJson(doc, message);
+
+        if (error) {
+            Serial.println("JSON deserialization failed: " + String(error.c_str()));
+            return;
+        }
 
         if (doc["type"] == "heartbeat") {
             // Sende Heartbeat-Antwort