trotFunky/Projet_Barbapapa_Firmware
1
0
Fork 0
Code Activity

RFID: Implement tag programming

Browse source 
The software needs tag data to be able to send programming requests, so
go through the active tags and extract the data in the new Com structs.

programTag() handles tag wakeup and selection, so might fail if the
requested tag is on another reader. This allows chaining them together
and not keeping track of which tag which reader sees.

Add an assert in case the communication buffer would get too small to
send all active tags as the protocol does not define a multi-message
response.
This commit is contained in:
Teo-CD 2024-01-06 00:36:19 +00:00
parent b5b5268b79
commit 38e4982aac
2 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/RFID.cpp
View file

@ -4,6 +4,9 @@
#include "RFID.h"
static_assert(RFID::maxTags * sizeof(Com::TagInfoRecord) <= 62,
"RFID::maxTags too high, protocol cannot support it.\n");
MFRC522Constants::MIFARE_Key RFID::defaultKey = {0xFF,0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
int RFID::currentActiveTags = 0;
@ -68,6 +71,38 @@ int8_t RFID::checkTags() {
return newTag->tag_ID;
}
uint8_t RFID::gatherTagInfo(Com::TagInfoRecord *tagData) {
int tagCount = 0;
for (uidNode* node = activeTags; node; node = node->next) {
// The protocol does not support UIDs other than 4 bytes, so assume it
// is the case here directly.
tagData[tagCount].uid = *(uint32_t*)(node->uid.uidByte);
tagData[tagCount].figId = node->tag_ID;
tagCount++;
}
return tagCount;
}
bool RFID::programTag(Com::TagInfoRecord *tagToProgram) {
byte comSize = sizeof(comData);
mfrc.uid.size = 4;
*(uint32_t*)(mfrc.uid.uidByte) = tagToProgram->uid;
mfrc.PICC_WakeupA(comData, &comSize);
if (mfrc.PICC_Select(&mfrc.uid, mfrc.uid.size) != MFRC522Constants::STATUS_OK) {
Serial.println("Failed to wakeup for programming. Is tag still there ?\n");
mfrc.PICC_HaltA();
return false;
}
if (!writeBlock(mfrc.uid, tagIdBlock, tagToProgram->figId)) {
Serial.println("Failed to program tag.");
return false;
}
return true;
}
uidNode* RFID::addActiveTag(const MFRC522Constants::Uid &newTag) {
if (!nextFreeTagSlot) {
return nullptr;