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

Merge pull request #77 from lorneb/revert-76-master

Browse Source 
Revert "Move strings to PROGMEM string tables"
This commit is contained in:
Miki Balboa
2015-02-01 10:52:36 -06:00
parent e04a584782 8f4d3cd542
commit 857d4c2bf3
2 changed files with 35 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
MFRC522.cpp
View File

@@ -6,7 +6,6 @@
#include <Arduino.h>
#include <MFRC522.h>
#include <avr/pgmspace.h>
/////////////////////////////////////////////////////////////////////////////////////
// Functions for setting up the Arduino
@@ -1073,11 +1072,20 @@ byte MFRC522::PCD_MIFARE_Transceive( byte *sendData, ///< Pointer to the data t
*/
const char *MFRC522::GetStatusCodeName(byte code ///< One of the StatusCode enums.
) {
if (code == 0 || code > STATUS_MIFARE_NACK) {
switch (code) {
case STATUS_OK: return "Success."; break;
case STATUS_ERROR: return "Error in communication."; break;
case STATUS_COLLISION: return "Collission detected."; break;
case STATUS_TIMEOUT: return "Timeout in communication."; break;
case STATUS_NO_ROOM: return "A buffer is not big enough."; break;
case STATUS_INTERNAL_ERROR: return "Internal error in the code. Should not happen."; break;
case STATUS_INVALID: return "Invalid argument."; break;
case STATUS_CRC_WRONG: return "The CRC_A does not match."; break;
case STATUS_MIFARE_NACK: return "A MIFARE PICC responded with NAK."; break;
default:
return "Unknown error";
break;
}
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_StatusCodeName[code - 1])));
return stringBuffer;
} // End GetStatusCodeName()
/**
@@ -1119,12 +1127,19 @@ byte MFRC522::PICC_GetType(byte sak ///< The SAK byte returned from PICC_Select
*/
const char *MFRC522::PICC_GetTypeName(byte piccType ///< One of the PICC_Type enums.
) {
if (piccType == PICC_TYPE_UNKNOWN) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_PICC_TYPE_NOT_COMPLETE])));
} else {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_PICC_TypeName[piccType])));
switch (piccType) {
case PICC_TYPE_ISO_14443_4: return "PICC compliant with ISO/IEC 14443-4"; break;
case PICC_TYPE_ISO_18092: return "PICC compliant with ISO/IEC 18092 (NFC)"; break;
case PICC_TYPE_MIFARE_MINI: return "MIFARE Mini, 320 bytes"; break;
case PICC_TYPE_MIFARE_1K: return "MIFARE 1KB"; break;
case PICC_TYPE_MIFARE_4K: return "MIFARE 4KB"; break;
case PICC_TYPE_MIFARE_UL: return "MIFARE Ultralight or Ultralight C"; break;
case PICC_TYPE_MIFARE_PLUS: return "MIFARE Plus"; break;
case PICC_TYPE_TNP3XXX: return "MIFARE TNP3XXX"; break;
case PICC_TYPE_NOT_COMPLETE: return "SAK indicates UID is not complete."; break;
case PICC_TYPE_UNKNOWN:
default: return "Unknown type"; break;
}
return stringBuffer;
} // End PICC_GetTypeName()
/**
@@ -1169,8 +1184,7 @@ void MFRC522::PICC_DumpToSerial(Uid *uid ///< Pointer to Uid struct returned fro
case PICC_TYPE_ISO_18092:
case PICC_TYPE_MIFARE_PLUS:
case PICC_TYPE_TNP3XXX:
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_PICC_TYPE_TNP3XXX])));
Serial.println(stringBuffer);
Serial.println("Dumping memory contents not implemented for that PICC type.");
break;
case PICC_TYPE_UNKNOWN:
@@ -1444,8 +1458,7 @@ bool MFRC522::MIFARE_OpenUidBackdoor(bool logErrors) {
byte status = PCD_TransceiveData(&cmd, (byte)1, response, &received, &validBits, (byte)0, false); // 40
if( status != STATUS_OK ) {
if( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_NO_RESPONSE_AFTER_HALT])));
Serial.println(stringBuffer);
Serial.println("Card did not respond to 0x40 after HALT command. Are you sure it is a UID changeable one?");
Serial.print("Error name: ");
Serial.println(GetStatusCodeName(status));
}
@@ -1453,8 +1466,7 @@ bool MFRC522::MIFARE_OpenUidBackdoor(bool logErrors) {
}
if ( received != 1 || response[0] != 0x0A ) {
if ( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_COMMAND_0x40_RESPONSE])));
Serial.print(stringBuffer);
Serial.print("Got bad response on backdoor 0x40 command: ");
Serial.print(response[0], HEX);
Serial.print(" (");
Serial.print(validBits);
@@ -1468,8 +1480,7 @@ bool MFRC522::MIFARE_OpenUidBackdoor(bool logErrors) {
status = PCD_TransceiveData(&cmd, (byte)1, response, &received, &validBits, (byte)0, false); // 43
if( status != STATUS_OK ) {
if( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_COMMAND_0x43_COMM])));
Serial.println(stringBuffer);
Serial.println("Error in communication at command 0x43, after successfully executing 0x40");
Serial.print("Error name: ");
Serial.println(GetStatusCodeName(status));
}
@@ -1477,8 +1488,7 @@ bool MFRC522::MIFARE_OpenUidBackdoor(bool logErrors) {
}
if ( received != 1 || response[0] != 0x0A ) {
if ( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_COMMAND_0x43_RESPONSE])));
Serial.print(stringBuffer);
Serial.print("Got bad response on backdoor 0x43 command: ");
Serial.print(response[0], HEX);
Serial.print(" (");
Serial.print(validBits);
@@ -1504,8 +1514,7 @@ bool MFRC522::MIFARE_SetUid(byte* newUid, byte uidSize, bool logErrors) {
// UID + BCC byte can not be larger than 16 together
if ( !newUid || !uidSize || uidSize > 15) {
if ( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_WRONG_UID])));
Serial.println(stringBuffer);
Serial.println("New UID buffer empty, size 0, or size > 15 given");
}
return false;
}
@@ -1524,8 +1533,7 @@ bool MFRC522::MIFARE_SetUid(byte* newUid, byte uidSize, bool logErrors) {
// PICC_WakeupA(atqa_answer, &atqa_size);
if ( !PICC_IsNewCardPresent() || !PICC_ReadCardSerial() ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_NO_CARD])));
Serial.println(stringBuffer);
Serial.println("No card was previously selected, and none are available. Failed to set UID.");
return false;
}
@@ -1533,8 +1541,7 @@ bool MFRC522::MIFARE_SetUid(byte* newUid, byte uidSize, bool logErrors) {
if ( status != STATUS_OK ) {
// We tried, time to give up
if ( logErrors ) {
strcpy_P(stringBuffer, (char*)pgm_read_word(&(_MFRC522_str_Error[ERR_AUTH_KEY_A])));
Serial.println(stringBuffer);
Serial.println("Failed to authenticate to card for reading, could not set UID: ");
Serial.println(GetStatusCodeName(status));
}
return false;

88
MFRC522.h
View File

@@ -78,88 +78,6 @@
#include <Arduino.h>
#include <SPI.h>
/////////////////////////////////////////////////////////////////////////////////////
// String tables to be stored in program memory
/////////////////////////////////////////////////////////////////////////////////////
const char _MFRC522_str_STATUS_OK[] PROGMEM = "Success.";
const char _MFRC522_str_STATUS_ERROR[] PROGMEM = "Error in communication.";
const char _MFRC522_str_STATUS_COLLISION[] PROGMEM = "Collission detected.";
const char _MFRC522_str_STATUS_TIMEOUT[] PROGMEM = "Timeout in communication.";
const char _MFRC522_str_STATUS_NO_ROOM[] PROGMEM = "A buffer is not big enough.";
const char _MFRC522_str_STATUS_INTERNAL_ERROR[] PROGMEM = "Internal error in the code. Should not happen.";
const char _MFRC522_str_STATUS_INVALID[] PROGMEM = "Invalid argument.";
const char _MFRC522_str_STATUS_CRC_WRONG[] PROGMEM = "The CRC_A does not match.";
const char _MFRC522_str_STATUS_MIFARE_NACK[] PROGMEM = "A MIFARE PICC responded with NAK.";
const char* const _MFRC522_str_StatusCodeName[] PROGMEM {
_MFRC522_str_STATUS_OK,
_MFRC522_str_STATUS_ERROR,
_MFRC522_str_STATUS_COLLISION,
_MFRC522_str_STATUS_TIMEOUT,
_MFRC522_str_STATUS_NO_ROOM,
_MFRC522_str_STATUS_INTERNAL_ERROR,
_MFRC522_str_STATUS_INVALID,
_MFRC522_str_STATUS_CRC_WRONG,
_MFRC522_str_STATUS_MIFARE_NACK
};
const char _MFRC522_str_PICC_TYPE_UNKNOWN[] PROGMEM = "Unknown type";
const char _MFRC522_str_PICC_TYPE_ISO_14443_4[] PROGMEM = "PICC compliant with ISO/IEC 14443-4";
const char _MFRC522_str_PICC_TYPE_ISO_18092[] PROGMEM = "PICC compliant with ISO/IEC 18092 (NFC)";
const char _MFRC522_str_PICC_TYPE_MIFARE_MINI[] PROGMEM = "MIFARE Mini, 320 bytes";
const char _MFRC522_str_PICC_TYPE_MIFARE_1K[] PROGMEM = "MIFARE 1KB";
const char _MFRC522_str_PICC_TYPE_MIFARE_4K[] PROGMEM = "MIFARE 4KB";
const char _MFRC522_str_PICC_TYPE_MIFARE_UL[] PROGMEM = "MIFARE Ultralight or Ultralight C";
const char _MFRC522_str_PICC_TYPE_MIFARE_PLUS[] PROGMEM = "MIFARE Plus";
const char _MFRC522_str_PICC_TYPE_TNP3XXX[] PROGMEM = "MIFARE TNP3XXX";
const char* const _MFRC522_str_PICC_TypeName[] PROGMEM {
_MFRC522_str_PICC_TYPE_UNKNOWN,
_MFRC522_str_PICC_TYPE_ISO_14443_4,
_MFRC522_str_PICC_TYPE_ISO_18092,
_MFRC522_str_PICC_TYPE_MIFARE_MINI,
_MFRC522_str_PICC_TYPE_MIFARE_1K,
_MFRC522_str_PICC_TYPE_MIFARE_4K,
_MFRC522_str_PICC_TYPE_MIFARE_UL,
_MFRC522_str_PICC_TYPE_MIFARE_PLUS,
_MFRC522_str_PICC_TYPE_TNP3XXX
};
const char _MFRC522_str_ERR_PICC_TYPE_NOT_COMPLETE[] PROGMEM = "SAK indicates UID is not complete.";
const char _MFRC522_str_ERR_PICC_TYPE_TNP3XXX[] PROGMEM = "Dumping memory contents not implemented for that PICC type.";
const char _MFRC522_str_ERR_NO_RESPONSE_AFTER_HALT[] PROGMEM = "Card did not respond to 0x40 after HALT command. Are you sure it is a UID changeable one?";
const char _MFRC522_str_ERR_COMMAND_0x40_RESPONSE[] PROGMEM = "Got bad response on backdoor 0x40 command: ";
const char _MFRC522_str_ERR_COMMAND_0x43_COMM[] PROGMEM = "Error in communication at command 0x43, after successfully executing 0x40";
const char _MFRC522_str_ERR_COMMAND_0x43_RESPONSE[] PROGMEM = "Got bad response on backdoor 0x43 command: ";
const char _MFRC522_str_ERR_WRONG_UID[] PROGMEM = "New UID buffer empty, size 0, or size > 15 given";
const char _MFRC522_str_ERR_NO_CARD[] PROGMEM = "No card was previously selected, and none are available. Failed to set UID.";
const char _MFRC522_str_ERR_AUTH_KEY_A[] PROGMEM = "Failed to authenticate to card for reading, could not set UID: ";
enum _MFRC522_str_Error {
ERR_PICC_TYPE_NOT_COMPLETE,
ERR_PICC_TYPE_TNP3XXX,
ERR_NO_RESPONSE_AFTER_HALT,
ERR_COMMAND_0x40_RESPONSE,
ERR_COMMAND_0x43_COMM,
ERR_COMMAND_0x43_RESPONSE,
ERR_WRONG_UID,
ERR_NO_CARD,
ERR_AUTH_KEY_A
};
const char* const _MFRC522_str_Error[] PROGMEM {
_MFRC522_str_ERR_PICC_TYPE_NOT_COMPLETE,
_MFRC522_str_ERR_PICC_TYPE_TNP3XXX,
_MFRC522_str_ERR_NO_RESPONSE_AFTER_HALT,
_MFRC522_str_ERR_COMMAND_0x40_RESPONSE,
_MFRC522_str_ERR_COMMAND_0x43_COMM,
_MFRC522_str_ERR_COMMAND_0x43_RESPONSE,
_MFRC522_str_ERR_WRONG_UID,
_MFRC522_str_ERR_NO_CARD,
_MFRC522_str_ERR_AUTH_KEY_A
};
class MFRC522 {
public:
// MFRC522 registers. Described in chapter 9 of the datasheet.
@@ -300,7 +218,7 @@ public:
MF_KEY_SIZE = 6 // A Mifare Crypto1 key is 6 bytes.
};
// PICC types we can detect. Remember to update string tables and PICC_GetTypeName() if you add more.
// PICC types we can detect. Remember to update PICC_GetTypeName() if you add more.
enum PICC_Type {
PICC_TYPE_UNKNOWN = 0,
PICC_TYPE_ISO_14443_4 = 1, // PICC compliant with ISO/IEC 14443-4
@@ -314,7 +232,7 @@ public:
PICC_TYPE_NOT_COMPLETE = 255 // SAK indicates UID is not complete.
};
// Return codes from the functions in this class. Remember to update string tables and GetStatusCodeName() if you add more.
// Return codes from the functions in this class. Remember to update GetStatusCodeName() if you add more.
enum StatusCode {
STATUS_OK = 1, // Success
STATUS_ERROR = 2, // Error in communication
@@ -426,8 +344,6 @@ private:
byte _chipSelectPin; // Arduino pin connected to MFRC522's SPI slave select input (Pin 24, NSS, active low)
byte _resetPowerDownPin; // Arduino pin connected to MFRC522's reset and power down input (Pin 6, NRSTPD, active low)
byte MIFARE_TwoStepHelper(byte command, byte blockAddr, long data);
char stringBuffer[100];
};
#endif