docs: update changelog and header for version v1.5.12-beta15

CHANGELOG.md

@@ -1,5 +1,105 @@
 # Changelog
 
+## [1.5.12-beta15] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta15
+- enhance NFC write operation diagnostics and improve error handling
+- enhance NFC write operation handling and prevent tag operations during write
+
+
+## [1.5.12-beta14] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta14
+- optimize JSON payload structure and enhance NFC tag validation process
+
+
+## [1.5.12-beta13] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta13
+- reorganize clearUserDataArea function for improved clarity and safety
+
+
+## [1.5.12-beta12] - 2025-08-29
+### Changed
+- update platformio.ini for beta version v1.5.12-beta12
+
+### Fixed
+- reset NFC state on API send failure to allow retry
+- update createdFilamentId reset value to 65535 for better task handling
+- update createdVendorId reset value to 65535 for improved API handling
+
+
+## [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

platformio.ini

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

src/api.cpp

@@ -5,6 +5,7 @@
 #include <Preferences.h>
 #include "debug.h"
 #include "scale.h"
+#include "nfc.h"
 #include <time.h>
 volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
 
@@ -121,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;
@@ -151,7 +152,7 @@ void sendToApi(void *parameter) {
     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();
@@ -345,9 +346,8 @@ void sendToApi(void *parameter) {
             break;
         }
         Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
-
-        // TBD: really required?
         vTaskDelay(2000 / portTICK_PERIOD_MS);
+        nfcReaderState = NFC_IDLE; // Reset NFC state to allow retry
     }
 
     http.end();
