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

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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

platformio.ini

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

src/api.cpp

@@ -121,7 +121,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;
@@ -616,6 +616,7 @@ 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
+    // Note: This function assumes that the caller has already ensured API is IDLE
     createdVendorId = 0; // Reset previous value
     
     String spoolsUrl = spoolmanUrl + apiUrl + "/vendor";
@@ -645,9 +646,7 @@ uint16_t createVendor(String vendor) {
     params->spoolsUrl = spoolsUrl;
     params->updatePayload = vendorPayload;
 
-    // Check if API is idle before creating task
+    // Create task without additional API state check since caller ensures synchronization
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
     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;
@@ -678,7 +678,10 @@ uint16_t checkVendor(String vendor) {
     // Check if vendor exists using task system
     foundVendorId = 0; // Reset previous value
     
-    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);
 
@@ -736,6 +739,7 @@ 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
+    // Note: This function assumes that the caller has already ensured API is IDLE
     createdFilamentId = 0; // Reset previous value
     
     String spoolsUrl = spoolmanUrl + apiUrl + "/filament";
@@ -749,7 +753,7 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
     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>() : "";
@@ -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
+    // Create task without additional API state check since caller ensures synchronization
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
     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;
@@ -881,6 +884,7 @@ 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
+    // Note: This function assumes that the caller has already ensured API is IDLE
     createdSpoolId = 0; // Reset previous value
     
     String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
@@ -918,9 +922,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
+    // Create task without additional API state check since caller ensures synchronization
-    if(spoolmanApiState == API_IDLE){
-        // Erstelle die Task
     BaseType_t result = xTaskCreate(
         sendToApi,                // Task-Funktion
         "SendToApiTask",          // Task-Name
@@ -929,8 +931,9 @@ 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;
     }
@@ -941,7 +944,7 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
         vTaskDelay(100 / 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));
     

src/scale.cpp

@@ -48,7 +48,9 @@ void scale_loop(void * parameter) {
   Serial.println("Scale Loop started");
   Serial.println("++++++++++++++++++++++++++++++");
 
+  vTaskDelay(pdMS_TO_TICKS(500));
   scale.tare();
+  vTaskDelay(pdMS_TO_TICKS(500));
   
   for(;;) {
     if (scale.is_ready())