Compare commits

..

45 Commits

Author SHA1 Message Date
213b9c099c docs: update changelog and header for version v1.5.12-beta17
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m41s
2025-08-29 17:32:46 +02:00
687e57b77a docs: update platformio.ini for beta version v1.5.12-beta17 2025-08-29 17:32:46 +02:00
aea11e0c06 fix: update vendor check to use shorthand key in payload 2025-08-29 17:31:25 +02:00
bd8f4606c6 feat: add progress bar updates for vendor and filament creation processes 2025-08-29 17:30:04 +02:00
ac91e71c14 refactor: optimize page limit detection and remove redundant verification code 2025-08-29 17:20:44 +02:00
0d3503f4f1 docs: update changelog and header for version v1.5.12-beta16
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m4s
2025-08-29 17:04:41 +02:00
1460c6e5f9 docs: update platformio.ini for beta version v1.5.12-beta16 2025-08-29 17:04:41 +02:00
fef7e5aa4b Refactor NFC interface handling and improve error diagnostics
- Removed unused function for getting current date in ISO8601 format.
- Updated JSON key names in filament and spool creation to use shorter identifiers.
- Enhanced NFC interface reset procedure with detailed logging and retry mechanisms.
- Improved stability checks after write operations to ensure NFC interface readiness.
- Added comprehensive error handling and diagnostics for NFC read/write operations.
- Streamlined the quick spool ID check to optimize performance and reliability.
2025-08-29 17:04:33 +02:00
bda8c3dd98 docs: update changelog and header for version v1.5.12-beta15
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m10s
2025-08-29 16:02:57 +02:00
8702469020 docs: update platformio.ini for beta version v1.5.12-beta15 2025-08-29 16:02:56 +02:00
2a0f999f3b refactor: enhance NFC write operation diagnostics and improve error handling 2025-08-29 16:02:51 +02:00
c89adb6256 refactor: enhance NFC write operation handling and prevent tag operations during write 2025-08-29 15:52:16 +02:00
1f21954703 docs: update changelog and header for version v1.5.12-beta14
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m19s
2025-08-29 15:33:13 +02:00
3e59ce1366 docs: update platformio.ini for beta version v1.5.12-beta14 2025-08-29 15:33:13 +02:00
1f880fc8f1 refactor: optimize JSON payload structure and enhance NFC tag validation process 2025-08-29 15:33:06 +02:00
69bf5f90fa docs: update changelog and header for version v1.5.12-beta13
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-08-29 14:17:15 +02:00
382caeaced docs: update platformio.ini for beta version v1.5.12-beta13 2025-08-29 14:17:15 +02:00
47bdf022ec refactor: reorganize clearUserDataArea function for improved clarity and safety 2025-08-29 14:17:10 +02:00
02febfa943 docs: update changelog and header for version v1.5.12-beta12
Some checks failed
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m18s
2025-08-29 14:10:56 +02:00
257f4df800 docs: update platformio.ini for beta version v1.5.12-beta12 2025-08-29 14:10:56 +02:00
bff6e72219 fix: reset NFC state on API send failure to allow retry 2025-08-29 14:10:49 +02:00
26e905050d fix: update createdFilamentId reset value to 65535 for better task handling 2025-08-29 13:40:29 +02:00
046f770a52 fix: update createdVendorId reset value to 65535 for improved API handling 2025-08-29 13:29:07 +02:00
2587227e78 docs: update changelog and header for version v1.5.12-beta11
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-08-29 13:19:22 +02:00
0f19dc4f46 docs: update platformio.ini for beta version v1.5.12-beta11 2025-08-29 13:19:21 +02:00
721dac1ead fix: update spoolman ID reset values to 65535 for better API response detection 2025-08-29 13:19:17 +02:00
08abd1a37f docs: update changelog and header for version v1.5.12-beta10
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m32s
2025-08-29 13:09:26 +02:00
da78861613 docs: update platformio.ini for beta version v1.5.12-beta10 2025-08-29 13:09:25 +02:00
9231a303f3 refactor: streamline task creation in checkVendor and checkFilament functions 2025-08-29 13:09:17 +02:00
d12e766cd7 docs: update changelog and header for version v1.5.12-beta9
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-08-29 12:56:07 +02:00
af7bc23703 docs: update platformio.ini for beta version v1.5.12-beta9 2025-08-29 12:56:07 +02:00
de39892f64 fix: update vendor and filament ID handling to use NULL and add delays for stability 2025-08-29 12:55:51 +02:00
40cb835e51 docs: update changelog and header for version v1.5.12-beta8
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m31s
2025-08-29 11:03:11 +02:00
eb9d9e74f4 docs: update platformio.ini for beta version v1.5.12-beta8 2025-08-29 11:03:11 +02:00
d8af3f45e5 fix: correct color_hex key usage and comment out unused date fields in spool creation 2025-08-29 11:03:05 +02:00
96bb8f9c7c fix: add delay to ensure proper setting of vendor and filament IDs after API state changes 2025-08-29 10:58:06 +02:00
b8b6893cd0 docs: update changelog and header for version v1.5.12-beta7
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m40s
2025-08-29 10:32:32 +02:00
0a246c1fe4 docs: update platformio.ini for beta version v1.5.12-beta7 2025-08-29 10:32:31 +02:00
965ea5da1e fix: improve API state handling and vendor name formatting 2025-08-29 10:31:26 +02:00
b8b6f637f2 docs: update changelog and header for version v1.5.12-beta6
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m18s
2025-08-29 10:02:54 +02:00
12044b657b docs: update platformio.ini for beta version v1.5.12-beta6 2025-08-29 10:02:54 +02:00
95433b4842 refactor: improve task synchronization in vendor, filament, and spool creation functions 2025-08-29 10:02:48 +02:00
54275f2ac9 docs: update changelog and header for version v1.5.12-beta5
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-08-29 09:46:14 +02:00
fbd9cb66f1 docs: update platformio.ini for beta version v1.5.12-beta5 2025-08-29 09:46:14 +02:00
f1cdd3f41d feat: enhance NDEF decoding with detailed validation and debugging output 2025-08-29 09:46:08 +02:00
7 changed files with 1603 additions and 233 deletions

View File

@@ -1,5 +1,107 @@
# Changelog
## [1.5.12-beta17] - 2025-08-29
### Added
- add progress bar updates for vendor and filament creation processes
### Changed
- update platformio.ini for beta version v1.5.12-beta17
- optimize page limit detection and remove redundant verification code
### Fixed
- update vendor check to use shorthand key in payload
## [1.5.12-beta16] - 2025-08-29
### Changed
- update platformio.ini for beta version v1.5.12-beta16
- Refactor NFC interface handling and improve error diagnostics
## [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

View File

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

View File

@@ -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();
@@ -345,9 +334,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 +602,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 +617,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 +635,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;
@@ -667,18 +656,23 @@ 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;
}
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 +687,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 +728,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 +741,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 +787,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;
@@ -812,16 +808,18 @@ 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;
}
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 +835,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 +870,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 +908,54 @@ 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;
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>());
uint16_t vendorId = checkVendor(payload["b"].as<String>());
if (vendorId == 0) {
Serial.println("ERROR: Failed to create/find vendor");
return false;

View File

@@ -235,7 +235,7 @@ void oledShowIcon(const char* icon) {
display.display();
}
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage){
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage) {
assert(step <= numSteps);
// clear data and bar area

File diff suppressed because it is too large Load Diff

View File

@@ -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;

View File

@@ -48,8 +48,9 @@ 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())
{