diff --git a/src/api.cpp b/src/api.cpp index 843e71e..7584d60 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -676,7 +676,7 @@ uint16_t createVendor(String vendor) { uint16_t checkVendor(String vendor) { // Check if vendor exists using task system - foundVendorId = 0; // Reset previous value + foundVendorId = NULL; // Reset previous value String vendorName = vendor; vendorName.trim(); @@ -696,7 +696,13 @@ 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); + } + + + if(spoolmanApiState == API_IDLE) { // Erstelle die Task BaseType_t result = xTaskCreate( sendToApi, // Task-Funktion @@ -718,7 +724,10 @@ uint16_t checkVendor(String vendor) { } // Additional delay to ensure foundVendorId is properly set after API state becomes IDLE - vTaskDelay(50 / portTICK_PERIOD_MS); + while (foundVendorId == NULL) + { + vTaskDelay(50 / portTICK_PERIOD_MS); + } // Check if vendor was found if (foundVendorId == 0) { @@ -827,7 +836,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 = NULL; // Reset previous value String spoolsUrl = spoolmanUrl + apiUrl + "/filament?vendor.id=" + String(vendorId) + "&external_id=" + String(payload["artnr"].as()); Serial.print("Check filament with URL: "); @@ -844,7 +853,7 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) { params->updatePayload = ""; // Empty for GET request // Check if API is idle before creating task - if(spoolmanApiState == API_IDLE){ + //if(spoolmanApiState == API_IDLE){ // Erstelle die Task BaseType_t result = xTaskCreate( sendToApi, // Task-Funktion @@ -854,11 +863,11 @@ 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; - } + //} else { + // Serial.println("Not spawning new task, API still active!"); + // delete params; + // return 0; + //} // Wait for task completion while(spoolmanApiState != API_IDLE) { @@ -866,7 +875,9 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) { } // Additional delay to ensure foundFilamentId is properly set after API state becomes IDLE - vTaskDelay(50 / portTICK_PERIOD_MS); + while (foundFilamentId == NULL) { + vTaskDelay(50 / portTICK_PERIOD_MS); + } // Check if filament was found if (foundFilamentId == 0) { @@ -891,22 +902,21 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo // 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 + createdSpoolId = NULL; // Reset previous value 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["filament_id"] = String(filamentId); - spoolDoc["initial_weight"] = weight > 10 ? String(weight) : "1000"; + spoolDoc["initial_weight"] = weight > 10 ? String(weight-payload["spool_weight"].as()) : "1000"; spoolDoc["spool_weight"] = (payload["spool_weight"].is() && payload["spool_weight"].as().length() > 0) ? payload["spool_weight"].as() : "180"; spoolDoc["remaining_weight"] = (payload["weight"].is() && payload["weight"].as().length() > 0) ? payload["weight"].as() : "1000"; - spoolDoc["used_weight"] = "0"; spoolDoc["lot_nr"] = (payload["lotnr"].is() && payload["lotnr"].as().length() > 0) ? payload["lotnr"].as() : ""; spoolDoc["comment"] = "automatically generated"; spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\""; @@ -946,8 +956,8 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo // 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 == NULL) { + vTaskDelay(50 / portTICK_PERIOD_MS); } // Write data to tag with startWriteJsonToTag @@ -956,6 +966,9 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo String payloadString; serializeJson(payload, payloadString); + + nfcReaderState = NFC_IDLE; + vTaskDelay(50 / portTICK_PERIOD_MS); startWriteJsonToTag(true, payloadString.c_str()); return createdSpoolId; diff --git a/src/nfc.cpp b/src/nfc.cpp index c942998..f6223f5 100644 --- a/src/nfc.cpp +++ b/src/nfc.cpp @@ -364,8 +364,20 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) { Serial.print("Actual JSON length extracted: "); Serial.println(actualJsonLength); - Serial.println("Decoded JSON Data:"); + 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(); @@ -597,7 +609,9 @@ 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 = ""; @@ -620,24 +634,34 @@ 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 } - + + Serial.println("Tag reading completed, starting NDEF decode..."); + if (!decodeNdefAndReturnJson(data, uidString)) { oledShowProgressBar(1, 1, "Failure", "Unknown tag"); diff --git a/src/scale.cpp b/src/scale.cpp index 91b7ea3..c16ff3b 100644 --- a/src/scale.cpp +++ b/src/scale.cpp @@ -49,8 +49,7 @@ void scale_loop(void * parameter) { Serial.println("++++++++++++++++++++++++++++++"); vTaskDelay(pdMS_TO_TICKS(500)); - scale.tare(); - vTaskDelay(pdMS_TO_TICKS(500)); + scale_tare_counter = 10; // damit beim Starten der Waage automatisch getart wird for(;;) { if (scale.is_ready())