Compare commits
	
		
			22 Commits
		
	
	
		
			v1.5.12-be
			...
			v1.5.12-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d9a8388ac7 | |||
| cb77112976 | |||
| 1c0ddb52ba | |||
| 17f03e9472 | |||
| 213b9c099c | |||
| 687e57b77a | |||
| aea11e0c06 | |||
| bd8f4606c6 | |||
| ac91e71c14 | |||
| 0d3503f4f1 | |||
| 1460c6e5f9 | |||
| fef7e5aa4b | |||
| bda8c3dd98 | |||
| 8702469020 | |||
| 2a0f999f3b | |||
| c89adb6256 | |||
| 1f21954703 | |||
| 3e59ce1366 | |||
| 1f880fc8f1 | |||
| 69bf5f90fa | |||
| 382caeaced | |||
| 47bdf022ec | 
							
								
								
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,53 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.5.12-beta18] - 2025-08-29
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					- add display delay for vendor, filament, and spool creation processes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update platformio.ini for beta version v1.5.12-beta18
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					- replace progress bar with message display for remaining weight in sendToApi function
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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
 | 
					## [1.5.12-beta12] - 2025-08-29
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
- update platformio.ini for beta version v1.5.12-beta12
 | 
					- update platformio.ini for beta version v1.5.12-beta12
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.5.12-beta12"
 | 
					version = "1.5.12-beta18"
 | 
				
			||||||
to_old_version = "1.5.0"
 | 
					to_old_version = "1.5.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
##
 | 
					##
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										99
									
								
								src/api.cpp
									
									
									
									
									
								
							
							
						
						
									
										99
									
								
								src/api.cpp
									
									
									
									
									
								
							@@ -9,18 +9,6 @@
 | 
				
			|||||||
#include <time.h>
 | 
					#include <time.h>
 | 
				
			||||||
volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
 | 
					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;
 | 
					//bool spoolman_connected = false;
 | 
				
			||||||
String spoolmanUrl = "";
 | 
					String spoolmanUrl = "";
 | 
				
			||||||
bool octoEnabled = false;
 | 
					bool octoEnabled = false;
 | 
				
			||||||
