Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
e21e13efe6 | |||
682ed2e232 | |||
fbbc226a7d | |||
76d5e7640f | |||
1d421930d8 | |||
0a6a183a38 | |||
6bb4384852 | |||
61174273fe | |||
e604231139 |
@@ -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
|
||||
|
20
README.de.md
20
README.de.md
@@ -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
|
||||
|
19
README.md
19
README.md
@@ -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
BIN
img/rf-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
@@ -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"
|
||||
|
||||
##
|
||||
|
@@ -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();
|
||||
|
Reference in New Issue
Block a user