@@ -616,7 +616,8 @@ bool updateSpoolBambuData(String payload) {
 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
+    // 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: ");
@@ -645,9 +646,7 @@ uint16_t createVendor(String vendor) {
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = vendorPayload;
 
-    // Check if API is idle before creating task
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
+    // Create task without additional API state check since caller ensures synchronization
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
@@ -656,8 +655,9 @@ uint16_t createVendor(String vendor) {
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
     );
-    } else {
-        Serial.println("Not spawning new task, API still active!");
+
+    if (result != pdPASS) {
+        Serial.println("Failed to create vendor task!");
         delete params;
         vendorDoc.clear();
         return 0;
@@ -667,8 +667,8 @@ uint16_t createVendor(String vendor) {
     
     // 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);
+    while(createdVendorId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
     }
     
     return createdVendorId;
@@ -676,9 +676,12 @@ uint16_t createVendor(String vendor) {
 
 uint16_t checkVendor(String vendor) {
     // Check if vendor exists using task system
-    foundVendorId = 0; // Reset previous value
+    foundVendorId = 65535; // Reset to invalid value to detect when API response is received
     
-    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendor;
+    String vendorName = vendor;
+    vendorName.trim();
+    vendorName.replace(" ", "+");
+    String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendorName;
     Serial.print("Check vendor with URL: ");
     Serial.println(spoolsUrl);
 
@@ -693,7 +696,11 @@ uint16_t checkVendor(String vendor) {
     params->updatePayload = ""; // Empty for GET request
 
     // Check if API is idle before creating task
-    if(spoolmanApiState == API_IDLE){
+    while (spoolmanApiState != API_IDLE)
+    {
+        vTaskDelay(100 / portTICK_PERIOD_MS);
+    }
+    
     // Erstelle die Task
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
@@ -703,15 +710,11 @@ uint16_t checkVendor(String vendor) {
         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);
+    // 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
@@ -736,7 +739,8 @@ uint16_t checkVendor(String vendor) {
 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
-    createdFilamentId = 0; // Reset previous value
+    // 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: ");
@@ -744,16 +748,16 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 
     // Create JSON payload for filament creation
     JsonDocument filamentDoc;
-    filamentDoc["name"] = payload["name"].as<String>();
+    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"] = payload["weight"].as<String>();
+    filamentDoc["weight"] = String(weight);
     filamentDoc["spool_weight"] = payload["spool_weight"].as<String>();
     filamentDoc["article_number"] = payload["artnr"].as<String>();
-    filamentDoc["extruder_temp"] = payload["extruder_temp"].is<String>() ? payload["extruder_temp"].as<String>() : "";
-    filamentDoc["bed_temp"] = payload["bed_temp"].is<String>() ? payload["bed_temp"].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>())
     {
@@ -771,7 +775,7 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
     }
     else
     {
-        filamentDoc["color_hex"] = (payload["color"].is<String>() && payload["color"].as<String>().length() >= 6) ? payload["color"].as<String>() : "FFFFFF";
+        filamentDoc["color_hex"] = (payload["color_hex"].is<String>() && payload["color_hex"].as<String>().length() >= 6) ? payload["color_hex"].as<String>() : "FFFFFF";
     }
 
     String filamentPayload;
@@ -790,9 +794,7 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = filamentPayload;
 
-    // Check if API is idle before creating task
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
+    // Create task without additional API state check since caller ensures synchronization
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
@@ -801,8 +803,9 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
     );
-    } else {
-        Serial.println("Not spawning new task, API still active!");
+
+    if (result != pdPASS) {
+        Serial.println("Failed to create filament task!");
         delete params;
         filamentDoc.clear();
         return 0;
@@ -812,8 +815,8 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
     
     // Wait for task completion and return the created filament ID
     // Note: createdFilamentId will be set by sendToApi when response is received
-    while(spoolmanApiState != API_IDLE) {
-        vTaskDelay(100 / portTICK_PERIOD_MS);
+    while(createdFilamentId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
     }
     
     return createdFilamentId;
@@ -821,7 +824,7 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 
 uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
     // Check if filament exists using task system
-    foundFilamentId = 0; // Reset previous value
+    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: ");
@@ -837,8 +840,6 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
     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
@@ -848,15 +849,10 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
         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);
+    // 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
@@ -881,22 +877,22 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 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
-    createdSpoolId = 0; // Reset previous value
+    // 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();
+    //String currentDate = getCurrentDateISO8601();
 
     // Create JSON payload for spool creation
     JsonDocument spoolDoc;
-    spoolDoc["first_used"] = String(currentDate);
-    spoolDoc["last_used"] = String(currentDate);
+    //spoolDoc["first_used"] = String(currentDate);
+    //spoolDoc["last_used"] = String(currentDate);
     spoolDoc["filament_id"] = String(filamentId);
-    spoolDoc["initial_weight"] = weight > 10 ? String(weight) : "1000";
+    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["used_weight"] = "0";
     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 + "\"";
@@ -918,9 +914,7 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = spoolPayload;
 
-    // Check if API is idle before creating task
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
+    // Create task without additional API state check since caller ensures synchronization
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
@@ -929,24 +923,43 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
         0,                        // Priorität
         NULL                      // Task-Handle (nicht benötigt)
     );
-    } else {
-        Serial.println("Not spawning new task, API still active!");
+
+    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(spoolmanApiState != API_IDLE) {
-        vTaskDelay(100 / portTICK_PERIOD_MS);
+    while(createdSpoolId == 65535) {
+        vTaskDelay(50 / portTICK_PERIOD_MS);
     }
 
-    // daten mit startWriteJsonToTag schreiben
+    // Write data to tag with startWriteJsonToTag
     // void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
-    payload["sm_id"].set(String(createdSpoolId));
+    
+    // Create optimized JSON structure with sm_id at the beginning for fast-path detection
+    JsonDocument optimizedPayload;
+    optimizedPayload["sm_id"] = String(createdSpoolId);  // Place sm_id first for fast scanning
+    
+    // Copy all other fields from original payload (excluding sm_id if it exists)
+    for (JsonPair kv : payload.as<JsonObject>()) {
+        if (strcmp(kv.key().c_str(), "sm_id") != 0) {  // Skip sm_id to avoid duplication
+            optimizedPayload[kv.key()] = kv.value();
+        }
+    }
     
     String payloadString;
-    serializeJson(payload, payloadString);
+    serializeJson(optimizedPayload, payloadString);
+    
+    Serial.println("Optimized JSON with sm_id first:");
+    Serial.println(payloadString);
+    
+    optimizedPayload.clear();
+    
+    nfcReaderState = NFC_IDLE;
+    vTaskDelay(50 / portTICK_PERIOD_MS);
     startWriteJsonToTag(true, payloadString.c_str());
 
     return createdSpoolId;

src/nfc.h

@@ -16,6 +16,7 @@ typedef enum{
 void startNfc();
 void scanRfidTask(void * parameter);
 void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
+bool quickSpoolIdCheck(String uidString);
 
 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
@@ -23,6 +24,7 @@ extern String activeSpoolId;
 extern String lastSpoolId;
 extern volatile nfcReaderStateType nfcReaderState;
 extern volatile bool pauseBambuMqttTask;
+extern volatile bool nfcWriteInProgress;
 extern bool tagProcessed;
 
 

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