src/api.cpp

@@ -3,8 +3,7 @@
 #include <ArduinoJson.h>
 #include "commonFS.h"
 
-volatile spoolmanApiStateType spoolmanApiState = API_INIT;
-//bool spoolman_connected = false;
+bool spoolman_connected = false;
 String spoolmanUrl = "";
 bool octoEnabled = false;
 String octoUrl = "";
@@ -86,7 +85,6 @@ JsonDocument fetchSingleSpoolInfo(int spoolId) {
 }
 
 void sendToApi(void *parameter) {
-    spoolmanApiState = API_TRANSMITTING;
     SendToApiParams* params = (SendToApiParams*)parameter;
 
     // Extrahiere die Werte
@@ -121,7 +119,6 @@ void sendToApi(void *parameter) {
     // Speicher freigeben
     delete params;
     vTaskDelete(NULL);
-    spoolmanApiState = API_IDLE;
 }
 
 bool updateSpoolTagId(String uidString, const char* payload) {
@@ -482,8 +479,7 @@ bool checkSpoolmanInstance(const String& url) {
                     return false;
                 }
 
-                spoolmanApiState = API_IDLE;
-                oledShowTopRow();
+                spoolman_connected = true;
                 return strcmp(status, "healthy") == 0;
             }
         }

src/api.h

@@ -6,13 +6,7 @@
 #include "website.h"
 #include "display.h"
 #include <ArduinoJson.h>
-typedef enum {
-    API_INIT,
-    API_IDLE,
-    API_TRANSMITTING
-} spoolmanApiStateType;
 
-extern volatile spoolmanApiStateType spoolmanApiState;
 extern bool spoolman_connected;
 extern String spoolmanUrl;
 extern bool octoEnabled;

src/display.cpp

@@ -177,7 +177,7 @@ void oledShowTopRow() {
         display.drawBitmap(50, 0, bitmap_off , 16, 16, WHITE);
     }
 
