|
|
|
@@ -5,21 +5,10 @@
|
|
|
|
|
#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;
|
|
|
|
@@ -121,7 +110,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 +140,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();
|
|
|
|
@@ -169,7 +158,8 @@ void sendToApi(void *parameter) {
|
|
|
|
|
//oledShowMessage("Remaining: " + String(remaining_weight) + "g");
|
|
|
|
|
if(!octoEnabled){
|
|
|
|
|
// TBD: Do not use Strings...
|
|
|
|
|
oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
|
|
|
|
//oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
|
|
|
|
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
|
|
|
|
|
remainingWeight = 0;
|
|
|
|
|
}else{
|
|
|
|
|
// ocoto is enabled, trigger octo update
|
|
|
|
@@ -184,7 +174,8 @@ void sendToApi(void *parameter) {
|
|
|
|
|
break;
|
|
|
|
|
case API_REQUEST_OCTO_SPOOL_UPDATE:
|
|
|
|
|
// TBD: Do not use Strings...
|
|
|
|
|
oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
|
|
|
|
//oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
|
|
|
|
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
|
|
|
|
|
remainingWeight = 0;
|
|
|
|
|
break;
|
|
|
|
|
case API_REQUEST_VENDOR_CREATE:
|
|
|
|
@@ -345,9 +336,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();
|
|
|
|
@@ -614,9 +604,12 @@ bool updateSpoolBambuData(String payload) {
|
|
|
|
|
|
|
|
|
|
// #### Brand Filament
|
|
|
|
|
uint16_t createVendor(String vendor) {
|
|
|
|
|
oledShowProgressBar(2, 5, "New Brand", "Create new 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: ");
|
|
|
|
@@ -626,7 +619,6 @@ uint16_t createVendor(String vendor) {
|
|
|
|
|
JsonDocument vendorDoc;
|
|
|
|
|
vendorDoc["name"] = vendor;
|
|
|
|
|
vendorDoc["comment"] = "automatically generated";
|
|
|
|
|
vendorDoc["empty_spool_weight"] = 180;
|
|
|
|
|
vendorDoc["external_id"] = vendor;
|
|
|
|
|
|
|
|
|
|
String vendorPayload;
|
|
|
|
@@ -645,19 +637,18 @@ 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
|
|
|
|
|
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!");
|
|
|
|
|
// 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;
|
|
|
|
@@ -665,20 +656,28 @@ uint16_t createVendor(String vendor) {
|
|
|
|
|
|
|
|
|
|
vendorDoc.clear();
|
|
|
|
|
|
|
|
|
|
// Delay for Display Bar
|
|
|
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
|
|
|
|
|
|
|
|
// 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t checkVendor(String vendor) {
|
|
|
|
|
oledShowProgressBar(1, 5, "New Brand", "Check 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,25 +692,25 @@ uint16_t checkVendor(String vendor) {
|
|
|
|
|
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;
|
|
|
|
|
while (spoolmanApiState != API_IDLE)
|
|
|
|
|
{
|
|
|
|
|
vTaskDelay(100 / portTICK_PERIOD_MS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Wait for task completion
|
|
|
|
|
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
|
|
|
|
@@ -734,9 +733,12 @@ uint16_t checkVendor(String vendor) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
|
|
|
|
|
oledShowProgressBar(4, 5, "New Brand", "Create Filament");
|
|
|
|
|
|
|
|
|
|
// 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,34 +746,34 @@ 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["cn"].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["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>() : "";
|
|
|
|
|
|
|
|
|
|
if (payload["artnr"].is<String>())
|
|
|
|
|
filamentDoc["material"] = payload["t"].as<String>();
|
|
|
|
|
filamentDoc["density"] = (payload["de"].is<String>() && payload["de"].as<String>().length() > 0) ? payload["de"].as<String>() : "1.24";
|
|
|
|
|
filamentDoc["diameter"] = (payload["di"].is<String>() && payload["di"].as<String>().length() > 0) ? payload["di"].as<String>() : "1.75";
|
|
|
|
|
filamentDoc["weight"] = String(weight);
|
|
|
|
|
filamentDoc["spool_weight"] = payload["sw"].as<String>();
|
|
|
|
|
filamentDoc["article_number"] = payload["an"].as<String>();
|
|
|
|
|
filamentDoc["settings_extruder_temp"] = payload["et"].is<String>() ? payload["et"].as<String>() : "";
|
|
|
|
|
filamentDoc["settings_bed_temp"] = payload["bt"].is<String>() ? payload["bt"].as<String>() : "";
|
|
|
|
|
|
|
|
|
|
if (payload["an"].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";
|
|
|
|
|
filamentDoc["external_id"] = payload["an"].as<String>();
|
|
|
|
|
filamentDoc["comment"] = payload["u"].is<String>() ? payload["u"].as<String>() + payload["an"].as<String>() : "automatically generated";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
filamentDoc["comment"] = payload["url"].is<String>() ? payload["url"].as<String>() : "automatically generated";
|
|
|
|
|
filamentDoc["comment"] = payload["u"].is<String>() ? payload["u"].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>() : "";
|
|
|
|
|
if (payload["mc"].is<String>()) {
|
|
|
|
|
filamentDoc["multi_color_hexes"] = payload["mc"].as<String>();
|
|
|
|
|
filamentDoc["multi_color_direction"] = payload["mcd"].is<String>() ? payload["mcd"].as<String>() : "";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
filamentDoc["color_hex"] = (payload["color"].is<String>() && payload["color"].as<String>().length() >= 6) ? payload["color"].as<String>() : "FFFFFF";
|
|
|
|
|
filamentDoc["color_hex"] = (payload["c"].is<String>() && payload["c"].as<String>().length() >= 6) ? payload["c"].as<String>() : "FFFFFF";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String filamentPayload;
|
|
|
|
@@ -790,19 +792,18 @@ 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
|
|
|
|
|
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!");
|
|
|
|
|
// 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;
|
|
|
|
@@ -810,18 +811,23 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
|
|
|
|
|
|
|
|
|
|
filamentDoc.clear();
|
|
|
|
|
|
|
|
|
|
// Delay for Display Bar
|
|
|
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
|
|
|
|
|
|
|
|
// 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
|
|
|
|
|
oledShowProgressBar(3, 5, "New Brand", "Check Filament");
|
|
|
|
|
|
|
|
|
|
// 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,26 +843,19 @@ 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
|
|
|
|
|
"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;
|
|
|
|
|
}
|
|
|
|
|
// 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 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
|
|
|
|
@@ -879,25 +878,24 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& payload, String uidString) {
|
|
|
|
|
oledShowProgressBar(5, 5, "New Brand", "Create new Spool");
|
|
|
|
|
|
|
|
|
|
// 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();
|
|
|
|
|
|
|
|
|
|
// 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["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["initial_weight"] = weight > 10 ? String(weight - payload["sw"].as<int>()) : "1000";
|
|
|
|
|
spoolDoc["spool_weight"] = (payload["sw"].is<String>() && payload["sw"].as<String>().length() > 0) ? payload["sw"].as<String>() : "180";
|
|
|
|
|
spoolDoc["remaining_weight"] = spoolDoc["initial_weight"];
|
|
|
|
|
spoolDoc["lot_nr"] = (payload["an"].is<String>() && payload["an"].as<String>().length() > 0) ? payload["an"].as<String>() : "";
|
|
|
|
|
spoolDoc["comment"] = "automatically generated";
|
|
|
|
|
spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\"";
|
|
|
|
|
|
|
|
|
@@ -918,42 +916,57 @@ 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
|
|
|
|
|
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!");
|
|
|
|
|
// 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(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
|
|
|
|
|
optimizedPayload["b"] = payload["b"].as<String>();
|
|
|
|
|
optimizedPayload["cn"] = payload["an"].as<String>();
|
|
|
|
|
|
|
|
|
|
String payloadString;
|
|
|
|
|
serializeJson(payload, payloadString);
|
|
|
|
|
serializeJson(optimizedPayload, payloadString);
|
|
|
|
|
|
|
|
|
|
Serial.println("Optimized JSON with sm_id first:");
|
|
|
|
|
Serial.println(payloadString);
|
|
|
|
|
|
|
|
|
|
optimizedPayload.clear();
|
|
|
|
|
|
|
|
|
|
nfcReaderState = NFC_IDLE;
|
|
|
|
|
|
|
|
|
|
// Delay for Display Bar
|
|
|
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
|
|
|
|
|
|
|
|
startWriteJsonToTag(true, payloadString.c_str());
|
|
|
|
|
|
|
|
|
|
return createdSpoolId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool createBrandFilament(JsonDocument& payload, String uidString) {
|
|
|
|
|
uint16_t vendorId = checkVendor(payload["brand"].as<String>());
|
|
|
|
|
uint16_t vendorId = checkVendor(payload["b"].as<String>());
|
|
|
|
|
if (vendorId == 0) {
|
|
|
|
|
Serial.println("ERROR: Failed to create/find vendor");
|
|
|
|
|
return false;
|
|
|
|
|