Merge pull request #51 from Anzarion/main

Fix: Add NULL checks to prevent crash without RFID module

CHANGELOG.md

@@ -1,12 +1,39 @@
 # Changelog
 
+## [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" fix: Scale tare function after boot
+- update progress bar message from 'Tare scale' to 'Searching scale' 
+- Scale tare function after boot
 
 
 ## [2.0.4-beta2] - 2025-09-03

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

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

platformio.ini

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

src/main.cpp

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

src/scale.cpp

@@ -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;
@@ -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;

src/scale.h

@@ -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;

src/wlan.cpp

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