PN532 NFC library for Seeed Studio's NFC Shield

Fork of PN532 by Yihui Xiong

Revision:
1:b8cab5222fd0
Parent:
0:9c6b9280c0e1
Child:
2:f618fb2169c4
diff -r 9c6b9280c0e1 -r b8cab5222fd0 PN532.cpp
--- a/PN532.cpp	Tue Oct 08 08:33:22 2013 +0000
+++ b/PN532.cpp	Thu Oct 17 06:37:26 2013 +0000
@@ -1,8 +1,37 @@
-/**
- * \file    PN532.cpp
- * \brief   PN532 NFC library, Ported from https://github.com/Seeed-Studio/PN532 for Arduino
- * \license BSD
- */
+/**************************************************************************/
+/*!
+    @file     PN532.cpp
+    @author   Adafruit Industries & Seeed Technology Inc.
+    @license  BSD (see license.txt)
+
+    NXP's PN532 NFC/13.56MHz RFID Transceiver
+
+    @section  HISTORY
+    v1.6 - Ported to mbed
+
+    v1.5 - Modified to support I2C and SPI
+
+    v1.4 - Added setPassiveActivationRetries()
+
+    v1.3 - Modified to work with I2C
+
+    v1.2 - Added writeGPIO()
+         - Added readGPIO()
+
+    v1.1 - Changed readPassiveTargetID() to handle multiple UID sizes
+         - Added the following helper functions for text display
+             static void PrintHex(const uint8_t * data, const uint32_t numBytes)
+             static void PrintHexChar(const uint8_t * pbtData, const uint32_t numBytes)
+         - Added the following Mifare Classic functions:
+             bool mifareclassic_IsFirstBlock (uint32_t uiBlock)
+             bool mifareclassic_IsTrailerBlock (uint32_t uiBlock)
+             uint8_t mifareclassic_AuthenticateBlock (uint8_t * uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t * keyData)
+             uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t * data)
+             uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t * data)
+         - Added the following Mifare Ultalight functions:
+             uint8_t mifareultralight_ReadPage (uint8_t page, uint8_t * buffer)
+*/
+/**************************************************************************/
 
 #include <string.h>
 #include "PN532.h"
@@ -21,10 +50,10 @@
 #define PN532_PACKBUFFSIZ 128
 uint8_t pn532_packetbuffer[PN532_PACKBUFFSIZ];
 
-    
+
 PN532::PN532(PN532Interface &interface)
 {
-  _interface = &interface;
+    _interface = &interface;
 }
 
 PN532::PN532(PinName mosi, PinName miso, PinName sclk, PinName cs)
@@ -41,7 +70,7 @@
 }
 
 /**************************************************************************/
-/*! 
+/*!
     @brief  Setups the HW
 */
 /**************************************************************************/
@@ -50,470 +79,461 @@
     HAL(begin)();
     HAL(wakeup)();
 }
- 
+
 /**************************************************************************/
-/*! 
+/*!
     @brief  Prints a hexadecimal value in plain characters
 
     @param  data      Pointer to the uint8_t data
     @param  numBytes  Data length in bytes
 */
 /**************************************************************************/
-void PN532::PrintHex(const uint8_t * data, const uint32_t numBytes)
+void PN532::PrintHex(const uint8_t *data, const uint32_t numBytes)
 {
-
+    for (uint8_t i = 0; i < numBytes; i++) {
+        DMSG("0x");
+        DMSG_HEX(data[i]);
+    }
+    DMSG("\n");
 }
 
 /**************************************************************************/
-/*! 
+/*!
     @brief  Prints a hexadecimal value in plain characters, along with
             the char equivalents in the following format
 
             00 00 00 00 00 00  ......
 
-    @param  data      Pointer to the uint8_t data
+    @param  data      Pointer to the data
     @param  numBytes  Data length in bytes
 */
 /**************************************************************************/
-void PN532::PrintHexChar(const uint8_t * data, const uint32_t numBytes)
+void PN532::PrintHexChar(const uint8_t *data, const uint32_t numBytes)
 {
-
+    for (uint8_t i = 0; i < numBytes; i++) {
+        DMSG("0x");
+        DMSG_HEX(data[i]);
+    }
+    DMSG("\n");
 }
- 
+
 /**************************************************************************/
-/*! 
+/*!
     @brief  Checks the firmware version of the PN5xx chip
 
     @returns  The chip's firmware version and ID
 */
 /**************************************************************************/