@@ -170,7 +158,8 @@ void sendToApi(void *parameter) {
 | 
				
			|||||||
                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
 | 
					                //oledShowMessage("Remaining: " + String(remaining_weight) + "g");
 | 
				
			||||||
                if(!octoEnabled){
 | 
					                if(!octoEnabled){
 | 
				
			||||||
                    // TBD: Do not use Strings...
 | 
					                    // 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;
 | 
					                    remainingWeight = 0;
 | 
				
			||||||
                }else{
 | 
					                }else{
 | 
				
			||||||
                    // ocoto is enabled, trigger octo update
 | 
					                    // ocoto is enabled, trigger octo update
 | 
				
			||||||
@@ -185,7 +174,8 @@ void sendToApi(void *parameter) {
 | 
				
			|||||||
                break;
 | 
					                break;
 | 
				
			||||||
            case API_REQUEST_OCTO_SPOOL_UPDATE:
 | 
					            case API_REQUEST_OCTO_SPOOL_UPDATE:
 | 
				
			||||||
                // TBD: Do not use Strings...
 | 
					                // 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;
 | 
					                remainingWeight = 0;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
            case API_REQUEST_VENDOR_CREATE:
 | 
					            case API_REQUEST_VENDOR_CREATE:
 | 
				
			||||||
@@ -614,6 +604,8 @@ bool updateSpoolBambuData(String payload) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// #### Brand Filament
 | 
					// #### Brand Filament
 | 
				
			||||||
uint16_t createVendor(String vendor) {
 | 
					uint16_t createVendor(String vendor) {
 | 
				
			||||||
 | 
					    oledShowProgressBar(2, 5, "New Brand", "Create new Vendor");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Create new vendor in Spoolman database using task system
 | 
					    // Create new vendor in Spoolman database using task system
 | 
				
			||||||
    // Note: Due to async nature, the ID will be stored in createdVendorId global variable
 | 
					    // 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
 | 
					    // Note: This function assumes that the caller has already ensured API is IDLE
 | 
				
			||||||
@@ -627,7 +619,6 @@ uint16_t createVendor(String vendor) {
 | 
				
			|||||||
    JsonDocument vendorDoc;
 | 
					    JsonDocument vendorDoc;
 | 
				
			||||||
    vendorDoc["name"] = vendor;
 | 
					    vendorDoc["name"] = vendor;
 | 
				
			||||||
    vendorDoc["comment"] = "automatically generated";
 | 
					    vendorDoc["comment"] = "automatically generated";
 | 
				
			||||||
    vendorDoc["empty_spool_weight"] = 180;
 | 
					 | 
				
			||||||
    vendorDoc["external_id"] = vendor;
 | 
					    vendorDoc["external_id"] = vendor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    String vendorPayload;
 | 
					    String vendorPayload;
 | 
				
			||||||
@@ -665,6 +656,9 @@ uint16_t createVendor(String vendor) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    vendorDoc.clear();
 | 
					    vendorDoc.clear();
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 | 
					    // Delay for Display Bar
 | 
				
			||||||
 | 
					    vTaskDelay(1000 / portTICK_PERIOD_MS);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Wait for task completion and return the created vendor ID
 | 
					    // Wait for task completion and return the created vendor ID
 | 
				
			||||||
    // Note: createdVendorId will be set by sendToApi when response is received
 | 
					    // Note: createdVendorId will be set by sendToApi when response is received
 | 
				
			||||||
    while(createdVendorId == 65535) {
 | 
					    while(createdVendorId == 65535) {
 | 
				
			||||||
@@ -675,6 +669,8 @@ uint16_t createVendor(String vendor) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint16_t checkVendor(String vendor) {
 | 
					uint16_t checkVendor(String vendor) {
 | 
				
			||||||
 | 
					    oledShowProgressBar(1, 5, "New Brand", "Check Vendor");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Check if vendor exists using task system
 | 
					    // Check if vendor exists using task system
 | 
				
			||||||
    foundVendorId = 65535; // Reset to invalid value to detect when API response is received
 | 
					    foundVendorId = 65535; // Reset to invalid value to detect when API response is received
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
@@ -737,6 +733,8 @@ uint16_t checkVendor(String vendor) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
					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
 | 
					    // Create new filament in Spoolman database using task system
 | 
				
			||||||
    // Note: Due to async nature, the ID will be stored in createdFilamentId global variable
 | 
					    // 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
 | 
					    // Note: This function assumes that the caller has already ensured API is IDLE
 | 
				
			||||||
@@ -748,34 +746,34 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    // Create JSON payload for filament creation
 | 
					    // Create JSON payload for filament creation
 | 
				
			||||||
    JsonDocument filamentDoc;
 | 
					    JsonDocument filamentDoc;
 | 
				
			||||||
    filamentDoc["name"] = payload["color_name"].as<String>();
 | 
					    filamentDoc["name"] = payload["cn"].as<String>();
 | 
				
			||||||
    filamentDoc["vendor_id"] = String(vendorId);
 | 
					    filamentDoc["vendor_id"] = String(vendorId);
 | 
				
			||||||
    filamentDoc["material"] = payload["type"].as<String>();
 | 
					    filamentDoc["material"] = payload["t"].as<String>();
 | 
				
			||||||
    filamentDoc["density"] = (payload["density"].is<String>() && payload["density"].as<String>().length() > 0) ? payload["density"].as<String>() : "1.24";
 | 
					    filamentDoc["density"] = (payload["de"].is<String>() && payload["de"].as<String>().length() > 0) ? payload["de"].as<String>() : "1.24";
 | 
				
			||||||
    filamentDoc["diameter"] = (payload["diameter"].is<String>() && payload["diameter"].as<String>().length() > 0) ? payload["diameter"].as<String>() : "1.75";
 | 
					    filamentDoc["diameter"] = (payload["di"].is<String>() && payload["di"].as<String>().length() > 0) ? payload["di"].as<String>() : "1.75";
 | 
				
			||||||
    filamentDoc["weight"] = String(weight);
 | 
					    filamentDoc["weight"] = String(weight);
 | 
				
			||||||
    filamentDoc["spool_weight"] = payload["spool_weight"].as<String>();
 | 
					    filamentDoc["spool_weight"] = payload["sw"].as<String>();
 | 
				
			||||||
    filamentDoc["article_number"] = payload["artnr"].as<String>();
 | 
					    filamentDoc["article_number"] = payload["an"].as<String>();
 | 
				
			||||||
    filamentDoc["settings_extruder_temp"] = payload["extruder_temp"].is<String>() ? payload["extruder_temp"].as<String>() : "";
 | 
					    filamentDoc["settings_extruder_temp"] = payload["et"].is<String>() ? payload["et"].as<String>() : "";
 | 
				
			||||||
    filamentDoc["settings_bed_temp"] = payload["bed_temp"].is<String>() ? payload["bed_temp"].as<String>() : "";
 | 
					    filamentDoc["settings_bed_temp"] = payload["bt"].is<String>() ? payload["bt"].as<String>() : "";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (payload["artnr"].is<String>())
 | 
					    if (payload["an"].is<String>())
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        filamentDoc["external_id"] = payload["artnr"].as<String>();
 | 
					        filamentDoc["external_id"] = payload["an"].as<String>();
 | 
				
			||||||
        filamentDoc["comment"] = payload["url"].is<String>() ? payload["url"].as<String>() + payload["artnr"].as<String>() : "automatically generated";
 | 
					        filamentDoc["comment"] = payload["u"].is<String>() ? payload["u"].as<String>() + payload["an"].as<String>() : "automatically generated";
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    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>()) {
 | 
					    if (payload["mc"].is<String>()) {
 | 
				
			||||||
        filamentDoc["multi_color_hexes"] = payload["multi_color_hexes"].as<String>();
 | 
					        filamentDoc["multi_color_hexes"] = payload["mc"].as<String>();
 | 
				
			||||||
        filamentDoc["multi_color_direction"] = payload["multi_color_direction"].is<String>() ? payload["multi_color_direction"].as<String>() : "";
 | 
					        filamentDoc["multi_color_direction"] = payload["mcd"].is<String>() ? payload["mcd"].as<String>() : "";
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        filamentDoc["color_hex"] = (payload["color_hex"].is<String>() && payload["color_hex"].as<String>().length() >= 6) ? payload["color_hex"].as<String>() : "FFFFFF";
 | 
					        filamentDoc["color_hex"] = (payload["c"].is<String>() && payload["c"].as<String>().length() >= 6) ? payload["c"].as<String>() : "FFFFFF";
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    String filamentPayload;
 | 
					    String filamentPayload;
 | 
				
			||||||
@@ -813,6 +811,9 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    filamentDoc.clear();
 | 
					    filamentDoc.clear();
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 | 
					    // Delay for Display Bar
 | 
				
			||||||
 | 
					    vTaskDelay(1000 / portTICK_PERIOD_MS);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Wait for task completion and return the created filament ID
 | 
					    // Wait for task completion and return the created filament ID
 | 
				
			||||||
    // Note: createdFilamentId will be set by sendToApi when response is received
 | 
					    // Note: createdFilamentId will be set by sendToApi when response is received
 | 
				
			||||||
    while(createdFilamentId == 65535) {
 | 
					    while(createdFilamentId == 65535) {
 | 
				
			||||||
@@ -823,6 +824,8 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
					uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			||||||
 | 
					    oledShowProgressBar(3, 5, "New Brand", "Check Filament");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Check if filament exists using task system
 | 
					    // Check if filament exists using task system
 | 
				
			||||||
    foundFilamentId = 65535; // Reset to invalid value to detect when API response is received
 | 
					    foundFilamentId = 65535; // Reset to invalid value to detect when API response is received
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -875,6 +878,8 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& payload, String uidString) {
 | 
					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
 | 
					    // Create new spool in Spoolman database using task system
 | 
				
			||||||
    // Note: Due to async nature, the ID will be stored in createdSpoolId global variable
 | 
					    // 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
 | 
					    // Note: This function assumes that the caller has already ensured API is IDLE
 | 
				
			||||||
@@ -883,17 +888,14 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
 | 
				
			|||||||
    String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
 | 
					    String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
 | 
				
			||||||
    Serial.print("Create spool with URL: ");
 | 
					    Serial.print("Create spool with URL: ");
 | 
				
			||||||
    Serial.println(spoolsUrl);
 | 
					    Serial.println(spoolsUrl);
 | 
				
			||||||
    //String currentDate = getCurrentDateISO8601();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Create JSON payload for spool creation
 | 
					    // Create JSON payload for spool creation
 | 
				
			||||||
    JsonDocument spoolDoc;
 | 
					    JsonDocument spoolDoc;
 | 
				
			||||||
    //spoolDoc["first_used"] = String(currentDate);
 | 
					 | 
				
			||||||
    //spoolDoc["last_used"] = String(currentDate);
 | 
					 | 
				
			||||||
    spoolDoc["filament_id"] = String(filamentId);
 | 
					    spoolDoc["filament_id"] = String(filamentId);
 | 
				
			||||||
    spoolDoc["initial_weight"] = weight > 10 ? String(weight-payload["spool_weight"].as<int>()) : "1000";
 | 
					    spoolDoc["initial_weight"] = weight > 10 ? String(weight - payload["sw"].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["spool_weight"] = (payload["sw"].is<String>() && payload["sw"].as<String>().length() > 0) ? payload["sw"].as<String>() : "180";
 | 
				
			||||||
    spoolDoc["remaining_weight"] = (payload["weight"].is<String>() && payload["weight"].as<String>().length() > 0) ? payload["weight"].as<String>() : "1000";
 | 
					    spoolDoc["remaining_weight"] = spoolDoc["initial_weight"];
 | 
				
			||||||
    spoolDoc["lot_nr"] = (payload["lotnr"].is<String>() && payload["lotnr"].as<String>().length() > 0) ? payload["lotnr"].as<String>() : "";
 | 
					    spoolDoc["lot_nr"] = (payload["an"].is<String>() && payload["an"].as<String>().length() > 0) ? payload["an"].as<String>() : "";
 | 
				
			||||||
    spoolDoc["comment"] = "automatically generated";
 | 
					    spoolDoc["comment"] = "automatically generated";
 | 
				
			||||||
    spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\"";
 | 
					    spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\"";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -938,20 +940,33 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    // Write data to tag with startWriteJsonToTag
 | 
					    // Write data to tag with startWriteJsonToTag
 | 
				
			||||||
    // void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
 | 
					    // 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;
 | 
					    String payloadString;
 | 
				
			||||||
    serializeJson(payload, payloadString);
 | 
					    serializeJson(optimizedPayload, payloadString);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    Serial.println("Optimized JSON with sm_id first:");
 | 
				
			||||||
 | 
					    Serial.println(payloadString);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    optimizedPayload.clear();
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    nfcReaderState = NFC_IDLE;
 | 
					    nfcReaderState = NFC_IDLE;
 | 
				
			||||||
    vTaskDelay(50 / portTICK_PERIOD_MS);
 | 
					
 | 
				
			||||||
 | 
					    // Delay for Display Bar
 | 
				
			||||||
 | 
					    vTaskDelay(1000 / portTICK_PERIOD_MS);
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
    startWriteJsonToTag(true, payloadString.c_str());
 | 
					    startWriteJsonToTag(true, payloadString.c_str());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return createdSpoolId;
 | 
					    return createdSpoolId;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool createBrandFilament(JsonDocument& payload, String uidString) {
 | 
					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) {
 | 
					    if (vendorId == 0) {
 | 
				
			||||||
        Serial.println("ERROR: Failed to create/find vendor");
 | 
					        Serial.println("ERROR: Failed to create/find vendor");
 | 
				
			||||||
        return false;
 | 
					        return false;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										909
									
								
								src/nfc.cpp
									
									
									
									
									
								
							
							
						
						
									
										909
									
								
								src/nfc.cpp
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -16,6 +16,7 @@ typedef enum{
 | 
				
			|||||||
void startNfc();
 | 
					void startNfc();
 | 
				
			||||||
void scanRfidTask(void * parameter);
 | 
					void scanRfidTask(void * parameter);
 | 
				
			||||||
void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
 | 
					void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
 | 
				
			||||||
 | 
					bool quickSpoolIdCheck(String uidString);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern TaskHandle_t RfidReaderTask;
 | 
					extern TaskHandle_t RfidReaderTask;
 | 
				
			||||||
extern String nfcJsonData;
 | 
					extern String nfcJsonData;
 | 
				
			||||||
@@ -23,6 +24,7 @@ extern String activeSpoolId;
 | 
				
			|||||||
extern String lastSpoolId;
 | 
					extern String lastSpoolId;
 | 
				
			||||||
extern volatile nfcReaderStateType nfcReaderState;
 | 
					extern volatile nfcReaderStateType nfcReaderState;
 | 
				
			||||||
extern volatile bool pauseBambuMqttTask;
 | 
					extern volatile bool pauseBambuMqttTask;
 | 
				
			||||||
 | 
					extern volatile bool nfcWriteInProgress;
 | 
				
			||||||
extern bool tagProcessed;
 | 
					extern bool tagProcessed;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,9 +48,6 @@ void scale_loop(void * parameter) {
 | 
				
			|||||||
  Serial.println("Scale Loop started");
 | 
					  Serial.println("Scale Loop started");
 | 
				
			||||||
  Serial.println("++++++++++++++++++++++++++++++");
 | 
					  Serial.println("++++++++++++++++++++++++++++++");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  vTaskDelay(pdMS_TO_TICKS(500));
 | 
					 | 
				
			||||||
  scale_tare_counter = 10; // damit beim Starten der Waage automatisch getart wird
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
  for(;;) {
 | 
					  for(;;) {
 | 
				
			||||||
    if (scale.is_ready()) 
 | 
					    if (scale.is_ready()) 
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
@@ -120,12 +117,13 @@ void start_scale(bool touchSensorConnected) {
 | 
				
			|||||||
    esp_task_wdt_reset();
 | 
					    esp_task_wdt_reset();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (scale.wait_ready_timeout(1000))
 | 
					  while(!scale.is_ready()) {
 | 
				
			||||||
  {
 | 
					    vTaskDelay(pdMS_TO_TICKS(5000));
 | 
				
			||||||
    scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
 | 
					 | 
				
			||||||
    //scale.tare();
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
 | 
				
			||||||
 | 
					  scale.tare();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Display Gewicht
 | 
					  // Display Gewicht
 | 
				
			||||||
  oledShowWeight(0);
 | 
					  oledShowWeight(0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user