From f705fbc6bf4194061940ef2247230fa7e2e9eca2 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zimon <uzi18@o2.pl>
Date: Fri, 10 Apr 2020 14:14:18 +0000
Subject: [PATCH] rfid: clean up in logging

---
 src/_P008_RFID.ino | 13 ++++++++-----
 src/_P040_ID12.ino | 23 ++++++++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/_P008_RFID.ino b/src/_P008_RFID.ino
index 61de9a74b..8ceda3f2e 100644
--- a/src/_P008_RFID.ino
+++ b/src/_P008_RFID.ino
@@ -113,12 +113,15 @@ boolean Plugin_008(byte function, struct EventStruct *event, String& string)
               }
               break;
             }
+            
+            if (loglevelActiveFor(LOG_LEVEL_INFO)) {
             // write log
-            String log = F("RFID : Tag: ");
-            log += (unsigned long) Plugin_008_keyBuffer;
-            log += F(" Bits: ");
-            log += Plugin_008_bitCount;
-            addLog(LOG_LEVEL_INFO, log);
+              String log = F("RFID : Tag: ");
+              log += (unsigned long) Plugin_008_keyBuffer;
+              log += F(" Bits: ");
+              log += Plugin_008_bitCount;
+              addLog(LOG_LEVEL_INFO, log);
+            }
             // reset everything
             Plugin_008_keyBuffer = 0;
             Plugin_008_bitCount = 0;
diff --git a/src/_P040_ID12.ino b/src/_P040_ID12.ino
index d8a31837e..b4c67b7ae 100644
--- a/src/_P040_ID12.ino
+++ b/src/_P040_ID12.ino
@@ -61,8 +61,7 @@ boolean Plugin_040(byte function, struct EventStruct *event, String& string)
             // Reset card id on timeout
             UserVar[event->BaseVarIndex] = 0;
             UserVar[event->BaseVarIndex + 1] = 0;
-            String log = F("RFID : Removed Tag");
-            addLog(LOG_LEVEL_INFO, log);
+            addLog(LOG_LEVEL_INFO, F("RFID : Removed Tag"));
             sendData(event);
             success = true;
         }
@@ -140,17 +139,24 @@ boolean Plugin_040(byte function, struct EventStruct *event, String& string)
               unsigned long key = 0, old_key = 0;
               old_key = ((uint32_t) UserVar[event->BaseVarIndex]) | ((uint32_t) UserVar[event->BaseVarIndex + 1])<<16;
               for (byte i = 1; i < 5; i++) key = key | (((unsigned long) code[i] << ((4 - i) * 8)));
-              String log = F("RFID : ");
+              bool new_key = false;
               if (old_key != key) {
                 UserVar[event->BaseVarIndex] = (key & 0xFFFF);
                 UserVar[event->BaseVarIndex + 1] = ((key >> 16) & 0xFFFF);
+                new_key = true;
                 sendData(event);
-                log += F("New Tag: ");
-              } else {
-                log += F("Old Tag: ");
               }
-              log += key;
-              addLog(LOG_LEVEL_INFO, log);
+
+              if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+                String log = F("RFID : ");
+                if (new_key) {
+                  log += F("New Tag: ");
+                } else {
+                  log += F("Old Tag: "); 
+                }
+                log += key;
+                addLog(LOG_LEVEL_INFO, log);
+              }
               setPluginTaskTimer(500, event->TaskIndex, event->Par1);
             }
           }
@@ -158,7 +164,6 @@ boolean Plugin_040(byte function, struct EventStruct *event, String& string)
         }
         break;
       }
-
   }
   return success;
 }