-uint32_t PN532::getFirmwareVersion(void) {
-  uint32_t response;
+uint32_t PN532::getFirmwareVersion(void)
+{
+    uint32_t response;
 
-  pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
+    pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
+
+    if (HAL(writeCommand)(pn532_packetbuffer, 1)) {
+        return 0;
+    }
 
-  if (HAL(writeCommand)(pn532_packetbuffer, 1))
-    return 0;
-    
-  // read data packet
-  int16_t status = HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-  if (0 > status) {
-    DMSG("GetFirmwareVersion: error code");
-    return 0;
-  }
-  
-  response = pn532_packetbuffer[0];
-  response <<= 8;
-  response |= pn532_packetbuffer[1];
-  response <<= 8;
-  response |= pn532_packetbuffer[2];
-  response <<= 8;
-  response |= pn532_packetbuffer[3];
+    // read data packet
+    int16_t status = HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+    if (0 > status) {
+        return 0;
+    }
 
-  return response;
+    response = pn532_packetbuffer[0];
+    response <<= 8;
+    response |= pn532_packetbuffer[1];
+    response <<= 8;
+    response |= pn532_packetbuffer[2];
+    response <<= 8;
+    response |= pn532_packetbuffer[3];
+
+    return response;
 }
 
 
 /**************************************************************************/
-/*! 
+/*!
     Writes an 8-bit value that sets the state of the PN532's GPIO pins
-    
+
     @warning This function is provided exclusively for board testing and
              is dangerous since it will throw an error if any pin other
              than the ones marked "Can be used as GPIO" are modified!  All
              pins that can not be used as GPIO should ALWAYS be left high
              (value = 1) or the system will become unstable and a HW reset
              will be required to recover the PN532.
-    
+
              pinState[0]  = P30     Can be used as GPIO
              pinState[1]  = P31     Can be used as GPIO
              pinState[2]  = P32     *** RESERVED (Must be 1!) ***
              pinState[3]  = P33     Can be used as GPIO
              pinState[4]  = P34     *** RESERVED (Must be 1!) ***
              pinState[5]  = P35     Can be used as GPIO
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-bool PN532::writeGPIO(uint8_t pinstate) {
-  uint8_t errorbit;
+bool PN532::writeGPIO(uint8_t pinstate)
+{
+    // Make sure pinstate does not try to toggle P32 or P34
+    pinstate |= (1 << PN532_GPIO_P32) | (1 << PN532_GPIO_P34);
+
+    // Fill command buffer
+    pn532_packetbuffer[0] = PN532_COMMAND_WRITEGPIO;
+    pn532_packetbuffer[1] = PN532_GPIO_VALIDATIONBIT | pinstate;  // P3 Pins
+    pn532_packetbuffer[2] = 0x00;    // P7 GPIO Pins (not used ... taken by I2C)
 
-  // Make sure pinstate does not try to toggle P32 or P34
-  pinstate |= (1 << PN532_GPIO_P32) | (1 << PN532_GPIO_P34);
-  
-  // Fill command buffer
-  pn532_packetbuffer[0] = PN532_COMMAND_WRITEGPIO;
-  pn532_packetbuffer[1] = PN532_GPIO_VALIDATIONBIT | pinstate;  // P3 Pins
-  pn532_packetbuffer[2] = 0x00;    // P7 GPIO Pins (not used ... taken by I2C)
+    DMSG("Writing P3 GPIO: ");
+    DMSG_HEX(pn532_packetbuffer[1]);
+    DMSG("\n");
 
-  DMSG("Writing P3 GPIO: ");
-  DMSG_HEX(pn532_packetbuffer[1]);
+    // Send the WRITEGPIO command (0x0E)
+    if (HAL(writeCommand)(pn532_packetbuffer, 3))
+        return 0;
 
-  // Send the WRITEGPIO command (0x0E)  
-  if (HAL(writeCommand)(pn532_packetbuffer, 3))
-    return 0;
-  
-  return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+    return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
 }
 
 /**************************************************************************/
-/*! 
+/*!
     Reads the state of the PN532's GPIO pins
-    
+
     @returns An 8-bit value containing the pin state where:
-    
-             pinState[0]  = P30     
-             pinState[1]  = P31     
-             pinState[2]  = P32     
-             pinState[3]  = P33     
-             pinState[4]  = P34     
-             pinState[5]  = P35     
+
+             pinState[0]  = P30
+             pinState[1]  = P31
+             pinState[2]  = P32
+             pinState[3]  = P33
+             pinState[4]  = P34
+             pinState[5]  = P35
 */
 /**************************************************************************/
-uint8_t PN532::readGPIO(void) {
-  pn532_packetbuffer[0] = PN532_COMMAND_READGPIO;
+uint8_t PN532::readGPIO(void)
+{
+    pn532_packetbuffer[0] = PN532_COMMAND_READGPIO;
 
-  // Send the READGPIO command (0x0C)  
-  if (HAL(writeCommand)(pn532_packetbuffer, 1))
-    return 0x0;
-  
-  HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+    // Send the READGPIO command (0x0C)
+    if (HAL(writeCommand)(pn532_packetbuffer, 1))
+        return 0x0;
+
+    HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+    /* READGPIO response without prefix and suffix should be in the following format:
 
-  /* READGPIO response without prefix and suffix should be in the following format:
-  
-    uint8_t            Description
-    -------------   ------------------------------------------
-    b0              P3 GPIO Pins
-    b1              P7 GPIO Pins (not used ... taken by I2C)
-    b2              Interface Mode Pins (not used ... bus select pins) 
-  */
-  
+      byte            Description
+      -------------   ------------------------------------------
+      b0              P3 GPIO Pins
+      b1              P7 GPIO Pins (not used ... taken by I2C)
+      b2              Interface Mode Pins (not used ... bus select pins)
+    */
 
-  DMSG("P3 GPIO: "); DMSG_HEX(pn532_packetbuffer[7]);
-  DMSG("P7 GPIO: "); DMSG_HEX(pn532_packetbuffer[8]);
-  DMSG("I0I1 GPIO: "); DMSG_HEX(pn532_packetbuffer[9]);
 
-  return pn532_packetbuffer[0];
+    DMSG("P3 GPIO: "); DMSG_HEX(pn532_packetbuffer[7]);
+    DMSG("P7 GPIO: "); DMSG_HEX(pn532_packetbuffer[8]);
+    DMSG("I0I1 GPIO: "); DMSG_HEX(pn532_packetbuffer[9]);
+    DMSG("\n");
+
+    return pn532_packetbuffer[0];
 }
 
 /**************************************************************************/
-/*! 
+/*!
     @brief  Configures the SAM (Secure Access Module)
 */
 /**************************************************************************/
-bool PN532::SAMConfig(void) {
-  pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
-  pn532_packetbuffer[1] = 0x01; // normal mode;
-  pn532_packetbuffer[2] = 0x14; // timeout 50ms * 20 = 1 second
-  pn532_packetbuffer[3] = 0x01; // use IRQ pin!
-  
-  if (HAL(writeCommand)(pn532_packetbuffer, 4))
-     return false;
+bool PN532::SAMConfig(void)
+{
+    pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
+    pn532_packetbuffer[1] = 0x01; // normal mode;
+    pn532_packetbuffer[2] = 0x14; // timeout 50ms * 20 = 1 second
+    pn532_packetbuffer[3] = 0x01; // use IRQ pin!
 
-  return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+    if (HAL(writeCommand)(pn532_packetbuffer, 4))
+        return false;
+
+    return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
 }
 
 /**************************************************************************/
-/*! 
+/*!
     Sets the MxRtyPassiveActivation uint8_t of the RFConfiguration register
-    
+
     @param  maxRetries    0xFF to wait forever, 0x00..0xFE to timeout
                           after mxRetries
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-bool PN532::setPassiveActivationRetries(uint8_t maxRetries) {
-  pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
-  pn532_packetbuffer[1] = 5;    // Config item 5 (MaxRetries)
-  pn532_packetbuffer[2] = 0xFF; // MxRtyATR (default = 0xFF)
-  pn532_packetbuffer[3] = 0x01; // MxRtyPSL (default = 0x01)
-  pn532_packetbuffer[4] = maxRetries;
-  
-  if (HAL(writeCommand)(pn532_packetbuffer, 5))
-    return 0x0;  // no ACK
-  
-  return 1;
+bool PN532::setPassiveActivationRetries(uint8_t maxRetries)
+{
+    pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
+    pn532_packetbuffer[1] = 5;    // Config item 5 (MaxRetries)
+    pn532_packetbuffer[2] = 0xFF; // MxRtyATR (default = 0xFF)
+    pn532_packetbuffer[3] = 0x01; // MxRtyPSL (default = 0x01)
+    pn532_packetbuffer[4] = maxRetries;
+
+    if (HAL(writeCommand)(pn532_packetbuffer, 5))
+        return 0x0;  // no ACK
+
+    return 1;
 }
 
 /***** ISO14443A Commands ******/
 
 /**************************************************************************/
-/*! 
+/*!
     Waits for an ISO14443A target to enter the field
-    
+
     @param  cardBaudRate  Baud rate of the card
     @param  uid           Pointer to the array that will be populated
                           with the card's UID (up to 7 bytes)
     @param  uidLength     Pointer to the variable that will hold the
                           length of the card's UID.
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-bool PN532::readPassiveTargetID(uint8_t cardbaudrate, uint8_t * uid, uint8_t * uidLength) {
-  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
-  pn532_packetbuffer[1] = 1;  // max 1 cards at once (we can set this to 2 later)
-  pn532_packetbuffer[2] = cardbaudrate;
-  
-  if (HAL(writeCommand)(pn532_packetbuffer, 3))
-  {
-    DMSG("No card(s) read");
-    return 0x0;  // no cards read
-  }
-  
-  // Wait for a card to enter the field
-  uint8_t status = PN532_I2C_BUSY;
- 
-  // read data packet
-  HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-  
-  // check some basic stuff
-  /* ISO14443A card response should be in the following format:
-  
-    uint8_t            Description
-    -------------   ------------------------------------------
-    b0..6           Frame header and preamble
-    b7              Tags Found
-    b8              Tag Number (only one used in this example)
-    b9..10          SENS_RES
-    b11             SEL_RES
-    b12             NFCID Length
-    b13..NFCIDLen   NFCID                                      */
+bool PN532::readPassiveTargetID(uint8_t cardbaudrate, uint8_t *uid, uint8_t *uidLength)
+{
+    pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
+    pn532_packetbuffer[1] = 1;  // max 1 cards at once (we can set this to 2 later)
+    pn532_packetbuffer[2] = cardbaudrate;
+
+    if (HAL(writeCommand)(pn532_packetbuffer, 3)) {
+        return 0x0;  // command failed
+    }
+
+    // read data packet
+    HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+    // check some basic stuff
+    /* ISO14443A card response should be in the following format:
 
-  if (pn532_packetbuffer[0] != 1) 
-    return 0;
-    
-  uint16_t sens_res = pn532_packetbuffer[2];
-  sens_res <<= 8;
-  sens_res |= pn532_packetbuffer[3];
+      byte            Description
+      -------------   ------------------------------------------
+      b0              Tags Found
+      b1              Tag Number (only one used in this example)
+      b2..3           SENS_RES
+      b4              SEL_RES
+      b5              NFCID Length
+      b6..NFCIDLen    NFCID
+    */
+
+    if (pn532_packetbuffer[0] != 1)
+        return 0;
 
-  DMSG("ATQA: 0x");  DMSG_HEX(sens_res); 
-  DMSG("SAK: 0x");  DMSG_HEX(pn532_packetbuffer[4]); 
-  
-  /* Card appears to be Mifare Classic */
-  *uidLength = pn532_packetbuffer[5];
+    uint16_t sens_res = pn532_packetbuffer[2];
+    sens_res <<= 8;
+    sens_res |= pn532_packetbuffer[3];
+
+    DMSG("ATQA: 0x");  DMSG_HEX(sens_res);
+    DMSG("SAK: 0x");  DMSG_HEX(pn532_packetbuffer[4]);
+    DMSG("\n");
 
-  for (uint8_t i=0; i < pn532_packetbuffer[5]; i++) 
-  {
-    uid[i] = pn532_packetbuffer[6+i];
-  }
+    /* Card appears to be Mifare Classic */
+    *uidLength = pn532_packetbuffer[5];
 
-  return 1;
+    for (uint8_t i = 0; i < pn532_packetbuffer[5]; i++) {
+        uid[i] = pn532_packetbuffer[6 + i];
+    }
+
+    return 1;
 }
 
 
 /***** Mifare Classic Functions ******/
 
 /**************************************************************************/
-/*! 
+/*!
       Indicates whether the specified block number is the first block
       in the sector (block 0 relative to the current sector)
 */
 /**************************************************************************/
 bool PN532::mifareclassic_IsFirstBlock (uint32_t uiBlock)
 {
-  // Test if we are in the small or big sectors
-  if (uiBlock < 128)
-    return ((uiBlock) % 4 == 0);
-  else
-    return ((uiBlock) % 16 == 0);
+    // Test if we are in the small or big sectors
+    if (uiBlock < 128)
+        return ((uiBlock) % 4 == 0);
+    else
+        return ((uiBlock) % 16 == 0);
 }
 
 /**************************************************************************/
-/*! 
+/*!
       Indicates whether the specified block number is the sector trailer
 */
 /**************************************************************************/
 bool PN532::mifareclassic_IsTrailerBlock (uint32_t uiBlock)
 {
-  // Test if we are in the small or big sectors
-  if (uiBlock < 128)
-    return ((uiBlock + 1) % 4 == 0);
-  else
-    return ((uiBlock + 1) % 16 == 0);
+    // Test if we are in the small or big sectors
+    if (uiBlock < 128)
+        return ((uiBlock + 1) % 4 == 0);
+    else
+        return ((uiBlock + 1) % 16 == 0);
 }
 
 /**************************************************************************/
-/*! 
+/*!
     Tries to authenticate a block of memory on a MIFARE card using the
     INDATAEXCHANGE command.  See section 7.3.8 of the PN532 User Manual
     for more information on sending MIFARE and other commands.
 
-    @param  uid           Pointer to a uint8_t array containing the card UID
+    @param  uid           Pointer to a byte array containing the card UID
     @param  uidLen        The length (in bytes) of the card's UID (Should
                           be 4 for MIFARE Classic)
     @param  blockNumber   The block number to authenticate.  (0..63 for
                           1KB cards, and 0..255 for 4KB cards).
     @param  keyNumber     Which key type to use during authentication
                           (0 = MIFARE_CMD_AUTH_A, 1 = MIFARE_CMD_AUTH_B)
-    @param  keyData       Pointer to a uint8_t array containing the 6 uint8_t
+    @param  keyData       Pointer to a byte array containing the 6 bytes
                           key value
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-uint8_t PN532::mifareclassic_AuthenticateBlock (uint8_t * uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t * keyData)
+uint8_t PN532::mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData)
 {
-  uint8_t len;
-  uint8_t i;
-  
-  // Hang on to the key and uid data
-  memcpy (_key, keyData, 6); 
-  memcpy (_uid, uid, uidLen); 
-  _uidLen = uidLen;  
+    uint8_t i;
+
+    // Hang on to the key and uid data
+    memcpy (_key, keyData, 6);
+    memcpy (_uid, uid, uidLen);
+    _uidLen = uidLen;
 
-  #ifdef MIFAREDEBUG
-  Serial.print("Trying to authenticate card ");
-  PN532::PrintHex(_uid, _uidLen);
-  Serial.print("Using authentication KEY ");Serial.print(keyNumber ? 'B' : 'A');Serial.print(": ");
-  PN532::PrintHex(_key, 6);
-  #endif
-  
-  // Prepare the authentication command //
-  pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;   /* Data Exchange Header */
-  pn532_packetbuffer[1] = 1;                              /* Max card numbers */
-  pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
-  pn532_packetbuffer[3] = blockNumber;                    /* Block Number (1K = 0..63, 4K = 0..255 */
-  memcpy (pn532_packetbuffer+4, _key, 6);
-  for (i = 0; i < _uidLen; i++)
-  {
-    pn532_packetbuffer[10+i] = _uid[i];                /* 4 uint8_t card ID */
-  }
+    // Prepare the authentication command //
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;   /* Data Exchange Header */
+    pn532_packetbuffer[1] = 1;                              /* Max card numbers */
+    pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
+    pn532_packetbuffer[3] = blockNumber;                    /* Block Number (1K = 0..63, 4K = 0..255 */
+    memcpy (pn532_packetbuffer + 4, _key, 6);
+    for (i = 0; i < _uidLen; i++) {
+        pn532_packetbuffer[10 + i] = _uid[i];              /* 4 bytes card ID */
+    }
+
+    if (HAL(writeCommand)(pn532_packetbuffer, 10 + _uidLen))
+        return 0;
 
-  if (HAL(writeCommand)(pn532_packetbuffer, 10+_uidLen))
-    return 0;
+    // Read the response packet
+    HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
 
-  // Read the response packet
-  HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-  
-  // Check if the response is valid and we are authenticated???
-  // for an auth success it should be bytes 5-7: 0xD5 0x41 0x00
-  // Mifare auth error is technically uint8_t 7: 0x14 but anything other and 0x00 is not good
-  if (pn532_packetbuffer[0] != 0x00)
-  {
-    DMSG("Authentification failed\n");
-    return 0;
-  }  
-  
-  return 1;
+    // Check if the response is valid and we are authenticated???
+    // for an auth success it should be bytes 5-7: 0xD5 0x41 0x00
+    // Mifare auth error is technically byte 7: 0x14 but anything other and 0x00 is not good
+    if (pn532_packetbuffer[0] != 0x00) {
+        DMSG("Authentification failed\n");
+        return 0;
+    }
+
+    return 1;
 }
 
 /**************************************************************************/
-/*! 
-    Tries to read an entire 16-uint8_t data block at the specified block
+/*!
+    Tries to read an entire 16-bytes data block at the specified block
     address.
 
     @param  blockNumber   The block number to authenticate.  (0..63 for
                           1KB cards, and 0..255 for 4KB cards).
-    @param  data          Pointer to the uint8_t array that will hold the
+    @param  data          Pointer to the byte array that will hold the
                           retrieved data (if any)
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-uint8_t PN532::mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t * data)
+uint8_t PN532::mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data)
 {
-  #ifdef MIFAREDEBUG
-  Serial.print("Trying to read 16 bytes from block ");Serial.println(blockNumber);
-  #endif
-  
-  /* Prepare the command */
-  pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-  pn532_packetbuffer[1] = 1;                      /* Card number */
-  pn532_packetbuffer[2] = MIFARE_CMD_READ;        /* Mifare Read command = 0x30 */
-  pn532_packetbuffer[3] = blockNumber;            /* Block Number (0..63 for 1K, 0..255 for 4K) */
+    DMSG("Trying to read 16 bytes from block ");
+    DMSG_INT(blockNumber);
+
+    /* Prepare the command */
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;                      /* Card number */
+    pn532_packetbuffer[2] = MIFARE_CMD_READ;        /* Mifare Read command = 0x30 */
+    pn532_packetbuffer[3] = blockNumber;            /* Block Number (0..63 for 1K, 0..255 for 4K) */
 
-  /* Send the command */
-  if (HAL(writeCommand)(pn532_packetbuffer, 4))
-  {
-    #ifdef MIFAREDEBUG
-    Serial.println("Failed to receive ACK for read command");
-    #endif
-    return 0;
-  }
+    /* Send the command */
+    if (HAL(writeCommand)(pn532_packetbuffer, 4)) {
+        return 0;
+    }
 
-  /* Read the response packet */
-  HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+    /* Read the response packet */
+    HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
 
-  /* If uint8_t 8 isn't 0x00 we probably have an error */
-  if (pn532_packetbuffer[0] != 0x00)
-  {
-    return 0;
-  }
-    
-  /* Copy the 16 data bytes to the output buffer        */
-  /* Block content starts at uint8_t 9 of a valid response */
-  memcpy (data, pn532_packetbuffer+1, 16);
+    /* If byte 8 isn't 0x00 we probably have an error */
+    if (pn532_packetbuffer[0] != 0x00) {
+        return 0;
+    }
 
-  return 1;  
+    /* Copy the 16 data bytes to the output buffer        */
+    /* Block content starts at byte 9 of a valid response */
+    memcpy (data, pn532_packetbuffer + 1, 16);
+
+    return 1;
 }
 
 /**************************************************************************/
-/*! 
-    Tries to write an entire 16-uint8_t data block at the specified block
+/*!
+    Tries to write an entire 16-bytes data block at the specified block
     address.
 
     @param  blockNumber   The block number to authenticate.  (0..63 for
                           1KB cards, and 0..255 for 4KB cards).
-    @param  data          The uint8_t array that contains the data to write.
-    
+    @param  data          The byte array that contains the data to write.
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-uint8_t PN532::mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t * data)
+uint8_t PN532::mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data)
 {
-  /* Prepare the first command */
-  pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-  pn532_packetbuffer[1] = 1;                      /* Card number */
-  pn532_packetbuffer[2] = MIFARE_CMD_WRITE;       /* Mifare Write command = 0xA0 */
-  pn532_packetbuffer[3] = blockNumber;            /* Block Number (0..63 for 1K, 0..255 for 4K) */
-  memcpy (pn532_packetbuffer+4, data, 16);          /* Data Payload */
+    /* Prepare the first command */
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;                      /* Card number */
+    pn532_packetbuffer[2] = MIFARE_CMD_WRITE;       /* Mifare Write command = 0xA0 */
+    pn532_packetbuffer[3] = blockNumber;            /* Block Number (0..63 for 1K, 0..255 for 4K) */
+    memcpy (pn532_packetbuffer + 4, data, 16);        /* Data Payload */
 
-  /* Send the command */
-  if (HAL(writeCommand)(pn532_packetbuffer, 20))
-  {
-    DMSG("Failed to receive ACK for write command");
-    return 0;
-  }
-  
-  /* Read the response packet */
-  return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+    /* Send the command */
+    if (HAL(writeCommand)(pn532_packetbuffer, 20)) {
+        return 0;
+    }
+
+    /* Read the response packet */
+    return (0 < HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
 }
 
 /**************************************************************************/
-/*! 
-    Formats a Mifare Classic card to store NDEF Records 
-    
+/*!
+    Formats a Mifare Classic card to store NDEF Records
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
 uint8_t PN532::mifareclassic_FormatNDEF (void)
 {
-  uint8_t sectorbuffer1[16] = {0x14, 0x01, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1};
-  uint8_t sectorbuffer2[16] = {0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1};
-  uint8_t sectorbuffer3[16] = {0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x78, 0x77, 0x88, 0xC1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    uint8_t sectorbuffer1[16] = {0x14, 0x01, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1};
+    uint8_t sectorbuffer2[16] = {0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1, 0x03, 0xE1};
+    uint8_t sectorbuffer3[16] = {0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x78, 0x77, 0x88, 0xC1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+
+    // Note 0xA0 0xA1 0xA2 0xA3 0xA4 0xA5 must be used for key A
+    // for the MAD sector in NDEF records (sector 0)
 
-  // Note 0xA0 0xA1 0xA2 0xA3 0xA4 0xA5 must be used for key A
-  // for the MAD sector in NDEF records (sector 0)
-  
-  // Write block 1 and 2 to the card
-  if (!(mifareclassic_WriteDataBlock (1, sectorbuffer1)))
-    return 0;
-  if (!(mifareclassic_WriteDataBlock (2, sectorbuffer2)))
-    return 0;
-  // Write key A and access rights card
-  if (!(mifareclassic_WriteDataBlock (3, sectorbuffer3)))
-    return 0;
+    // Write block 1 and 2 to the card
+    if (!(mifareclassic_WriteDataBlock (1, sectorbuffer1)))
+        return 0;
+    if (!(mifareclassic_WriteDataBlock (2, sectorbuffer2)))
+        return 0;
+    // Write key A and access rights card
+    if (!(mifareclassic_WriteDataBlock (3, sectorbuffer3)))
+        return 0;
 
-  // Seems that everything was OK (?!)
-  return 1;
+    // Seems that everything was OK (?!)
+    return 1;
 }
 
 /**************************************************************************/
-/*! 
+/*!
     Writes an NDEF URI Record to the specified sector (1..15)
-    
+
     Note that this function assumes that the Mifare Classic card is
     already formatted to work as an "NFC Forum Tag" and uses a MAD1
     file system.  You can use the NXP TagWriter app on Android to
@@ -521,139 +541,124 @@
 
     @param  sectorNumber  The sector that the URI record should be written
                           to (can be 1..15 for a 1K card)
-    @param  uriIdentifier The uri identifier code (0 = none, 0x01 = 
+    @param  uriIdentifier The uri identifier code (0 = none, 0x01 =
                           "http://www.", etc.)
     @param  url           The uri text to write (max 38 characters).
-    
+
     @returns 1 if everything executed properly, 0 for an error
 */
 /**************************************************************************/
-uint8_t PN532::mifareclassic_WriteNDEFURI (uint8_t sectorNumber, uint8_t uriIdentifier, const char * url)
+uint8_t PN532::mifareclassic_WriteNDEFURI (uint8_t sectorNumber, uint8_t uriIdentifier, const char *url)
 {
-  // Figure out how long the string is
-  uint8_t len = strlen(url);
-  
-  // Make sure we're within a 1K limit for the sector number
-  if ((sectorNumber < 1) || (sectorNumber > 15))
-    return 0;
-  
-  // Make sure the URI payload is between 1 and 38 chars
-  if ((len < 1) || (len > 38))
-    return 0;
-    
-  // Note 0xD3 0xF7 0xD3 0xF7 0xD3 0xF7 must be used for key A
-  // in NDEF records
-    
-  // Setup the sector buffer (w/pre-formatted TLV wrapper and NDEF message)
-  uint8_t sectorbuffer1[16] = {0x00, 0x00, 0x03, len+5, 0xD1, 0x01, len+1, 0x55, uriIdentifier, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  uint8_t sectorbuffer2[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  uint8_t sectorbuffer3[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  uint8_t sectorbuffer4[16] = {0xD3, 0xF7, 0xD3, 0xF7, 0xD3, 0xF7, 0x7F, 0x07, 0x88, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-  if (len <= 6)
-  {
-    // Unlikely we'll get a url this short, but why not ...
-    memcpy (sectorbuffer1+9, url, len);
-    sectorbuffer1[len+9] = 0xFE;
-  }
-  else if (len == 7)
-  {
-    // 0xFE needs to be wrapped around to next block
-    memcpy (sectorbuffer1+9, url, len);
-    sectorbuffer2[0] = 0xFE;
-  }
-  else if ((len > 7) || (len <= 22))
-  {
-    // Url fits in two blocks
-    memcpy (sectorbuffer1+9, url, 7);
-    memcpy (sectorbuffer2, url+7, len-7);
-    sectorbuffer2[len-7] = 0xFE;
-  }
-  else if (len == 23)
-  {
-    // 0xFE needs to be wrapped around to final block
-    memcpy (sectorbuffer1+9, url, 7);
-    memcpy (sectorbuffer2, url+7, len-7);
-    sectorbuffer3[0] = 0xFE;
-  }
-  else
-  {
-    // Url fits in three blocks
-    memcpy (sectorbuffer1+9, url, 7);
-    memcpy (sectorbuffer2, url+7, 16);
-    memcpy (sectorbuffer3, url+23, len-24);
-    sectorbuffer3[len-22] = 0xFE;
-  }
-  
-  // Now write all three blocks back to the card
-  if (!(mifareclassic_WriteDataBlock (sectorNumber*4, sectorbuffer1)))
-    return 0;
-  if (!(mifareclassic_WriteDataBlock ((sectorNumber*4)+1, sectorbuffer2)))
-    return 0;
-  if (!(mifareclassic_WriteDataBlock ((sectorNumber*4)+2, sectorbuffer3)))
-    return 0;
-  if (!(mifareclassic_WriteDataBlock ((sectorNumber*4)+3, sectorbuffer4)))
-    return 0;
+    // Figure out how long the string is
+    uint8_t len = strlen(url);
+
+    // Make sure we're within a 1K limit for the sector number
+    if ((sectorNumber < 1) || (sectorNumber > 15))
+        return 0;
+
+    // Make sure the URI payload is between 1 and 38 chars
+    if ((len < 1) || (len > 38))
+        return 0;
+
+    // Note 0xD3 0xF7 0xD3 0xF7 0xD3 0xF7 must be used for key A
+    // in NDEF records
 
-  // Seems that everything was OK (?!)
-  return 1;
+    // Setup the sector buffer (w/pre-formatted TLV wrapper and NDEF message)
+    uint8_t sectorbuffer1[16] = {0x00, 0x00, 0x03, len + 5, 0xD1, 0x01, len + 1, 0x55, uriIdentifier, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t sectorbuffer2[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t sectorbuffer3[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t sectorbuffer4[16] = {0xD3, 0xF7, 0xD3, 0xF7, 0xD3, 0xF7, 0x7F, 0x07, 0x88, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    if (len <= 6) {
+        // Unlikely we'll get a url this short, but why not ...
+        memcpy (sectorbuffer1 + 9, url, len);
+        sectorbuffer1[len + 9] = 0xFE;
+    } else if (len == 7) {
+        // 0xFE needs to be wrapped around to next block
+        memcpy (sectorbuffer1 + 9, url, len);
+        sectorbuffer2[0] = 0xFE;
+    } else if ((len > 7) || (len <= 22)) {
+        // Url fits in two blocks
+        memcpy (sectorbuffer1 + 9, url, 7);
+        memcpy (sectorbuffer2, url + 7, len - 7);
+        sectorbuffer2[len - 7] = 0xFE;
+    } else if (len == 23) {
+        // 0xFE needs to be wrapped around to final block
+        memcpy (sectorbuffer1 + 9, url, 7);
+        memcpy (sectorbuffer2, url + 7, len - 7);
+        sectorbuffer3[0] = 0xFE;
+    } else {
+        // Url fits in three blocks
+        memcpy (sectorbuffer1 + 9, url, 7);
+        memcpy (sectorbuffer2, url + 7, 16);
+        memcpy (sectorbuffer3, url + 23, len - 24);
+        sectorbuffer3[len - 22] = 0xFE;
+    }
+
+    // Now write all three blocks back to the card
+    if (!(mifareclassic_WriteDataBlock (sectorNumber * 4, sectorbuffer1)))
+        return 0;
+    if (!(mifareclassic_WriteDataBlock ((sectorNumber * 4) + 1, sectorbuffer2)))
+        return 0;
+    if (!(mifareclassic_WriteDataBlock ((sectorNumber * 4) + 2, sectorbuffer3)))
+        return 0;
+    if (!(mifareclassic_WriteDataBlock ((sectorNumber * 4) + 3, sectorbuffer4)))
+        return 0;
+
+    // Seems that everything was OK (?!)
+    return 1;
 }
 
 /***** Mifare Ultralight Functions ******/
 
 /**************************************************************************/
-/*! 
-    Tries to read an entire 4-uint8_t page at the specified address.
+/*!
+    Tries to read an entire 4-bytes page at the specified address.
 
     @param  page        The page number (0..63 in most cases)
-    @param  buffer      Pointer to the uint8_t array that will hold the
+    @param  buffer      Pointer to the byte array that will hold the
                         retrieved data (if any)
 */
 /**************************************************************************/
-uint8_t PN532::mifareultralight_ReadPage (uint8_t page, uint8_t * buffer)
+uint8_t PN532::mifareultralight_ReadPage (uint8_t page, uint8_t *buffer)
 {
-  if (page >= 64)
-  {
-    DMSG("Page value out of range\n");
-    return 0;
-  }
+    if (page >= 64) {
+        DMSG("Page value out of range\n");
+        return 0;
+    }
 
-  /* Prepare the command */
-  pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-  pn532_packetbuffer[1] = 1;                   /* Card number */
-  pn532_packetbuffer[2] = MIFARE_CMD_READ;     /* Mifare Read command = 0x30 */
-  pn532_packetbuffer[3] = page;                /* Page Number (0..63 in most cases) */
+    /* Prepare the command */
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;                   /* Card number */
+    pn532_packetbuffer[2] = MIFARE_CMD_READ;     /* Mifare Read command = 0x30 */
+    pn532_packetbuffer[3] = page;                /* Page Number (0..63 in most cases) */
+
+    /* Send the command */
+    if (HAL(writeCommand)(pn532_packetbuffer, 4)) {
+        return 0;
+    }
 
-  /* Send the command */
-  if (HAL(writeCommand)(pn532_packetbuffer, 4))
-  {
-    DMSG("Failed to receive ACK for write command\n");
-    return 0;
-  }
-  
-  /* Read the response packet */
-  HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+    /* Read the response packet */
+    HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer));
 
-  /* If uint8_t 8 isn't 0x00 we probably have an error */
-  if (pn532_packetbuffer[0] == 0x00)
-  {
-    /* Copy the 4 data bytes to the output buffer         */
-    /* Block content starts at uint8_t 9 of a valid response */
-    /* Note that the command actually reads 16 uint8_t or 4  */
-    /* pages at a time ... we simply discard the last 12  */
-    /* bytes                                              */
-    memcpy (buffer, pn532_packetbuffer+1, 4);
-  }
-  else
-  {
-    return 0;
-  }
+    /* If byte 8 isn't 0x00 we probably have an error */
+    if (pn532_packetbuffer[0] == 0x00) {
+        /* Copy the 4 data bytes to the output buffer         */
+        /* Block content starts at byte 9 of a valid response */
+        /* Note that the command actually reads 16 bytes or 4  */
+        /* pages at a time ... we simply discard the last 12  */
+        /* bytes                                              */
+        memcpy (buffer, pn532_packetbuffer + 1, 4);
+    } else {
+        return 0;
+    }
 
-  // Return OK signal
-  return 1;
+    // Return OK signal
+    return 1;
 }
 
 /**************************************************************************/
-/*! 
+/*!
     @brief  Exchanges an APDU with the currently inlisted peer
 
     @param  send            Pointer to data to send
@@ -662,82 +667,82 @@
     @param  responseLength  Pointer to the response data length
 */
 /**************************************************************************/
-bool PN532::inDataExchange(uint8_t * send, uint8_t sendLength, uint8_t * response, uint8_t * responseLength) {
-  if (sendLength > PN532_PACKBUFFSIZ -2) {
-    DMSG("APDU length too long for packet buffer");
+bool PN532::inDataExchange(uint8_t *send, uint8_t sendLength, uint8_t *response, uint8_t *responseLength)
+{
+    if (sendLength > PN532_PACKBUFFSIZ - 2) {
+        DMSG("APDU length too long for packet buffer");
+
+        return false;
+    }
+    uint8_t i;
 
-    return false;
-  }
-  uint8_t i;
-  
-  pn532_packetbuffer[0] = 0x40; // PN532_COMMAND_INDATAEXCHANGE;
-  pn532_packetbuffer[1] = inListedTag;
-  for (i=0; i<sendLength; ++i) {
-    pn532_packetbuffer[i+2] = send[i];
-  }
-  
-  if (HAL(writeCommand)(pn532_packetbuffer,sendLength+2)) {
-    DMSG("Could not send ADPU\n");
-    return false;
-  }
+    pn532_packetbuffer[0] = 0x40; // PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = inListedTag;
+    for (i = 0; i < sendLength; ++i) {
+        pn532_packetbuffer[i + 2] = send[i];
+    }
+
+    if (HAL(writeCommand)(pn532_packetbuffer, sendLength + 2)) {
+        return false;
+    }
 
 
-  int16_t status = HAL(readResponse)(pn532_packetbuffer,sizeof(pn532_packetbuffer), 1000);
-  if (status < 0) {
-    return false;
-  }
-  
-  uint8_t length = status;
+    int16_t status = HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer), 1000);
+    if (status < 0) {
+        return false;
+    }
+
+    uint8_t length = status;
+
+    if ((pn532_packetbuffer[0] & 0x3f) != 0) {
+        DMSG("Status code indicates an error\n");
+        return false;
+    }
 
-  if ((pn532_packetbuffer[0] & 0x3f)!=0) {
-    DMSG("Status code indicates an error\n");
-    return false;
-  }
-  
-  length -= 1;
-  
-  if (length > *responseLength) {
-    length = *responseLength; // silent truncation...
-  }
-  
-  for (i=0; i<length; ++i) {
-    response[i] = pn532_packetbuffer[1+i];
-  }
-  *responseLength = length;
-  
-  return true;
+    length -= 1;
+
+    if (length > *responseLength) {
+        length = *responseLength; // silent truncation...
+    }
+
+    for (i = 0; i < length; ++i) {
+        response[i] = pn532_packetbuffer[1 + i];
+    }
+    *responseLength = length;
+
+    return true;
 }
 
 /**************************************************************************/
-/*! 
+/*!
     @brief  'InLists' a passive target. PN532 acting as reader/initiator,
             peer acting as card/responder.
 */
 /**************************************************************************/
-bool PN532::inListPassiveTarget() {
-  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
-  pn532_packetbuffer[1] = 1;
-  pn532_packetbuffer[2] = 0;
-  
-  DMSG("About to inList passive target");
+bool PN532::inListPassiveTarget()
+{
+    pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = 0;
 
-  if (HAL(writeCommand)(pn532_packetbuffer, 3)) {
-    DMSG("Could not send inlist message\n");
-    return false;
-  }
+    DMSG("inList passive target\n");
+
+    if (HAL(writeCommand)(pn532_packetbuffer, 3)) {
+        return false;
+    }
 
-  int16_t status = HAL(readResponse)(pn532_packetbuffer,sizeof(pn532_packetbuffer), 30000);
-  if (status < 0) {
-    return false;
-  }
+    int16_t status = HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer), 30000);
+    if (status < 0) {
+        return false;
+    }
 
-  if (pn532_packetbuffer[0] != 1) {
-    return false;
-  }
-  
-  inListedTag = pn532_packetbuffer[1];
-  
-  return true;
+    if (pn532_packetbuffer[0] != 1) {
+        return false;
+    }
+
+    inListedTag = pn532_packetbuffer[1];
+
+    return true;
 }
 
 /**
@@ -746,56 +751,55 @@
 int8_t PN532::tgInitAsTarget()
 {
     static const uint8_t command[] = {
-            PN532_COMMAND_TGINITASTARGET,
-            0,
-            0x00, 0x00,         //SENS_RES
-            0x00, 0x00, 0x00,   //NFCID1
-            0x40,               //SEL_RES
+        PN532_COMMAND_TGINITASTARGET,
+        0,
+        0x00, 0x00,         //SENS_RES
+        0x00, 0x00, 0x00,   //NFCID1
+        0x40,               //SEL_RES
 
-            0x01, 0xFE, 0x0F, 0xBB, 0xBA, 0xA6, 0xC9, 0x89, // POL_RES
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xFF, 0xFF,
+        0x01, 0xFE, 0x0F, 0xBB, 0xBA, 0xA6, 0xC9, 0x89, // POL_RES
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xFF, 0xFF,
 
-            0x01, 0xFE, 0x0F, 0xBB, 0xBA, 0xA6, 0xC9, 0x89, 0x00, 0x00, //NFCID3t: Change this to desired value
+        0x01, 0xFE, 0x0F, 0xBB, 0xBA, 0xA6, 0xC9, 0x89, 0x00, 0x00, //NFCID3t: Change this to desired value
 
-            0x06, 0x46,  0x66, 0x6D, 0x01, 0x01, 0x10, 0x00// LLCP magic number and version parameter
-            };
-    
+        0x06, 0x46,  0x66, 0x6D, 0x01, 0x01, 0x10, 0x00// LLCP magic number and version parameter
+    };
+
     int8_t status = HAL(writeCommand)(command, sizeof(command));
     if (status < 0) {
         return status;
     }
-    
+
     return HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer), 0);
 }
 
 int16_t PN532::tgGetData(uint8_t *buf, uint16_t len)
 {
     pn532_packetbuffer[0] = PN532_COMMAND_TGGETDATA;
-    
+
     if (HAL(writeCommand)(pn532_packetbuffer, 1)) {
-        DMSG("TgGetData: no ACK\n");
         return -1;
     }
-    
+
     int16_t status = HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer), 3000);
     if (0 > status) {
         return status;
     }
-    
+
     uint16_t length = status;
     if (length > len) {
         return -4;
     }
-    
+
     if (pn532_packetbuffer[0] != 0) {
         DMSG("status is not ok\n");
         return -5;
     }
-    
+
     memcpy(buf, pn532_packetbuffer + 1, length - 1);
 
-    
+
     return length - 1;
 }
 
@@ -805,20 +809,20 @@
     if (len > (sizeof(pn532_packetbuffer) + 1)) {
         return false;
     }
-    
+
     memcpy(pn532_packetbuffer + 1, buf, len);
-    
+
     if (HAL(writeCommand)(pn532_packetbuffer, len + 1)) {
         return false;
     }
-    
+
     if (0 > HAL(readResponse)(pn532_packetbuffer, sizeof(pn532_packetbuffer), 3000)) {
         return false;
     }
-    
+
     if (0 != pn532_packetbuffer[0]) {
         return false;
     }
-    
+
     return true;
 }