Compare commits

..

9 Commits
v2.0.6 ... main

Author SHA1 Message Date
e21e13efe6 docs: add additional information about Recycling Fabrik in README files 2025-09-10 17:37:16 +02:00
682ed2e232 chore: remove unnecessary separator in Recycling Fabrik section 2025-09-10 17:36:12 +02:00
fbbc226a7d docs: add Recycling Fabrik section with logo and information 2025-09-10 17:36:07 +02:00
76d5e7640f fix: update Recycling Fabrik logo display format in README 2025-09-10 17:33:24 +02:00
1d421930d8 feat: add RF logo image 2025-09-10 17:32:15 +02:00
0a6a183a38 docs: add support information for Recycling Fabrik 2025-09-10 17:31:07 +02:00
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
6 changed files with 51 additions and 4 deletions

View File

@@ -1,5 +1,10 @@
# 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

View File

@@ -11,6 +11,26 @@ oder auf meiner Website: [FilaMan Website](https://www.filaman.app)
Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
## NEU: Recycling Fabrik
<a href="https://www.recyclingfabrik.com" target="_blank">
<img src="img/rf-logo.png" alt="Recycling Fabrik" width="200">
</a>
FilaMan wird von [Recycling Fabrik](https://www.recyclingfabrik.com) unterstützt.
Recycling Fabrik wird demnächst auf seinen Spulen einen FilaMan tauglichen NFC Tag anbieten. Das hat den Vorteil,
dass die Spulen direkt über FilaMan, ganz automatisch, erkannt und in Spoolman importiert werden können.
**Was ist Recycling Fabrik?**
Die Recycling Fabrik ist ein deutsches Unternehmen, das sich der Entwicklung und Herstellung von nachhaltigem 3D-Druck-Filament verschrieben hat.
Ihre Filamente bestehen zu 100 % aus recyceltem Material, welches sowohl vom Endkunden, als auch aus der Industrie stammt für eine umweltbewusste und ressourcenschonende Zukunft.
Mehr Informationen und Produkte findest du hier: [www.recyclingfabrik.com](https://www.recyclingfabrik.com)
---
### Es gibt jetzt auch ein Wiki, dort sind nochmal alle Funktionen beschrieben: [Wiki](https://github.com/ManuelW77/Filaman/wiki)
### ESP32 Hardware-Funktionen

View File

@@ -15,6 +15,25 @@ or my website: [FilaMan Website](https://www.filaman.app)
german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
## NEW: Recycling Fabrik
<a href="https://www.recyclingfabrik.com" target="_blank">
<img src="img/rf-logo.png" alt="Recycling Fabrik" width="200">
</a>
FilaMan is supported by [Recycling Fabrik](https://www.recyclingfabrik.com).
Recycling Fabrik will soon offer a FilaMan-compatible NFC tag on their spools. This has the advantage
that the spools can be automatically recognized and imported into Spoolman directly via FilaMan.
**What is Recycling Fabrik?**
Recycling Fabrik is a German company dedicated to developing and manufacturing sustainable 3D printing filament.
Their filaments are made from 100% recycled material from both end customers and industry for an environmentally conscious and resource-saving future.
More information and products can be found here: [www.recyclingfabrik.com](https://www.recyclingfabrik.com)
---
### Now more detailed informations about the usage: [Wiki](https://github.com/ManuelW77/Filaman/wiki)
### ESP32 Hardware Features

BIN
img/rf-logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

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

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();