RFID invisible on GUI when disabled

Author: matth-x

gui

@@ -49,9 +49,12 @@
 #include "tesla_client.h"
 #include "event.h"
 #include "ocpp.h"
-#include "pn532.h"
 #include "rfid.h"
 
+#if defined(ENABLE_PN532)
+#include "pn532.h"
+#endif
+
 #include "LedManagerTask.h"
 #include "event_log.h"
 #include "evse_man.h"

src/main.cpp

@@ -2,6 +2,8 @@
  * Author: Matthias Akstaller
  */
 
+#if defined(ENABLE_PN532)
+
 #if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_NFCREADER)
 #undef ENABLE_DEBUG
 #endif
@@ -297,3 +299,5 @@ void PN532::read() {
 }
 
 PN532 pn532;
+
+#endif

src/pn532.cpp

@@ -2,6 +2,8 @@
  * Author: Matthias Akstaller
  */
 
+#if defined(ENABLE_PN532)
+
 #ifndef PN532_H
 #define PN532_H
 
@@ -44,3 +46,4 @@ class PN532 : public RfidReader, public MicroTasks::Task {
 extern PN532 pn532;
 
 #endif
+#endif

src/pn532.h

@@ -111,7 +111,9 @@ unsigned long RfidTask::loop(MicroTasks::WakeReason reason){
     updateEvseClaim();
 
     if (!config_rfid_enabled()) {
-        resetAuthentication();
+        if (!authenticatedTag.isEmpty()) {
+            resetAuthentication();
+        }
         return 1000;
     }
 
@@ -153,7 +155,7 @@ String RfidTask::getAuthenticatedTag(){
 }
 
 void RfidTask::resetAuthentication(){
-    authenticatedTag = String('\0');
+    authenticatedTag.clear();
 
     DynamicJsonDocument data{JSON_OBJECT_SIZE(1) + authenticatedTag.length() + 1};
     data["rfid_auth"] = authenticatedTag;

src/rfid.cpp

@@ -588,7 +588,9 @@ handleStatus(MongooseHttpServerRequest *request) {
 
   doc["ocpp_connected"] = (int)MongooseOcppSocketClient::ocppConnected();
 
+#if defined(ENABLE_PN532) || defined(ENABLE_RFID)
   doc["rfid_failure"] = (int) rfid.communicationFails();
+#endif
 
   doc["ohm_hour"] = ohm_hour;