Compare commits

...

6 Commits

Author SHA1 Message Date
77fbacc681 docs: update changelog and header for version v2.0.2-beta3
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 2m58s
2025-09-02 17:45:33 +02:00
b4f1fc3b0a docs: update platformio.ini for beta version v2.0.2-beta3 2025-09-02 17:45:33 +02:00
3a82175bb6 fix: correct tare scale function to set scaleTareRequest flag 2025-09-02 17:45:21 +02:00
b80184bf23 docs: update changelog and header for version v2.0.2-beta2
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 2m56s
2025-09-02 17:36:39 +02:00
0f63880d1f docs: update platformio.ini for beta version v2.0.2-beta2 2025-09-02 17:36:38 +02:00
0baa1d286e feat: add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t 2025-09-02 17:36:34 +02:00
8 changed files with 43 additions and 10 deletions

View File

@@ -1,5 +1,36 @@
# Changelog
## [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

View File

@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "2.0.2-beta1"
version = "2.0.2-beta3"
to_old_version = "1.5.10"
##

View File

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

View File

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

View File

@@ -21,7 +21,7 @@ TaskHandle_t BambuMqttTask;
bool bambuDisabled = false;
bool bambu_connected = false;
int autoSetToBambuSpoolId = 0;
uint16_t autoSetToBambuSpoolId = 0;
BambuCredentials bambuCredentials;

View File

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

View File

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

View File

@@ -141,7 +141,7 @@ uint8_t setAutoTare(bool autoTareValue) {
uint8_t tareScale() {
Serial.println("Tare scale");
scale.tare();
resetWeightFilter(); // Reset stabilization filter after tare
scaleTareRequest == true;
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 */