Compare commits
	
		
			12 Commits
		
	
	
		
			v2.0.2-bet
			...
			45a623cff6
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 45a623cff6 | |||
| b4a06d0f2a | |||
| 85cff3923c | |||
| d9469eaa42 | |||
| 16c3a65cca | |||
| 51335456e3 | |||
| 77fbacc681 | |||
| b4f1fc3b0a | |||
| 3a82175bb6 | |||
| b80184bf23 | |||
| 0f63880d1f | |||
| 0baa1d286e | 
							
								
								
									
										74
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										74
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,79 @@
 | 
			
		||||
# Changelog
 | 
			
		||||
 | 
			
		||||
## [2.0.2-beta5] - 2025-09-02
 | 
			
		||||
### Added
 | 
			
		||||
- add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta5
 | 
			
		||||
- update changelog and header for version v2.0.2-beta4
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta4
 | 
			
		||||
- update changelog and header for version v2.0.2-beta3
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta3
 | 
			
		||||
- update changelog and header for version v2.0.2-beta2
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta2
 | 
			
		||||
- update changelog and header for version v2.0.2-beta1
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta1
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
- correct tare scale request handling in tareScale function
 | 
			
		||||
- reset weight filter after tare scale operation
 | 
			
		||||
- correct tare scale function to set scaleTareRequest flag
 | 
			
		||||
- reset weight counter logic and update spool ID in loop function
 | 
			
		||||
- reduce delay in start_scale function and reset weight after tare
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [2.0.2-beta4] - 2025-09-02
 | 
			
		||||
### Added
 | 
			
		||||
- add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta4
 | 
			
		||||
- update changelog and header for version v2.0.2-beta3
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta3
 | 
			
		||||
- update changelog and header for version v2.0.2-beta2
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta2
 | 
			
		||||
- update changelog and header for version v2.0.2-beta1
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta1
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
- reset weight filter after tare scale operation
 | 
			
		||||
- correct tare scale function to set scaleTareRequest flag
 | 
			
		||||
- reset weight counter logic and update spool ID in loop function
 | 
			
		||||
- reduce delay in start_scale function and reset weight after tare
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [2.0.2-beta3] - 2025-09-02
 | 
			
		||||
### Added
 | 
			
		||||
- add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta3
 | 
			
		||||
- update changelog and header for version v2.0.2-beta2
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta2
 | 
			
		||||
- update changelog and header for version v2.0.2-beta1
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta1
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
- correct tare scale function to set scaleTareRequest flag
 | 
			
		||||
- reset weight counter logic and update spool ID in loop function
 | 
			
		||||
- reduce delay in start_scale function and reset weight after tare
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [2.0.2-beta2] - 2025-09-02
 | 
			
		||||
### Added
 | 
			
		||||
- add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta2
 | 
			
		||||
- update changelog and header for version v2.0.2-beta1
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta1
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
- reset weight counter logic and update spool ID in loop function
 | 
			
		||||
- reduce delay in start_scale function and reset weight after tare
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [2.0.2-beta1] - 2025-09-02
 | 
			
		||||
### Changed
 | 
			
		||||
- update platformio.ini for beta version v2.0.2-beta1
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@
 | 
			
		||||
; https://docs.platformio.org/page/projectconf.html
 | 
			
		||||
 | 
			
		||||
[common]
 | 
			
		||||
version = "2.0.2-beta1"
 | 
			
		||||
version = "2.0.2-beta5"
 | 
			
		||||
to_old_version = "1.5.10"
 | 
			
		||||
 | 
			
		||||
##
 | 
			
		||||
 
 | 
			
		||||
@@ -21,6 +21,7 @@ uint16_t foundVendorId = 0;    // Store ID of found vendor
 | 
			
		||||
uint16_t foundFilamentId = 0;  // Store ID of found filament
 | 
			
		||||
uint16_t createdFilamentId = 0;  // Store ID of newly created filament
 | 
			
		||||
uint16_t createdSpoolId = 0;  // Store ID of newly created spool
 | 
			
		||||
uint16_t updateOctoSpoolId = 0; // Store spool ID for OctoPrint update
 | 
			
		||||
bool spoolmanConnected = false;
 | 
			
		||||
bool spoolmanExtraFieldsChecked = false;
 | 
			
		||||
TaskHandle_t* apiTask;
 | 
			
		||||
 
 | 
			
		||||