-    if (spoolmanApiState != API_INIT) {
+    if (spoolman_connected == 1) {
         display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
     } else {
         display.drawBitmap(80, 0, bitmap_off , 16, 16, WHITE);

src/main.cpp

@@ -122,7 +122,7 @@ void loop() {
 
     if (intervalElapsed(currentMillis, lastAutoSetBambuAmsTime, autoSetBambuAmsInterval)) 
     {
-      if (nfcReaderState == NFC_IDLE)
+      if (hasReadRfidTag == 0)
       {
         lastAutoSetBambuAmsTime = currentMillis;
         oledShowMessage("Auto Set         " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s");
@@ -156,7 +156,7 @@ void loop() {
   // Ausgabe der Waage auf Display
   if(pauseMainTask == 0)
   {
-    if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!autoSendToBambu || autoSetToBambuSpoolId == 0)))
+    if (mainTaskWasPaused || (weight != lastWeight && hasReadRfidTag == 0 && (!autoSendToBambu || autoSetToBambuSpoolId == 0)))
     {
       (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
     }
@@ -169,7 +169,7 @@ void loop() {
 
 
   // Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag < 3)
   {
     lastWeightReadTime = currentMillis;
 
@@ -186,8 +186,7 @@ void loop() {
   }
 
   // reset weight counter after writing tag
-  // TBD: what exactly is the logic behind this?
-  if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
+  if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag > 1)
   {
     weigthCouterToApi = 0;
   }
@@ -195,7 +194,7 @@ void loop() {
   lastWeight = weight;
 
   // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-  if (spoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS) {
+  if (spoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && hasReadRfidTag == 1) {
     oledShowIcon("loading");
     if (updateSpoolWeight(spoolId, weight)) 
     {

src/nfc.cpp

@@ -18,7 +18,7 @@ String spoolId = "";
 String nfcJsonData = "";
 volatile bool pauseBambuMqttTask = false;
 
-volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
+volatile uint8_t hasReadRfidTag = 0;
 // 0 = nicht gelesen
 // 1 = erfolgreich gelesen
 // 2 = fehler beim Lesen
@@ -242,7 +242,7 @@ void writeJsonToTag(void *parameter) {
   Serial.println("Erstelle NDEF-Message...");
   Serial.println(payload);
 
-  nfcReaderState = NFC_WRITING;
+  hasReadRfidTag = 3;
   vTaskSuspend(RfidReaderTask);
   vTaskDelay(50 / portTICK_PERIOD_MS);
 
@@ -288,7 +288,7 @@ void writeJsonToTag(void *parameter) {
         //oledShowMessage("NFC-Tag written");
         oledShowIcon("success");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
-        nfcReaderState = NFC_WRITE_SUCCESS;
+        hasReadRfidTag = 5;
         // aktualisieren der Website wenn sich der Status ändert
         sendNfcData(nullptr);
         pauseBambuMqttTask = false;
@@ -310,7 +310,7 @@ void writeJsonToTag(void *parameter) {
         Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
         oledShowIcon("failed");
         vTaskDelay(2000 / portTICK_PERIOD_MS);
-        nfcReaderState = NFC_WRITE_ERROR;
+        hasReadRfidTag = 4;
     }
   }
   else
@@ -318,7 +318,7 @@ void writeJsonToTag(void *parameter) {
     Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
     oledShowMessage("No NFC-Tag found");
     vTaskDelay(2000 / portTICK_PERIOD_MS);
-    nfcReaderState = NFC_IDLE;
+    hasReadRfidTag = 0;
   }
   
   sendWriteResult(nullptr, success);
@@ -334,7 +334,7 @@ void startWriteJsonToTag(const char* payload) {
   char* payloadCopy = strdup(payload);
   
   // Task nicht mehrfach starten
-  if (nfcReaderState != NFC_WRITING) {
+  if (hasReadRfidTag != 3) {
     // Erstelle die Task
     xTaskCreate(
         writeJsonToTag,        // Task-Funktion
@@ -351,7 +351,7 @@ void scanRfidTask(void * parameter) {
   Serial.println("RFID Task gestartet");
   for(;;) {
     // Wenn geschrieben wird Schleife aussetzen
-    if (nfcReaderState != NFC_WRITING)
+    if (hasReadRfidTag != 3)
     {
       yield();
 
@@ -363,12 +363,12 @@ void scanRfidTask(void * parameter) {
 
       foundNfcTag(nullptr, success);
       
-      if (success && nfcReaderState != NFC_READ_SUCCESS)
+      if (success && hasReadRfidTag != 1)
       {
         // Display some basic information about the card
         Serial.println("Found an ISO14443A card");
 
-        nfcReaderState = NFC_READING;
+        hasReadRfidTag = 6;
 
         oledShowIcon("transfer");
         vTaskDelay(500 / portTICK_PERIOD_MS);
@@ -406,11 +406,11 @@ void scanRfidTask(void * parameter) {
             {
               oledShowMessage("NFC-Tag unknown");
               vTaskDelay(2000 / portTICK_PERIOD_MS);
-              nfcReaderState = NFC_READ_ERROR;
+              hasReadRfidTag = 2;
             }
             else 
             {
-              nfcReaderState = NFC_READ_SUCCESS;
+              hasReadRfidTag = 1;
             }
 
             free(data);
@@ -418,7 +418,7 @@ void scanRfidTask(void * parameter) {
           else
           {
             oledShowMessage("NFC-Tag read error");
-            nfcReaderState = NFC_READ_ERROR;
+            hasReadRfidTag = 2;
           }
         }
         else
@@ -427,9 +427,9 @@ void scanRfidTask(void * parameter) {
         }
       }
 
-      if (!success && nfcReaderState != NFC_IDLE)
+      if (!success && hasReadRfidTag > 0)
       {
-        nfcReaderState = NFC_IDLE;
+        hasReadRfidTag = 0;
         //uidString = "";
         nfcJsonData = "";
         Serial.println("Tag entfernt");

src/nfc.h

@@ -3,16 +3,6 @@
 
 #include <Arduino.h>
 
-typedef enum{
-    NFC_IDLE,
-    NFC_READING,
-    NFC_READ_SUCCESS,
-    NFC_READ_ERROR,
-    NFC_WRITING,
-    NFC_WRITE_SUCCESS,
-    NFC_WRITE_ERROR
-} nfcReaderStateType;
-
 void startNfc();
 void scanRfidTask(void * parameter);
 void startWriteJsonToTag(const char* payload);
@@ -20,9 +10,7 @@ void startWriteJsonToTag(const char* payload);
 extern TaskHandle_t RfidReaderTask;
 extern String nfcJsonData;
 extern String spoolId;
-extern volatile nfcReaderStateType nfcReaderState;
+extern volatile uint8_t hasReadRfidTag;
 extern volatile bool pauseBambuMqttTask;
 
-
-
 #endif

src/website.cpp

@@ -22,7 +22,7 @@ AsyncWebServer server(webserverPort);
 AsyncWebSocket ws("/ws");
 
 uint8_t lastSuccess = 0;
-nfcReaderStateType lastnfcReaderState = NFC_IDLE;
+uint8_t lastHasReadRfidTag = 0;
 
 
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
@@ -44,15 +44,13 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
         JsonDocument doc;
         deserializeJson(doc, message);
 
-        bool spoolmanConnected = (spoolmanApiState != API_INIT);
-
         if (doc["type"] == "heartbeat") {
             // Sende Heartbeat-Antwort
             ws.text(client->id(), "{"
                 "\"type\":\"heartbeat\","
                 "\"freeHeap\":" + String(ESP.getFreeHeap()/1024) + ","
                 "\"bambu_connected\":" + String(bambu_connected) + ","
-                "\"spoolman_connected\":" + String(spoolmanConnected) + ""
+                "\"spoolman_connected\":" + String(spoolman_connected) + ""
                 "}");
         }
 
@@ -141,31 +139,34 @@ void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
 }
 
 void sendNfcData(AsyncWebSocketClient *client) {
-    if (lastnfcReaderState == nfcReaderState) return;
-    // TBD: Why is there no status for reading the tag?
-    switch(nfcReaderState){
-        case NFC_IDLE:
+    if (lastHasReadRfidTag == hasReadRfidTag) return;
+    if (hasReadRfidTag == 0) {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":{}}");
-            break;
-        case NFC_READ_SUCCESS:
+    }
+    else if (hasReadRfidTag == 1) {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":" + nfcJsonData + "}");
-            break;
-        case NFC_READ_ERROR:
+    }
+    else if (hasReadRfidTag == 2)
+    {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Empty Tag or Data not readable\"}}");
-            break;
-        case NFC_WRITING:
+    }
+    else if (hasReadRfidTag == 3)
+    {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Schreibe Tag...\"}}");
-            break;
-        case NFC_WRITE_SUCCESS:
-            ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Tag erfolgreich geschrieben\"}}");
-            break;
-        case NFC_WRITE_ERROR:
+    }
+    else if (hasReadRfidTag == 4)
+    {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Error writing to Tag\"}}");
-            break;
-        case DEFAULT:
+    }
+    else if (hasReadRfidTag == 5)
+    {
+        ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Tag erfolgreich geschrieben\"}}");
+    }
+    else 
+    {
         ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Something went wrong\"}}");
     }
-    lastnfcReaderState = nfcReaderState;
+    lastHasReadRfidTag = hasReadRfidTag;
 }
 
 void sendAmsData(AsyncWebSocketClient *client) {