From f9da64e844e0250865a9d107a58e13a77afee403 Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Tue, 5 Jan 2016 11:40:37 +0100 Subject: [PATCH 1/2] fix compile error #163 --- examples/ReadNUID/ReadNUID.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ReadNUID/ReadNUID.ino b/examples/ReadNUID/ReadNUID.ino index b02b204..a66ca8a 100644 --- a/examples/ReadNUID/ReadNUID.ino +++ b/examples/ReadNUID/ReadNUID.ino @@ -66,7 +66,7 @@ void loop() { return; Serial.print(F("PICC type: ")); - byte piccType = rfid.PICC_GetType(rfid.uid.sak); + MFRC522::PICC_Type piccType = rfid.PICC_GetType(rfid.uid.sak); Serial.println(rfid.PICC_GetTypeName(piccType)); // Check is the PICC of Classic MIFARE type @@ -96,7 +96,7 @@ void loop() { printDec(rfid.uid.uidByte, rfid.uid.size); Serial.println(); } - else Serial.println("Card read previously."); + else Serial.println(F("Card read previously.")); // Halt PICC rfid.PICC_HaltA(); From 29cc669a68ec78579329293d4715ebee203776cc Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Tue, 5 Jan 2016 11:57:36 +0100 Subject: [PATCH 2/2] code format use 2 space for 1 tab like arduino ide --- examples/ReadNUID/ReadNUID.ino | 114 ++++++++++++++++----------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/examples/ReadNUID/ReadNUID.ino b/examples/ReadNUID/ReadNUID.ino index a66ca8a..4bfd027 100644 --- a/examples/ReadNUID/ReadNUID.ino +++ b/examples/ReadNUID/ReadNUID.ino @@ -42,67 +42,67 @@ MFRC522::MIFARE_Key key; byte nuidPICC[3]; void setup() { - Serial.begin(9600); - SPI.begin(); // Init SPI bus - rfid.PCD_Init(); // Init MFRC522 + Serial.begin(9600); + SPI.begin(); // Init SPI bus + rfid.PCD_Init(); // Init MFRC522 - for (byte i = 0; i < 6; i++) { - key.keyByte[i] = 0xFF; - } + for (byte i = 0; i < 6; i++) { + key.keyByte[i] = 0xFF; + } - Serial.println(F("This code scan the MIFARE Classsic NUID.")); - Serial.print(F("Using the following key:")); - printHex(key.keyByte, MFRC522::MF_KEY_SIZE); + Serial.println(F("This code scan the MIFARE Classsic NUID.")); + Serial.print(F("Using the following key:")); + printHex(key.keyByte, MFRC522::MF_KEY_SIZE); } void loop() { - // Look for new cards - if ( ! rfid.PICC_IsNewCardPresent()) - return; + // Look for new cards + if ( ! rfid.PICC_IsNewCardPresent()) + return; - // Verify if the NUID has been readed - if ( ! rfid.PICC_ReadCardSerial()) - return; + // Verify if the NUID has been readed + if ( ! rfid.PICC_ReadCardSerial()) + return; - Serial.print(F("PICC type: ")); - MFRC522::PICC_Type piccType = rfid.PICC_GetType(rfid.uid.sak); - Serial.println(rfid.PICC_GetTypeName(piccType)); + Serial.print(F("PICC type: ")); + MFRC522::PICC_Type piccType = rfid.PICC_GetType(rfid.uid.sak); + Serial.println(rfid.PICC_GetTypeName(piccType)); - // Check is the PICC of Classic MIFARE type - if (piccType != MFRC522::PICC_TYPE_MIFARE_MINI && - piccType != MFRC522::PICC_TYPE_MIFARE_1K && - piccType != MFRC522::PICC_TYPE_MIFARE_4K) { - Serial.println(F("Your tag is not of type MIFARE Classic.")); - return; + // Check is the PICC of Classic MIFARE type + if (piccType != MFRC522::PICC_TYPE_MIFARE_MINI && + piccType != MFRC522::PICC_TYPE_MIFARE_1K && + piccType != MFRC522::PICC_TYPE_MIFARE_4K) { + Serial.println(F("Your tag is not of type MIFARE Classic.")); + return; + } + + if (rfid.uid.uidByte[0] != nuidPICC[0] || + rfid.uid.uidByte[1] != nuidPICC[1] || + rfid.uid.uidByte[2] != nuidPICC[2] || + rfid.uid.uidByte[3] != nuidPICC[3] ) { + Serial.println(F("A new card has been detected.")); + + // Store NUID into nuidPICC array + for (byte i = 0; i < 4; i++) { + nuidPICC[i] = rfid.uid.uidByte[i]; } + + Serial.println(F("The NUID tag is:")); + Serial.print(F("In hex: ")); + printHex(rfid.uid.uidByte, rfid.uid.size); + Serial.println(); + Serial.print(F("In dec: ")); + printDec(rfid.uid.uidByte, rfid.uid.size); + Serial.println(); + } + else Serial.println(F("Card read previously.")); - if (rfid.uid.uidByte[0] != nuidPICC[0] || - rfid.uid.uidByte[1] != nuidPICC[1] || - rfid.uid.uidByte[2] != nuidPICC[2] || - rfid.uid.uidByte[3] != nuidPICC[3] ) { - Serial.println(F("A new card has been detected.")); + // Halt PICC + rfid.PICC_HaltA(); - // Store NUID into nuidPICC array - for (byte i = 0; i < 4; i++) { - nuidPICC[i] = rfid.uid.uidByte[i]; - } - - Serial.println(F("The NUID tag is:")); - Serial.print(F("In hex: ")); - printHex(rfid.uid.uidByte, rfid.uid.size); - Serial.println(); - Serial.print(F("In dec: ")); - printDec(rfid.uid.uidByte, rfid.uid.size); - Serial.println(); - } - else Serial.println(F("Card read previously.")); - - // Halt PICC - rfid.PICC_HaltA(); - - // Stop encryption on PCD - rfid.PCD_StopCrypto1(); + // Stop encryption on PCD + rfid.PCD_StopCrypto1(); } @@ -110,18 +110,18 @@ void loop() { * Helper routine to dump a byte array as hex values to Serial. */ void printHex(byte *buffer, byte bufferSize) { - for (byte i = 0; i < bufferSize; i++) { - Serial.print(buffer[i] < 0x10 ? " 0" : " "); - Serial.print(buffer[i], HEX); - } + for (byte i = 0; i < bufferSize; i++) { + Serial.print(buffer[i] < 0x10 ? " 0" : " "); + Serial.print(buffer[i], HEX); + } } /** * Helper routine to dump a byte array as dec values to Serial. */ void printDec(byte *buffer, byte bufferSize) { - for (byte i = 0; i < bufferSize; i++) { - Serial.print(buffer[i] < 0x10 ? " 0" : " "); - Serial.print(buffer[i], DEC); - } + for (byte i = 0; i < bufferSize; i++) { + Serial.print(buffer[i] < 0x10 ? " 0" : " "); + Serial.print(buffer[i], DEC); + } } \ No newline at end of file