brmlab/brmdoor
4
0
Fork 0
mirror of https://github.com/brmlab/brmdoor.git synced 2025-06-07 19:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Created new ACL list that can store full card UIDs up to 10 bytes (max UID length by NXP specs).

Browse source
This commit is contained in:
Ondrej Mikle 2014-03-26 15:05:13 +01:00
parent 823b186bd7
commit 735728dfc5
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
brmdoor/brmdoor.ino
View file

@ -61,7 +61,7 @@ int videoState = 0, videoStateOverride = 0;
*/ */
typedef struct ACLdataBroken { typedef struct ACLdataBroken {
byte cardId[7]; byte cardId[7];
char *nick; const char *nick;
} ACLRecordBroken; } ACLRecordBroken;
/*! /*!
@ -77,8 +77,8 @@ ACLRecordBroken ACL[] = {
/*! Structure for correct card UIDs */ /*! Structure for correct card UIDs */
typedef struct ACLdataProper { typedef struct ACLdataProper {
uint8_t uidLength; uint8_t uidLength;
const uint8_t *uid; uint8_t uid[10];
char *nick; const char *nick;
} ACLRecordProper; } ACLRecordProper;
/*! /*!
@ -96,7 +96,7 @@ ACLRecordProper ACLproper[] = {
* Format of each array item is { UID_length, { UID_bytes }, nickname } * Format of each array item is { UID_length, { UID_bytes }, nickname }
*/ */
#include "cardids_proper.h" #include "cardids_proper.h"
{ 0, {0x00,}, "terminator, don't delete this element!" } { 0, {0x00}, "terminator, don't delete this element!" }
}; };
// Let's hope aliasing won't break this. // Let's hope aliasing won't break this.
@ -230,7 +230,7 @@ int properACLSearch(const uint8_t *uid, uint8_t length, const struct ACLdataProp
for(int i=0; ; i++) { for(int i=0; ; i++) {
const ACLRecordProper& acl = acls[i]; const ACLRecordProper& acl = acls[i];
if (acls.uidLength == 0) { if (acl.uidLength == 0) {
break; // reached terminator, no more elements break; // reached terminator, no more elements
} }
@ -309,9 +309,9 @@ bool readCardPN532()
return false; return false;
} }
// OK we got some known card // OK we got some known card, print its nick from respective ACL array
comSerial.write("CARD "); comSerial.write("CARD ");
comSerial.write(ACL[aclIdx].nick); comSerial.write(proper ? ACLproper[aclIdx].nick : ACL[aclIdx].nick);
if (printFullUID) { if (printFullUID) {
comSerial.write(" "); comSerial.write(" ");