Compare commits
15 Commits
v2.0.4
...
v2.0.6-bet
Author | SHA1 | Date | |
---|---|---|---|
6bb4384852 | |||
61174273fe | |||
e604231139 | |||
e0d641c817 | |||
40fdb667fa | |||
8f6ecb350f | |||
16887f5248 | |||
a7b06c9b97 | |||
666c929483 | |||
301109c37b | |||
d43fceebbc | |||
2c435e5c98 | |||
f9aa7f2e6b | |||
f810bc5352 | |||
043c2d4fa8 |
31
CHANGELOG.md
31
CHANGELOG.md
@@ -1,5 +1,36 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [2.0.6-beta1] - 2025-09-03
|
||||||
|
### Fixed
|
||||||
|
- prevent weight display during NFC write operations
|
||||||
|
|
||||||
|
|
||||||
|
## [2.0.6] - 2025-09-03
|
||||||
|
### Fixed
|
||||||
|
- correct progress bar message and update tare function description
|
||||||
|
|
||||||
|
|
||||||
|
## [2.0.5] - 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
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- update progress bar message from 'Tare scale' to 'Searching scale'
|
||||||
|
- Scale tare function after boot
|
||||||
|
|
||||||
|
|
||||||
|
## [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
|
## [2.0.4] - 2025-09-02
|
||||||
### Changed
|
### Changed
|
||||||
- filter out automatic release documentation commits in changelog categorization
|
- filter out automatic release documentation commits in changelog categorization
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "2.0.4"
|
version = "2.0.6-beta1"
|
||||||
to_old_version = "1.5.10"
|
to_old_version = "1.5.10"
|
||||||
|
|
||||||
##
|
##
|
||||||
|
20
src/main.cpp
20
src/main.cpp
@@ -135,7 +135,7 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Wenn Bambu auto set Spool aktiv
|
// Wenn Bambu auto set Spool aktiv
|
||||||
if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0)
|
if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && !nfcWriteInProgress)
|
||||||
{
|
{
|
||||||
if (!bambuDisabled && !bambu_connected)
|
if (!bambuDisabled && !bambu_connected)
|
||||||
{
|
{
|
||||||
@@ -154,7 +154,9 @@ void loop() {
|
|||||||
{
|
{
|
||||||
autoSetToBambuSpoolId = 0;
|
autoSetToBambuSpoolId = 0;
|
||||||
autoAmsCounter = 0;
|
autoAmsCounter = 0;
|
||||||
oledShowWeight(weight);
|
if (!nfcWriteInProgress) {
|
||||||
|
oledShowWeight(weight);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -176,7 +178,8 @@ void loop() {
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Ausgabe der Waage auf Display
|
// Ausgabe der Waage auf Display
|
||||||
if(pauseMainTask == 0)
|
// Block weight display during NFC write operations
|
||||||
|
if(pauseMainTask == 0 && !nfcWriteInProgress)
|
||||||
{
|
{
|
||||||
// Use filtered weight for smooth display, but still check API weight for significant changes
|
// Use filtered weight for smooth display, but still check API weight for significant changes
|
||||||
int16_t displayWeight = getFilteredDisplayWeight();
|
int16_t displayWeight = getFilteredDisplayWeight();
|
||||||
@@ -197,17 +200,6 @@ void loop() {
|
|||||||
{
|
{
|
||||||
lastWeightReadTime = currentMillis;
|
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
|
// Prüfen ob das Gewicht gleich bleibt und dann senden
|
||||||
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
||||||
{
|
{
|
||||||
|
@@ -163,18 +163,8 @@ void scale_loop(void * parameter) {
|
|||||||
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
|
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
|
||||||
if (scale.is_ready())
|
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
|
// Waage manuell Taren
|
||||||
if (scaleTareRequest == true)
|
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||||
{
|
{
|
||||||
Serial.println("Re-Tare scale");
|
Serial.println("Re-Tare scale");
|
||||||
oledShowMessage("TARE Scale");
|
oledShowMessage("TARE Scale");
|
||||||
@@ -184,6 +174,8 @@ void scale_loop(void * parameter) {
|
|||||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||||
oledShowWeight(0);
|
oledShowWeight(0);
|
||||||
scaleTareRequest = false;
|
scaleTareRequest = false;
|
||||||
|
scale_tare_counter = 0;
|
||||||
|
weight = 0; // Reset global weight variable after tare
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get raw weight reading
|
// Get raw weight reading
|
||||||
@@ -197,6 +189,17 @@ void scale_loop(void * parameter) {
|
|||||||
weight = stabilizedWeight;
|
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)
|
// Debug output for monitoring (can be removed in production)
|
||||||
static unsigned long lastDebugTime = 0;
|
static unsigned long lastDebugTime = 0;
|
||||||
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
|
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
|
||||||
@@ -239,7 +242,7 @@ void start_scale(bool touchSensorConnected) {
|
|||||||
|
|
||||||
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
||||||
|
|
||||||
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
|
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Serching scale");
|
||||||
for (uint16_t i = 0; i < 3000; i++) {
|
for (uint16_t i = 0; i < 3000; i++) {
|
||||||
yield();
|
yield();
|
||||||
vTaskDelay(pdMS_TO_TICKS(1));
|
vTaskDelay(pdMS_TO_TICKS(1));
|
||||||
|
Reference in New Issue
Block a user