Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-12 01:24:04 +00:00
Code Issues Releases Activity

rfid: clean up in logging

Browse Source
This commit is contained in:
Bartlomiej Zimon
2020-04-10 14:17:02 +00:00
parent 9e743be100
commit f705fbc6bf
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_P008_RFID.ino
+8 -5
View File
@@ -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;
src/_P040_ID12.ino
+14 -9
View File
@@ -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;
}