Compare commits

...

19 Commits

Author SHA1 Message Date
6bb4384852 docs: update changelog and header for version v2.0.6-beta1
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 3m8s
2025-09-03 18:45:36 +02:00
61174273fe docs: update platformio.ini for beta version v2.0.6-beta1 2025-09-03 18:45:36 +02:00
e604231139 fix: prevent weight display during NFC write operations 2025-09-03 18:45:24 +02:00
e0d641c817 docs: update changelog and header for version v2.0.6
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-09-03 15:38:07 +02:00
40fdb667fa docs: update platformio.ini for version v2.0.6 2025-09-03 15:38:07 +02:00
8f6ecb350f fix: correct progress bar message and update tare function description 2025-09-03 15:37:57 +02:00
16887f5248 docs: update changelog and header for version v2.0.5
Some checks failed
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m14s
2025-09-03 15:28:10 +02:00
a7b06c9b97 docs: update platformio.ini for version v2.0.5 2025-09-03 15:28:09 +02:00
666c929483 fix: update progress bar message from "Tare scale" to "Searching scale"
fix: Scale tare function after boot
2025-09-03 15:28:03 +02:00
301109c37b docs: update changelog and header for version v2.0.4-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 3m18s
2025-09-03 15:18:51 +02:00
d43fceebbc docs: update platformio.ini for beta version v2.0.4-beta2 2025-09-03 15:18:50 +02:00
2c435e5c98 refactor: adjust auto tare counter threshold and reposition tare check in scale loop 2025-09-03 15:18:43 +02:00
f9aa7f2e6b docs: update changelog and header for version v2.0.4-beta1
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-03 15:06:50 +02:00
f810bc5352 docs: update platformio.ini for beta version v2.0.4-beta1 2025-09-03 15:06:50 +02:00
043c2d4fa8 refactor: improve auto tare logic and reset conditions in scale handling 2025-09-03 15:06:31 +02:00
f5a1debd7d docs: update changelog and header for version v2.0.4
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 3m10s
2025-09-02 18:49:42 +02:00
37309da185 docs: update platformio.ini for version v2.0.4 2025-09-02 18:49:42 +02:00
bcb7c039e2 refactor: filter out automatic release documentation commits in changelog categorization 2025-09-02 18:49:25 +02:00
98ec5b9846 refactor: disable auto tare and weight filter reset in scale loop 2025-09-02 18:47:02 +02:00
5 changed files with 71 additions and 31 deletions

View File

@@ -1,5 +1,42 @@
# 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
### Changed
- filter out automatic release documentation commits in changelog categorization
- disable auto tare and weight filter reset in scale loop
## [2.0.3] - 2025-09-02
### Added
- add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t

View File

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

View File

@@ -42,6 +42,12 @@ def categorize_commit(commit_msg):
"""Categorize commit messages based on conventional commits"""
lower_msg = commit_msg.lower()
# Filter out automatic release documentation commits
if ('docs:' in lower_msg and
('update changelog and header for version' in lower_msg or
'update platformio.ini for' in lower_msg)):
return None # Skip these commits
# Check for breaking changes first
if ('!' in commit_msg and any(x in lower_msg for x in ['feat!', 'fix!', 'chore!', 'refactor!'])) or \
'breaking change' in lower_msg or 'breaking:' in lower_msg:
@@ -77,11 +83,12 @@ def get_changes_from_git():
for commit in commits:
if commit:
category = categorize_commit(commit)
# Clean up commit message
clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?!?:', '', commit).strip()
# Remove BREAKING CHANGE prefix if present
clean_msg = re.sub(r'^breaking change:\s*', '', clean_msg, flags=re.IGNORECASE).strip()
changes[category].append(clean_msg)
if category is not None: # Skip commits that return None (filtered out)
# Clean up commit message
clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?!?:', '', commit).strip()
# Remove BREAKING CHANGE prefix if present
clean_msg = re.sub(r'^breaking change:\s*', '', clean_msg, flags=re.IGNORECASE).strip()
changes[category].append(clean_msg)
except subprocess.CalledProcessError:
print("Error: Failed to get git commits")

View File

@@ -135,7 +135,7 @@ void loop() {
}
// Wenn Bambu auto set Spool aktiv
if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0)
if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && !nfcWriteInProgress)
{
if (!bambuDisabled && !bambu_connected)
{
@@ -154,7 +154,9 @@ void loop() {
{
autoSetToBambuSpoolId = 0;
autoAmsCounter = 0;
oledShowWeight(weight);
if (!nfcWriteInProgress) {
oledShowWeight(weight);
}
}
}
else
@@ -176,7 +178,8 @@ void loop() {
else
{
// 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
int16_t displayWeight = getFilteredDisplayWeight();
@@ -197,17 +200,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)
{

View File

@@ -163,17 +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
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");
@@ -183,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
@@ -196,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
@@ -238,7 +242,7 @@ void start_scale(bool touchSensorConnected) {
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++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));