Compare commits
	
		
			3 Commits
		
	
	
		
			v1.5.12-be
			...
			v1.5.12-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 08abd1a37f | |||
| da78861613 | |||
| 9231a303f3 | 
@@ -1,5 +1,11 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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
 | 
					## [1.5.12-beta9] - 2025-08-29
 | 
				
			||||||
### Added
 | 
					### Added
 | 
				
			||||||
- update vendor and filament ID handling to use NULL and add delays for stability
 | 
					- update vendor and filament ID handling to use NULL and add delays for stability
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.5.12-beta9"
 | 
					version = "1.5.12-beta10"
 | 
				
			||||||
to_old_version = "1.5.0"
 | 
					to_old_version = "1.5.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
##
 | 
					##
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										24
									
								
								src/api.cpp
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								src/api.cpp
									
									
									
									
									
								
							@@ -701,8 +701,6 @@ uint16_t checkVendor(String vendor) {
 | 
				
			|||||||
        vTaskDelay(100 / portTICK_PERIOD_MS);
 | 
					        vTaskDelay(100 / portTICK_PERIOD_MS);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 | 
					 | 
				
			||||||
    if(spoolmanApiState == API_IDLE) {
 | 
					 | 
				
			||||||
    // Erstelle die Task
 | 
					    // Erstelle die Task
 | 
				
			||||||
    BaseType_t result = xTaskCreate(
 | 
					    BaseType_t result = xTaskCreate(
 | 
				
			||||||
        sendToApi,                // Task-Funktion
 | 
					        sendToApi,                // Task-Funktion
 | 
				
			||||||
@@ -712,16 +710,6 @@ uint16_t checkVendor(String vendor) {
 | 
				
			|||||||
        0,                        // Priorität
 | 
					        0,                        // Priorität
 | 
				
			||||||
        NULL                      // Task-Handle (nicht benötigt)
 | 
					        NULL                      // Task-Handle (nicht benötigt)
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
        Serial.println("Not spawning new task, API still active!");
 | 
					 | 
				
			||||||
        delete params;
 | 
					 | 
				
			||||||
        return 0;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    // Wait for task completion
 | 
					 | 
				
			||||||
    while(spoolmanApiState != API_IDLE) {
 | 
					 | 
				
			||||||
        vTaskDelay(100 / portTICK_PERIOD_MS);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    // Additional delay to ensure foundVendorId is properly set after API state becomes IDLE
 | 
					    // Additional delay to ensure foundVendorId is properly set after API state becomes IDLE
 | 
				
			||||||
    while (foundVendorId == NULL)
 | 
					    while (foundVendorId == NULL)
 | 
				
			||||||
@@ -852,8 +840,6 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
    params->spoolsUrl = spoolsUrl;
 | 
					    params->spoolsUrl = spoolsUrl;
 | 
				
			||||||
    params->updatePayload = ""; // Empty for GET request
 | 
					    params->updatePayload = ""; // Empty for GET request
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Check if API is idle before creating task
 | 
					 | 
				
			||||||
    //if(spoolmanApiState == API_IDLE){
 | 
					 | 
				
			||||||
     // Erstelle die Task
 | 
					     // Erstelle die Task
 | 
				
			||||||
    BaseType_t result = xTaskCreate(
 | 
					    BaseType_t result = xTaskCreate(
 | 
				
			||||||
        sendToApi,                // Task-Funktion
 | 
					        sendToApi,                // Task-Funktion
 | 
				
			||||||
@@ -863,16 +849,6 @@ uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
 | 
				
			|||||||
        0,                        // Priorität
 | 
					        0,                        // Priorität
 | 
				
			||||||
        NULL                      // Task-Handle (nicht benötigt)
 | 
					        NULL                      // Task-Handle (nicht benötigt)
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
    //} else {
 | 
					 | 
				
			||||||
    //    Serial.println("Not spawning new task, API still active!");
 | 
					 | 
				
			||||||
    //    delete params;
 | 
					 | 
				
			||||||
    //    return 0;
 | 
					 | 
				
			||||||
    //}
 | 
					 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    // Wait for task completion
 | 
					 | 
				
			||||||
    while(spoolmanApiState != API_IDLE) {
 | 
					 | 
				
			||||||
        vTaskDelay(100 / portTICK_PERIOD_MS);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    // Additional delay to ensure foundFilamentId is properly set after API state becomes IDLE
 | 
					    // Additional delay to ensure foundFilamentId is properly set after API state becomes IDLE
 | 
				
			||||||
    while (foundFilamentId == NULL) {
 | 
					    while (foundFilamentId == NULL) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user