Compare commits
16 Commits
v2.0.2-bet
...
v2.0.2-bet
Author | SHA1 | Date | |
---|---|---|---|
e74f6076b2 | |||
2ee60ce430 | |||
5db80d3670 | |||
2b195ed9ea | |||
45a623cff6 | |||
b4a06d0f2a | |||
85cff3923c | |||
d9469eaa42 | |||
16c3a65cca | |||
51335456e3 | |||
77fbacc681 | |||
b4f1fc3b0a | |||
3a82175bb6 | |||
b80184bf23 | |||
0f63880d1f | |||
0baa1d286e |
101
CHANGELOG.md
101
CHANGELOG.md
@@ -1,5 +1,106 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [2.0.2-beta6] - 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-beta6
|
||||||
|
- update changelog and header for version v2.0.2-beta5
|
||||||
|
- 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
|
||||||
|
- set scale tare request to true in setup function
|
||||||
|
- correct assignment operator in scale tare request handling
|
||||||
|
- 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-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
|
## [2.0.2-beta1] - 2025-09-02
|
||||||
### Changed
|
### Changed
|
||||||
- update platformio.ini for beta version v2.0.2-beta1
|
- update platformio.ini for beta version v2.0.2-beta1
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "2.0.2-beta1"
|
version = "2.0.2-beta6"
|
||||||
to_old_version = "1.5.10"
|
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 foundFilamentId = 0; // Store ID of found filament
|
||||||
uint16_t createdFilamentId = 0; // Store ID of newly created filament
|
uint16_t createdFilamentId = 0; // Store ID of newly created filament
|
||||||
uint16_t createdSpoolId = 0; // Store ID of newly created spool
|
uint16_t createdSpoolId = 0; // Store ID of newly created spool
|
||||||
|
uint16_t updateOctoSpoolId = 0; // Store spool ID for OctoPrint update
|
||||||
bool spoolmanConnected = false;
|
bool spoolmanConnected = false;
|
||||||
bool spoolmanExtraFieldsChecked = false;
|
bool spoolmanExtraFieldsChecked = false;
|
||||||
TaskHandle_t* apiTask;
|
TaskHandle_t* apiTask;
|
||||||
|
@@ -33,6 +33,7 @@ extern bool sendOctoUpdate;
|
|||||||
extern String octoUrl;
|
extern String octoUrl;
|
||||||
extern String octoToken;
|
extern String octoToken;
|
||||||
extern bool spoolmanConnected;
|
extern bool spoolmanConnected;
|
||||||
|
extern uint16_t updateOctoSpoolId;
|
||||||
|
|
||||||
bool checkSpoolmanInstance();
|
bool checkSpoolmanInstance();
|
||||||
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
|
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
|
||||||
|
@@ -21,7 +21,7 @@ TaskHandle_t BambuMqttTask;
|
|||||||
bool bambuDisabled = false;
|
bool bambuDisabled = false;
|
||||||
|
|
||||||
bool bambu_connected = false;
|
bool bambu_connected = false;
|
||||||
int autoSetToBambuSpoolId = 0;
|
uint16_t autoSetToBambuSpoolId = 0;
|
||||||
|
|
||||||
BambuCredentials bambuCredentials;
|
BambuCredentials bambuCredentials;
|
||||||
|
|
||||||
|
@@ -37,7 +37,7 @@ extern bool bambu_connected;
|
|||||||
extern int ams_count;
|
extern int ams_count;
|
||||||
extern AMSData ams_data[MAX_AMS];
|
extern AMSData ams_data[MAX_AMS];
|
||||||
//extern bool autoSendToBambu;
|
//extern bool autoSendToBambu;
|
||||||
extern int autoSetToBambuSpoolId;
|
extern uint16_t autoSetToBambuSpoolId;
|
||||||
extern bool bambuDisabled;
|
extern bool bambuDisabled;
|
||||||
extern BambuCredentials bambuCredentials;
|
extern BambuCredentials bambuCredentials;
|
||||||
|
|
||||||
|
@@ -59,6 +59,7 @@ void setup() {
|
|||||||
|
|
||||||
// Scale
|
// Scale
|
||||||
start_scale(touchSensorConnected);
|
start_scale(touchSensorConnected);
|
||||||
|
scaleTareRequest = true;
|
||||||
|
|
||||||
// WDT initialisieren mit 10 Sekunden Timeout
|
// WDT initialisieren mit 10 Sekunden Timeout
|
||||||
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
||||||
@@ -242,6 +243,10 @@ void loop() {
|
|||||||
{
|
{
|
||||||
autoSetToBambuSpoolId = activeSpoolId.toInt();
|
autoSetToBambuSpoolId = activeSpoolId.toInt();
|
||||||
}
|
}
|
||||||
|
if (octoEnabled)
|
||||||
|
{
|
||||||
|
updateOctoSpoolId = activeSpoolId.toInt();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -271,7 +276,7 @@ void loop() {
|
|||||||
|
|
||||||
if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
|
if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
|
||||||
{
|
{
|
||||||
updateSpoolOcto(activeSpoolId.toInt());
|
updateSpoolOcto(updateOctoSpoolId);
|
||||||
sendOctoUpdate = false;
|
sendOctoUpdate = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -141,7 +141,7 @@ uint8_t setAutoTare(bool autoTareValue) {
|
|||||||
uint8_t tareScale() {
|
uint8_t tareScale() {
|
||||||
Serial.println("Tare scale");
|
Serial.println("Tare scale");
|
||||||
scale.tare();
|
scale.tare();
|
||||||
resetWeightFilter(); // Reset stabilization filter after tare
|
resetWeightFilter();
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -151,6 +151,7 @@ void scale_loop(void * parameter) {
|
|||||||
Serial.println("Scale Loop started");
|
Serial.println("Scale Loop started");
|
||||||
Serial.println("++++++++++++++++++++++++++++++");
|
Serial.println("++++++++++++++++++++++++++++++");
|
||||||
|
|
||||||
|
//scaleTareRequest == true;
|
||||||
// Initialize weight filter
|
// Initialize weight filter
|
||||||
resetWeightFilter();
|
resetWeightFilter();
|
||||||
lastMeasurementTime = millis();
|
lastMeasurementTime = millis();
|
||||||
@@ -257,11 +258,6 @@ void start_scale(bool touchSensorConnected) {
|
|||||||
// Display Gewicht
|
// Display Gewicht
|
||||||
oledShowWeight(0);
|
oledShowWeight(0);
|
||||||
|
|
||||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
|
||||||
scale.tare();
|
|
||||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
|
||||||
weight = 0;
|
|
||||||
|
|
||||||
Serial.println("starte Scale Task");
|
Serial.println("starte Scale Task");
|
||||||
BaseType_t result = xTaskCreatePinnedToCore(
|
BaseType_t result = xTaskCreatePinnedToCore(
|
||||||
scale_loop, /* Function to implement the task */
|
scale_loop, /* Function to implement the task */
|
||||||
|
@@ -81,7 +81,9 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
|||||||
else if (doc["type"] == "scale") {
|
else if (doc["type"] == "scale") {
|
||||||
uint8_t success = 0;
|
uint8_t success = 0;
|
||||||
if (doc["payload"] == "tare") {
|
if (doc["payload"] == "tare") {
|
||||||
success = tareScale();
|
scaleTareRequest = true;
|
||||||
|
success = 1;
|
||||||
|
//success = tareScale();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (doc["payload"] == "calibrate") {
|
if (doc["payload"] == "calibrate") {
|
||||||
|
Reference in New Issue
Block a user