Compare commits

...

7 Commits

Author SHA1 Message Date
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 38 additions and 27 deletions

View File

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

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

View File

@@ -161,19 +161,21 @@ void scale_loop(void * parameter) {
// Only measure at defined intervals to reduce noise
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
// 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;
}
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 >= 5))
{
Serial.println("Re-Tare scale");
oledShowMessage("TARE Scale");
@@ -183,6 +185,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