@@ -33,6 +33,7 @@ extern bool sendOctoUpdate;
 | 
			
		||||
extern String octoUrl;
 | 
			
		||||
extern String octoToken;
 | 
			
		||||
extern bool spoolmanConnected;
 | 
			
		||||
extern uint16_t updateOctoSpoolId;
 | 
			
		||||
 | 
			
		||||
bool checkSpoolmanInstance();
 | 
			
		||||
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@ TaskHandle_t BambuMqttTask;
 | 
			
		||||
bool bambuDisabled = false;
 | 
			
		||||
 | 
			
		||||
bool bambu_connected = false;
 | 
			
		||||
int autoSetToBambuSpoolId = 0;
 | 
			
		||||
uint16_t autoSetToBambuSpoolId = 0;
 | 
			
		||||
 | 
			
		||||
BambuCredentials bambuCredentials;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@ extern bool bambu_connected;
 | 
			
		||||
extern int ams_count;
 | 
			
		||||
extern AMSData ams_data[MAX_AMS];
 | 
			
		||||
//extern bool autoSendToBambu;
 | 
			
		||||
extern int autoSetToBambuSpoolId;
 | 
			
		||||
extern uint16_t autoSetToBambuSpoolId;
 | 
			
		||||
extern bool bambuDisabled;
 | 
			
		||||
extern BambuCredentials bambuCredentials;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -242,6 +242,10 @@ void loop() {
 | 
			
		||||
        {
 | 
			
		||||
          autoSetToBambuSpoolId = activeSpoolId.toInt();
 | 
			
		||||
        }
 | 
			
		||||
        if (octoEnabled) 
 | 
			
		||||
        {
 | 
			
		||||
          updateOctoSpoolId = activeSpoolId.toInt();
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
      else
 | 
			
		||||
      {
 | 
			
		||||
@@ -271,7 +275,7 @@ void loop() {
 | 
			
		||||
 | 
			
		||||
    if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
 | 
			
		||||
    {
 | 
			
		||||
      updateSpoolOcto(activeSpoolId.toInt());
 | 
			
		||||
      updateSpoolOcto(updateOctoSpoolId);
 | 
			
		||||
      sendOctoUpdate = false;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -141,7 +141,7 @@ uint8_t setAutoTare(bool autoTareValue) {
 | 
			
		||||
uint8_t tareScale() {
 | 
			
		||||
  Serial.println("Tare scale");
 | 
			
		||||
  scale.tare();
 | 
			
		||||
  resetWeightFilter(); // Reset stabilization filter after tare
 | 
			
		||||
  resetWeightFilter();
 | 
			
		||||
  
 | 
			
		||||
  return 1;
 | 
			
		||||
}
 | 
			
		||||
@@ -151,6 +151,7 @@ void scale_loop(void * parameter) {
 | 
			
		||||
  Serial.println("Scale Loop started");
 | 
			
		||||
  Serial.println("++++++++++++++++++++++++++++++");
 | 
			
		||||
 | 
			
		||||
  //scaleTareRequest == true;
 | 
			
		||||
  // Initialize weight filter
 | 
			
		||||
  resetWeightFilter();
 | 
			
		||||
  lastMeasurementTime = millis();
 | 
			
		||||
@@ -257,11 +258,6 @@ void start_scale(bool touchSensorConnected) {
 | 
			
		||||
  // Display Gewicht
 | 
			
		||||
  oledShowWeight(0);
 | 
			
		||||
 | 
			
		||||
  vTaskDelay(500 / portTICK_PERIOD_MS);
 | 
			
		||||
  scale.tare();
 | 
			
		||||
  vTaskDelay(500 / portTICK_PERIOD_MS);
 | 
			
		||||
  weight = 0;
 | 
			
		||||
 | 
			
		||||
  Serial.println("starte Scale Task");
 | 
			
		||||
  BaseType_t result = xTaskCreatePinnedToCore(
 | 
			
		||||
    scale_loop, /* Function to implement the task */
 | 
			
		||||
 
 | 
			
		||||
@@ -81,7 +81,9 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
 | 
			
		||||
        else if (doc["type"] == "scale") {
 | 
			
		||||
            uint8_t success = 0;
 | 
			
		||||
            if (doc["payload"] == "tare") {
 | 
			
		||||
                success = tareScale();
 | 
			
		||||
                scaleTareRequest == true;
 | 
			
		||||
                success = 1;
 | 
			
		||||
                //success = tareScale();
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (doc["payload"] == "calibrate") {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user