Compare commits

..

27 Commits

Author SHA1 Message Date
4dff77e75d docs: update changelog and header for version v2.0.9
Some checks failed
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m24s
2025-10-15 15:53:44 +02:00
907765bcaa docs: update platformio.ini for version v2.0.9 2025-10-15 15:53:44 +02:00
b867aade7d docs: update changelog and header for version v2.0.8
Some checks failed
Release Workflow / detect-provider (push) Successful in 1m9s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m39s
2025-10-15 15:43:54 +02:00
36771235ad docs: update platformio.ini for version v2.0.8 2025-10-15 15:43:53 +02:00
47470eb944 Merge pull request #51 from Anzarion/main
Fix: Add NULL checks to prevent crash without RFID module
2025-10-15 15:37:20 +02:00
Anzarion
e1da8eb525 Fix: Add NULL checks to prevent crash without RFID module
- Added NULL checks before vTaskSuspend/vTaskResume in scale.cpp
- Prevents crash when calibrating without RFID module connected
- Allows scale to work as standalone device without RFID
2025-09-30 10:37:58 +02:00
e943d2e70c docs: update changelog and header for version v2.0.7
All checks were successful
Release Workflow / detect-provider (push) Successful in 6s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m44s
2025-09-13 10:08:29 +02:00
d7b0884d36 docs: update platformio.ini for version v2.0.7 2025-09-13 10:08:29 +02:00
10caf06021 fix: add HTTP service to mDNS responder 2025-09-13 10:06:52 +02:00
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
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
9 changed files with 118 additions and 23 deletions

View File

@@ -1,5 +1,57 @@
# Changelog
## [2.0.9] - 2025-10-15
## [2.0.8] - 2025-10-15
### Added
- Fix: Add NULL checks to prevent crash without RFID module
### Changed
- Merge pull request #51 from Anzarion/main
## [2.0.7] - 2025-09-13
### Added
- add HTTP service to mDNS responder
- add additional information about Recycling Fabrik in README files
- add Recycling Fabrik section with logo and information
- add RF logo image
- add support information for Recycling Fabrik
### Changed
- remove unnecessary separator in Recycling Fabrik section
### Fixed
- update Recycling Fabrik logo display format in README
- prevent weight display during NFC write operations
## [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

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.4-beta1"
version = "2.0.9"
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();

View File

@@ -28,7 +28,7 @@ int16_t lastDisplayedWeight = 0;
int16_t lastStableWeight = 0; // For API/action triggering
unsigned long lastMeasurementTime = 0;
uint8_t weigthCouterToApi = 0;
uint8_t weightCounterToApi = 0;
uint8_t scale_tare_counter = 0;
bool scaleTareRequest = false;
uint8_t pauseMainTask = 0;
@@ -161,21 +161,10 @@ 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 manuell Taren
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 5))
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
{
Serial.println("Re-Tare scale");
oledShowMessage("TARE Scale");
@@ -200,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
@@ -242,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));
@@ -285,8 +285,8 @@ uint8_t calibrate_scale() {
scaleCalibrationActive = true;
vTaskSuspend(RfidReaderTask);
vTaskSuspend(ScaleTask);
if (RfidReaderTask != NULL) vTaskSuspend(RfidReaderTask);
if (ScaleTask != NULL) vTaskSuspend(ScaleTask);
pauseBambuMqttTask = true;
pauseMainTask = 1;
@@ -393,8 +393,8 @@ uint8_t calibrate_scale() {
returnState = 0;
}
vTaskResume(RfidReaderTask);
vTaskResume(ScaleTask);
if (RfidReaderTask != NULL) vTaskResume(RfidReaderTask);
if (ScaleTask != NULL) vTaskResume(ScaleTask);
pauseBambuMqttTask = false;
pauseMainTask = 0;
scaleCalibrationActive = false;

View File

@@ -18,7 +18,7 @@ int16_t getFilteredDisplayWeight();
extern HX711 scale;
extern int16_t weight;
extern uint8_t weigthCouterToApi;
extern uint8_t weightCounterToApi;
extern uint8_t scale_tare_counter;
extern uint8_t scaleTareRequest;
extern uint8_t pauseMainTask;

View File

@@ -36,6 +36,7 @@ void startMDNS() {
vTaskDelay(1000 / portTICK_PERIOD_MS);
}
}
MDNS.addService("http", "tcp", 80);
Serial.println("mDNS responder started");
}