libs/RFID.MFRC522
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve code style

Browse Source 
include if in switch
This commit is contained in:
Rotzbua
2015-12-05 21:17:44 +01:00
parent 36128c273b
commit 00394472fe
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MFRC522.cpp
View File

@@ -1189,14 +1189,13 @@ const __FlashStringHelper *MFRC522::GetStatusCodeName(MFRC522::StatusCode code /
*/ */
MFRC522::PICC_Type MFRC522::PICC_GetType(byte sak ///< The SAK byte returned from PICC_Select(). MFRC522::PICC_Type MFRC522::PICC_GetType(byte sak ///< The SAK byte returned from PICC_Select().
) { ) {
if (sak & 0x04) { // UID not complete // http://www.nxp.com/documents/application_note/AN10833.pdf
return PICC_TYPE_NOT_COMPLETE; // 3.2 Coding of Select Acknowledge (SAK)
} // ignore 8-bit (iso14443 starts with LSBit = bit 1)
//http://www.nxp.com/documents/application_note/AN10833.pdf // fixes wrong type for manufacturer Infineon (http://nfc-tools.org/index.php?title=ISO14443A)
//3.2 Coding of Select Acknowledge (SAK) sak &= 0x7F;
//ignore 8-bit
sak&=0x7F;
switch (sak) { switch (sak) {
case 0x04: return PICC_TYPE_NOT_COMPLETE; // UID not complete
case 0x09: return PICC_TYPE_MIFARE_MINI; case 0x09: return PICC_TYPE_MIFARE_MINI;
case 0x08: return PICC_TYPE_MIFARE_1K; case 0x08: return PICC_TYPE_MIFARE_1K;
case 0x18: return PICC_TYPE_MIFARE_4K; case 0x18: return PICC_TYPE_MIFARE_4K;
@@ -1204,17 +1203,10 @@ MFRC522::PICC_Type MFRC522::PICC_GetType(byte sak ///< The SAK byte returned fr
case 0x10: case 0x10:
case 0x11: return PICC_TYPE_MIFARE_PLUS; case 0x11: return PICC_TYPE_MIFARE_PLUS;
case 0x01: return PICC_TYPE_TNP3XXX; case 0x01: return PICC_TYPE_TNP3XXX;
case 0x20: return PICC_TYPE_ISO_14443_4;
case 0x40: return PICC_TYPE_ISO_18092;
default: return PICC_TYPE_UNKNOWN;
} }
if (sak & 0x20) {
return PICC_TYPE_ISO_14443_4;
}
if (sak & 0x40) {
return PICC_TYPE_ISO_18092;
}
return PICC_TYPE_UNKNOWN;
} // End PICC_GetType() } // End PICC_GetType()
/** /**