Compare commits
6 Commits
v2.0.4
...
v2.0.4-bet
Author | SHA1 | Date | |
---|---|---|---|
301109c37b | |||
d43fceebbc | |||
2c435e5c98 | |||
f9aa7f2e6b | |||
f810bc5352 | |||
043c2d4fa8 |
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,5 +1,16 @@
|
||||
# Changelog
|
||||
|
||||
## [2.0.4-beta2] - 2025-09-03
|
||||
### Changed
|
||||
- adjust auto tare counter threshold and reposition tare check in scale loop
|
||||
- improve auto tare logic and reset conditions in scale handling
|
||||
|
||||
|
||||
## [2.0.4-beta1] - 2025-09-03
|
||||
### Changed
|
||||
- improve auto tare logic and reset conditions in scale handling
|
||||
|
||||
|
||||
## [2.0.4] - 2025-09-02
|
||||
### Changed
|
||||
- filter out automatic release documentation commits in changelog categorization
|
||||
|
@@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "2.0.4"
|
||||
version = "2.0.4-beta2"
|
||||
to_old_version = "1.5.10"
|
||||
|
||||
##
|
||||
|
11
src/main.cpp
11
src/main.cpp
@@ -197,17 +197,6 @@ void loop() {
|
||||
{
|
||||
lastWeightReadTime = currentMillis;
|
||||
|
||||
// Prüfen ob die Waage korrekt genullt ist
|
||||
// Abweichung von 2g ignorieren
|
||||
if (autoTare && (weight > 2 && weight < 7) || weight < -2)
|
||||
{
|
||||
scale_tare_counter++;
|
||||
}
|
||||
else
|
||||
{
|
||||
scale_tare_counter = 0;
|
||||
}
|
||||
|
||||
// Prüfen ob das Gewicht gleich bleibt und dann senden
|
||||
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
||||
{
|
||||
|
@@ -163,18 +163,8 @@ void scale_loop(void * parameter) {
|
||||
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
|
||||
if (scale.is_ready())
|
||||
{
|
||||
// Waage automatisch Taren, wenn zu lange Abweichung
|
||||
if (autoTare && scale_tare_counter >= 5)
|
||||
{
|
||||
Serial.println("Auto Tare scale");
|
||||
//scale.tare();
|
||||
//resetWeightFilter(); // Reset filter after auto tare
|
||||
scaleTareRequest = true;
|
||||
scale_tare_counter = 0;
|
||||
}
|
||||
|
||||
// Waage manuell Taren
|
||||
if (scaleTareRequest == true)
|
||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||
{
|
||||
Serial.println("Re-Tare scale");
|
||||
oledShowMessage("TARE Scale");
|
||||
@@ -184,6 +174,8 @@ void scale_loop(void * parameter) {
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
oledShowWeight(0);
|
||||
scaleTareRequest = false;
|
||||
scale_tare_counter = 0;
|
||||
weight = 0; // Reset global weight variable after tare
|
||||
}
|
||||
|
||||
// Get raw weight reading
|
||||
@@ -197,6 +189,17 @@ void scale_loop(void * parameter) {
|
||||
weight = stabilizedWeight;
|
||||
}
|
||||
|
||||
// Prüfen ob die Waage korrekt genullt ist
|
||||
// Abweichung von 2g ignorieren
|
||||
if (autoTare && (rawWeight > 2 && rawWeight < 7) || rawWeight < -2)
|
||||
{
|
||||
scale_tare_counter++;
|
||||
}
|
||||
else
|
||||
{
|
||||
scale_tare_counter = 0;
|
||||
}
|
||||
|
||||
// Debug output for monitoring (can be removed in production)
|
||||
static unsigned long lastDebugTime = 0;
|
||||
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
|
||||
|
Reference in New Issue
Block a user