trotFunky/Projet_Barbapapa_Firmware
1
0
Fork 0
Code Activity

Compare commits

base: trotFunky:5618f52a0e444866ac6617b06333fe0a8b72fae3
Branches Tags
trotFunky:main
trotFunky:v1.0
..
compare: trotFunky:d38b534bbe78453198bc9716706118782bda31c6
Branches Tags
trotFunky:main
trotFunky:v1.0

2 commits
5618f52a0e ... d38b534bbe

Author SHA1 Message Date
Teo-CD
d38b534bbe RFID: Track ID changes 
We keep track of the detected tag UUIDs and their figurine ID, but
we don't update it when a programming request succeeds.
Search through the tracked tags for the programmed UUID and update
the stored ID when the change suceeds.
 2024-03-05 23:56:00 +00:00
Teo-CD
c92c8ce11f RFID: Fix buffer size for writes 
The RFID library expects a 16 bytes buffer for writing blocks.
However, we re-use the 18 bytes buffer needed for reading blocks.
Properly remove those two extra bytes when writing blocks.
 2024-03-05 23:54:24 +00:00
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/RFID.cpp
View file

@ -100,6 +100,15 @@ bool RFID::programTag(Com::TagInfoRecord *tagToProgram) {
Serial.println("Failed to program tag.");
return false;
}
// Programming succeeded, update the tracked ID of the tag.
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.
if ( *(uint32_t*)(node->uid.uidByte) == tagToProgram->uid)
node->tag_ID = tagToProgram->figId;
}
return true;
}
@ -161,7 +170,8 @@ bool RFID::writeBlock(MFRC522Constants::Uid &uidToRead, byte blockAddr, uint8_t
return false;
}
byte size = sizeof(comData);
// Take into account the two bytes used only for the read commands.
byte size = sizeof(comData) - 2;
for (byte& bufferByte: comData)
bufferByte = 0;