From 14dd264489631156288f34ffd07f6439ef72ef1a Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 03:27:47 +0200
Subject: [PATCH 01/10] Unify usage of whitespace

---
 PN5180.cpp                                 |  50 +--
 PN5180FeliCa.cpp                           |  99 +++---
 PN5180FeliCa.h                             |   6 +-
 PN5180ISO14443.cpp                         | 338 +++++++++++----------
 PN5180ISO14443.h                           |   8 +-
 PN5180ISO15693.cpp                         |  42 ++-
 PN5180ISO15693.h                           |  25 +-
 PN5180iClass.cpp                           |  11 +-
 PN5180iClass.h                             |  16 +-
 examples/PN5180-FeliCa/PN5180-FeliCa.ino   |  14 +-
 examples/PN5180-Library/PN5180-Library.ino |  28 +-
 11 files changed, 317 insertions(+), 320 deletions(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index 81d4d34..a37a269 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -196,31 +196,31 @@ bool PN5180::readRegister(uint8_t reg, uint32_t *value) {
 /*
  * WRITE_EEPROM - 0x06
  */
- bool PN5180::writeEEPROM(uint8_t addr, uint8_t *data, int len) {
-   if ((addr > 254) || ((addr+len) > 254)) {
-     PN5180DEBUG(F("ERROR: Writing beyond addr 254!\n"));
-     return false;
-   }
-
-   PN5180DEBUG(F("Writing to EEPROM at 0x"));
-   PN5180DEBUG(formatHex(addr));
-   PN5180DEBUG(F(", size="));
-   PN5180DEBUG(len);
-   PN5180DEBUG(F("...\n"));
-
-   uint8_t buffer[len+2];
-   buffer[0] = PN5180_WRITE_EEPROM;
-   buffer[1] = addr;
-   for (int i=0; i<len; i++) {
-     buffer[2+i] = data[i];
-   }
-
-   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-   transceiveCommand(buffer, len+2);
-   SPI.endTransaction();
-
-   return true;
- }
+bool PN5180::writeEEPROM(uint8_t addr, uint8_t *data, int len) {
+  if ((addr > 254) || ((addr+len) > 254)) {
+    PN5180DEBUG(F("ERROR: Writing beyond addr 254!\n"));
+    return false;
+  }
+
+  PN5180DEBUG(F("Writing to EEPROM at 0x"));
+  PN5180DEBUG(formatHex(addr));
+  PN5180DEBUG(F(", size="));
+  PN5180DEBUG(len);
+  PN5180DEBUG(F("...\n"));
+
+  uint8_t buffer[len+2];
+  buffer[0] = PN5180_WRITE_EEPROM;
+  buffer[1] = addr;
+  for (int i=0; i<len; i++) {
+    buffer[2+i] = data[i];
+  }
+
+  SPI.beginTransaction(PN5180_SPI_SETTINGS);
+  transceiveCommand(buffer, len+2);
+  SPI.endTransaction();
+
+  return true;
+}
 
 /*
  * READ_EEPROM - 0x07
diff --git a/PN5180FeliCa.cpp b/PN5180FeliCa.cpp
index 9b70c66..536c723 100644
--- a/PN5180FeliCa.cpp
+++ b/PN5180FeliCa.cpp
@@ -51,71 +51,70 @@ bool PN5180FeliCa::setupRF() {
 * buffer[18..19] is POL_RES data
 *
 * return value: the uid length in bytes:
-* -	zero if no tag was recognized
-* -	8 if a FeliCa tag was recognized
+* - zero if no tag was recognized
+* - 8 if a FeliCa tag was recognized
 */
 uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
-	uint8_t cmd[6];
-	uint8_t uidLength = 0;
-	// Load FeliCa 424 protocol
-	if (!loadRFConfig(0x09, 0x89))
-	  return 0;
-	// OFF Crypto
-	if (!writeRegisterWithAndMask(SYSTEM_CONFIG, 0xFFFFFFBF))
-	  return 0;
-
-	//send FeliCa request (every packet starts with length)
-    cmd[0] = 0x06;             //total length
-	cmd[1] = 0x00;             //POL_REQ command
-	cmd[2] = 0xFF;             //
-	cmd[3] = 0xFF;             // any target
-	cmd[4] = 0x01;             // System Code request
-	cmd[5] = 0x00;             // 1 timeslot only
-
-	if (!sendData(cmd, 6, 0x00))
-	  return 0;
-    //wait a little to avoid bug with some cards
-    delay(50);
-
-    //response packet should be 0x14 (20 bytes total length), 0x01 Response Code, 8 IDm bytes, 8 PMm bytes, 2 Request Data bytes
-    //READ 20 bytes reply
+  uint8_t cmd[6];
+  uint8_t uidLength = 0;
+  // Load FeliCa 424 protocol
+  if (!loadRFConfig(0x09, 0x89))
+    return 0;
+  // OFF Crypto
+  if (!writeRegisterWithAndMask(SYSTEM_CONFIG, 0xFFFFFFBF))
+    return 0;
+
+  //send FeliCa request (every packet starts with length)
+  cmd[0] = 0x06;             //total length
+  cmd[1] = 0x00;             //POL_REQ command
+  cmd[2] = 0xFF;             //
+  cmd[3] = 0xFF;             // any target
+  cmd[4] = 0x01;             // System Code request
+  cmd[5] = 0x00;             // 1 timeslot only
+
+  if (!sendData(cmd, 6, 0x00))
+    return 0;
+  //wait a little to avoid bug with some cards
+  delay(50);
+
+  //response packet should be 0x14 (20 bytes total length), 0x01 Response Code, 8 IDm bytes, 8 PMm bytes, 2 Request Data bytes
+  //READ 20 bytes reply
   uint8_t *internalBuffer = readData(20);
-	if (!internalBuffer)
-	  return 0;
- for (int i=0; i<20; i++) {
+  if (!internalBuffer)
+    return 0;
+  for (int i=0; i<20; i++) {
     buffer[i] = internalBuffer[i];
- }
- 
-    //check Response Code
-    if ( buffer[1] != 0x01 ){
-        uidLength = 0;
-    } else {
-        uidLength = 8;
-    }
-    return uidLength;
+  }
+
+  //check Response Code
+  if (buffer[1] != 0x01) {
+    uidLength = 0;
+  } else {
+    uidLength = 8;
+  }
+  return uidLength;
 }
 
 uint8_t PN5180FeliCa::readCardSerial(uint8_t *buffer) {
-
-    uint8_t response[20];
-	uint8_t uidLength;
+  uint8_t response[20];
+  uint8_t uidLength;
 
     for (int i = 0; i < 20; i++)
         response[i] = 0;
 
-    uidLength = pol_req(response);
+  uidLength = pol_req(response);
 
-    // no reply
-	if (uidLength == 0)
-	  return 0;
+  // no reply
+  if (uidLength == 0)
+    return 0;
 
-    for (int i = 0; i < uidLength; i++)
-        buffer[i] = response[i+2];
+  for (int i=0; i<uidLength; i++)
+    buffer[i] = response[i+2];
 
-	return uidLength;
+  return uidLength;
 }
 
 bool PN5180FeliCa::isCardPresent() {
-    uint8_t buffer[8];
-	return (readCardSerial(buffer) != 0);
+  uint8_t buffer[8];
+  return (readCardSerial(buffer) != 0);
 }
diff --git a/PN5180FeliCa.h b/PN5180FeliCa.h
index e584658..2b2138e 100644
--- a/PN5180FeliCa.h
+++ b/PN5180FeliCa.h
@@ -31,10 +31,10 @@ class PN5180FeliCa : public PN5180 {
   /*
    * Helper functions
    */
-public:   
+public:
   bool setupRF();
-  uint8_t readCardSerial(uint8_t *buffer);    
-  bool isCardPresent();    
+  uint8_t readCardSerial(uint8_t *buffer);
+  bool isCardPresent();
 };
 
 #endif /* PN5180FeliCa_H */
diff --git a/PN5180ISO14443.cpp b/PN5180ISO14443.cpp
index 368d837..6a60f7b 100644
--- a/PN5180ISO14443.cpp
+++ b/PN5180ISO14443.cpp
@@ -23,7 +23,7 @@
 #include <PN5180.h>
 #include "Debug.h"
 
-PN5180ISO14443::PN5180ISO14443(uint8_t SSpin, uint8_t BUSYpin, uint8_t RSTpin) 
+PN5180ISO14443::PN5180ISO14443(uint8_t SSpin, uint8_t BUSYpin, uint8_t RSTpin)
               : PN5180(SSpin, BUSYpin, RSTpin) {
 }
 
@@ -44,13 +44,14 @@ bool PN5180ISO14443::setupRF() {
 }
 
 uint16_t PN5180ISO14443::rxBytesReceived() {
-	uint32_t rxStatus;
-	uint16_t len = 0;
-	readRegister(RX_STATUS, &rxStatus);
-	// Lower 9 bits has length
-	len = (uint16_t)(rxStatus & 0x000001ff);
-	return len;
+  uint32_t rxStatus;
+  uint16_t len = 0;
+  readRegister(RX_STATUS, &rxStatus);
+  // Lower 9 bits has length
+  len = (uint16_t)(rxStatus & 0x000001ff);
+  return len;
 }
+
 /*
 * buffer : must be 10 byte array
 * buffer[0-1] is ATQA
@@ -60,183 +61,184 @@ uint16_t PN5180ISO14443::rxBytesReceived() {
 * kind : 0  we send REQA, 1 we send WUPA
 *
 * return value: the uid length:
-* -	zero if no tag was recognized
-* -	single Size UID (4 byte)
-* -	double Size UID (7 byte)
-* -	triple Size UID (10 byte) - not yet supported
+* - zero if no tag was recognized
+* - single Size UID (4 byte)
+* - double Size UID (7 byte)
+* - triple Size UID (10 byte) - not yet supported
 */
 uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
-	uint8_t cmd[7];
-	uint8_t uidLength = 0;
-	// Load standard TypeA protocol
-	if (!loadRFConfig(0x0, 0x80)) 
-	  return 0;
-
-	// OFF Crypto
-	if (!writeRegisterWithAndMask(SYSTEM_CONFIG, 0xFFFFFFBF))
-	  return 0;
-	// Clear RX CRC
-	if (!writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE))
-	  return 0;
-	// Clear TX CRC
-	if (!writeRegisterWithAndMask(CRC_TX_CONFIG, 0xFFFFFFFE))
-	  return 0;
-	//Send REQA/WUPA, 7 bits in last byte
-	cmd[0] = (kind == 0) ? 0x26 : 0x52;
-	if (!sendData(cmd, 1, 0x07))
-	  return 0;
-	// READ 2 bytes ATQA into  buffer
-	if (!readData(2, buffer)) 
-	  return 0;
-	//Send Anti collision 1, 8 bits in last byte
-	cmd[0] = 0x93;
-	cmd[1] = 0x20;
-	if (!sendData(cmd, 2, 0x00))
-	  return 0;
-	//Read 5 bytes, we will store at offset 2 for later usage
-	if (!readData(5, cmd+2)) 
-	  return 0;
-	//Enable RX CRC calculation
-	if (!writeRegisterWithOrMask(CRC_RX_CONFIG, 0x01)) 
-	  return 0;
-	//Enable TX CRC calculation
-	if (!writeRegisterWithOrMask(CRC_TX_CONFIG, 0x01)) 
-	  return 0;
-	//Send Select anti collision 1, the remaining bytes are already in offset 2 onwards
-	cmd[0] = 0x93;
-	cmd[1] = 0x70;
-	if (!sendData(cmd, 7, 0x00)) 
-	  return 0;
-	//Read 1 byte SAK into buffer[2]
-	if (!readData(1, buffer+2)) 
-	  return 0;
-	// Check if the tag is 4 Byte UID or 7 byte UID and requires anti collision 2
-	// If Bit 3 is 0 it is 4 Byte UID
-	if ((buffer[2] & 0x04) == 0) {
-		// Take first 4 bytes of anti collision as UID store at offset 3 onwards. job done
-		for (int i = 0; i < 4; i++) buffer[3+i] = cmd[2 + i];
-		uidLength = 4;
-	}
-	else {
-		// Take First 3 bytes of UID, Ignore first byte 88(CT)
-		if (cmd[2] != 0x88)
-		  return 0;
-		for (int i = 0; i < 3; i++) buffer[3+i] = cmd[3 + i];
-		// Clear RX CRC
-		if (!writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE)) 
-	      return 0;
-		// Clear TX CRC
-		if (!writeRegisterWithAndMask(CRC_TX_CONFIG, 0xFFFFFFFE)) 
-	      return 0;
-		// Do anti collision 2
-		cmd[0] = 0x95;
-		cmd[1] = 0x20;
-		if (!sendData(cmd, 2, 0x00)) 
-	      return 0;
-		//Read 5 bytes. we will store at offset 2 for later use
-		if (!readData(5, cmd+2)) 
-	      return 0;
-		// first 4 bytes belongs to last 4 UID bytes, we keep it.
-		for (int i = 0; i < 4; i++) {
-		  buffer[6 + i] = cmd[2+i];
-		}
-		//Enable RX CRC calculation
-		if (!writeRegisterWithOrMask(CRC_RX_CONFIG, 0x01)) 
-	      return 0;
-		//Enable TX CRC calculation
-		if (!writeRegisterWithOrMask(CRC_TX_CONFIG, 0x01)) 
-	      return 0;
-		//Send Select anti collision 2 
-		cmd[0] = 0x95;
-		cmd[1] = 0x70;
-		if (!sendData(cmd, 7, 0x00)) 
-	      return 0;
-		//Read 1 byte SAK into buffer[2]
-		if (!readData(1, buffer + 2)) 
-	      return 0;	
-		uidLength = 7;
-	}
-    return uidLength;
+  uint8_t cmd[7];
+  uint8_t uidLength = 0;
+  // Load standard TypeA protocol
+  if (!loadRFConfig(0x0, 0x80))
+    return 0;
+
+  // OFF Crypto
+  if (!writeRegisterWithAndMask(SYSTEM_CONFIG, 0xFFFFFFBF))
+    return 0;
+  // Clear RX CRC
+  if (!writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE))
+    return 0;
+  // Clear TX CRC
+  if (!writeRegisterWithAndMask(CRC_TX_CONFIG, 0xFFFFFFFE))
+    return 0;
+  //Send REQA/WUPA, 7 bits in last byte
+  cmd[0] = (kind == 0) ? 0x26 : 0x52;
+  if (!sendData(cmd, 1, 0x07))
+    return 0;
+  // READ 2 bytes ATQA into  buffer
+  if (!readData(2, buffer))
+    return 0;
+  //Send Anti collision 1, 8 bits in last byte
+  cmd[0] = 0x93;
+  cmd[1] = 0x20;
+  if (!sendData(cmd, 2, 0x00))
+    return 0;
+  //Read 5 bytes, we will store at offset 2 for later usage
+  if (!readData(5, cmd+2))
+    return 0;
+  //Enable RX CRC calculation
+  if (!writeRegisterWithOrMask(CRC_RX_CONFIG, 0x01))
+    return 0;
+  //Enable TX CRC calculation
+  if (!writeRegisterWithOrMask(CRC_TX_CONFIG, 0x01))
+    return 0;
+  //Send Select anti collision 1, the remaining bytes are already in offset 2 onwards
+  cmd[0] = 0x93;
+  cmd[1] = 0x70;
+  if (!sendData(cmd, 7, 0x00))
+    return 0;
+  //Read 1 byte SAK into buffer[2]
+  if (!readData(1, buffer+2))
+    return 0;
+  // Check if the tag is 4 Byte UID or 7 byte UID and requires anti collision 2
+  // If Bit 3 is 0 it is 4 Byte UID
+  if ((buffer[2] & 0x04) == 0) {
+    // Take first 4 bytes of anti collision as UID store at offset 3 onwards. job done
+    for (int i=0; i<4; i++)
+      buffer[3+i] = cmd[2+i];
+    uidLength = 4;
+  }
+  else {
+    // Take First 3 bytes of UID, Ignore first byte 88(CT)
+    if (cmd[2] != 0x88)
+      return 0;
+    for (int i=0; i<3; i++)
+      buffer[3+i] = cmd[3+i];
+    // Clear RX CRC
+    if (!writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE))
+      return 0;
+    // Clear TX CRC
+    if (!writeRegisterWithAndMask(CRC_TX_CONFIG, 0xFFFFFFFE))
+      return 0;
+    // Do anti collision 2
+    cmd[0] = 0x95;
+    cmd[1] = 0x20;
+    if (!sendData(cmd, 2, 0x00))
+      return 0;
+    //Read 5 bytes. we will store at offset 2 for later use
+    if (!readData(5, cmd+2))
+      return 0;
+    // first 4 bytes belongs to last 4 UID bytes, we keep it.
+    for (int i=0; i<4; i++) {
+      buffer[6+i] = cmd[2+i];
+    }
+    //Enable RX CRC calculation
+    if (!writeRegisterWithOrMask(CRC_RX_CONFIG, 0x01))
+      return 0;
+    //Enable TX CRC calculation
+    if (!writeRegisterWithOrMask(CRC_TX_CONFIG, 0x01))
+      return 0;
+    //Send Select anti collision 2
+    cmd[0] = 0x95;
+    cmd[1] = 0x70;
+    if (!sendData(cmd, 7, 0x00))
+      return 0;
+    //Read 1 byte SAK into buffer[2]
+    if (!readData(1, buffer + 2))
+      return 0;
+    uidLength = 7;
+  }
+  return uidLength;
 }
 
 bool PN5180ISO14443::mifareBlockRead(uint8_t blockno, uint8_t *buffer) {
-	bool success = false;
-	uint16_t len;
-	uint8_t cmd[2];
-	// Send mifare command 30,blockno
-	cmd[0] = 0x30;
-	cmd[1] = blockno;
-	if (!sendData(cmd, 2, 0x00))
-	  return false;
-	//Check if we have received any data from the tag
-	delay(5);
-	len = rxBytesReceived();
-	if (len == 16) {
-		// READ 16 bytes into  buffer
-		if (readData(16, buffer))
-		  success = true;
-	}
-	return success;
+  bool success = false;
+  uint16_t len;
+  uint8_t cmd[2];
+  // Send mifare command 30,blockno
+  cmd[0] = 0x30;
+  cmd[1] = blockno;
+  if (!sendData(cmd, 2, 0x00))
+    return false;
+  //Check if we have received any data from the tag
+  delay(5);
+  len = rxBytesReceived();
+  if (len == 16) {
+    // READ 16 bytes into  buffer
+    if (readData(16, buffer))
+      success = true;
+  }
+  return success;
 }
 
 
 uint8_t PN5180ISO14443::mifareBlockWrite16(uint8_t blockno, uint8_t *buffer) {
-	uint8_t cmd[1];
-	// Clear RX CRC
-	writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE);
-
-	// Mifare write part 1
-	cmd[0] = 0xA0;
-	cmd[1] = blockno;
-	sendData(cmd, 2, 0x00);
-	readData(1, cmd);
-
-	// Mifare write part 2
-	sendData(buffer,16, 0x00);
-	delay(10);
-
-	// Read ACK/NAK
-	readData(1, cmd);
-
-	//Enable RX CRC calculation
-	writeRegisterWithOrMask(CRC_RX_CONFIG, 0x1);
-	return cmd[0];
+  uint8_t cmd[1];
+  // Clear RX CRC
+  writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE);
+
+  // Mifare write part 1
+  cmd[0] = 0xA0;
+  cmd[1] = blockno;
+  sendData(cmd, 2, 0x00);
+  readData(1, cmd);
+
+  // Mifare write part 2
+  sendData(buffer,16, 0x00);
+  delay(10);
+
+  // Read ACK/NAK
+  readData(1, cmd);
+
+  //Enable RX CRC calculation
+  writeRegisterWithOrMask(CRC_RX_CONFIG, 0x1);
+  return cmd[0];
 }
 
 bool PN5180ISO14443::mifareHalt() {
-	uint8_t cmd[1];
-	//mifare Halt
-	cmd[0] = 0x50;
-	cmd[1] = 0x00;
-	sendData(cmd, 2, 0x00);	
-	return true;
+  uint8_t cmd[1];
+  //mifare Halt
+  cmd[0] = 0x50;
+  cmd[1] = 0x00;
+  sendData(cmd, 2, 0x00);
+  return true;
 }
 
 uint8_t PN5180ISO14443::readCardSerial(uint8_t *buffer) {
-  
-    uint8_t response[10];
-	uint8_t uidLength;
-	// Always return 10 bytes
-    // Offset 0..1 is ATQA
-    // Offset 2 is SAK.
-    // UID 4 bytes : offset 3 to 6 is UID, offset 7 to 9 to Zero
-    // UID 7 bytes : offset 3 to 9 is UID
-    for (int i = 0; i < 10; i++) response[i] = 0;
-    uidLength = activateTypeA(response, 1);
-	if ((response[0] == 0xFF) && (response[1] == 0xFF))
-	  return 0;
-	// check for valid uid
-	if ((response[3] == 0x00) && (response[4] == 0x00) && (response[5] == 0x00) && (response[6] == 0x00))
-	  return 0;
-	if ((response[3] == 0xFF) && (response[4] == 0xFF) && (response[5] == 0xFF) && (response[6] == 0xFF))
-	  return 0;
-    for (int i = 0; i < 7; i++) buffer[i] = response[i+3];
-	mifareHalt();
-	return uidLength;  
+  uint8_t response[10];
+  uint8_t uidLength;
+  // Always return 10 bytes
+  // Offset 0..1 is ATQA
+  // Offset 2 is SAK.
+  // UID 4 bytes : offset 3 to 6 is UID, offset 7 to 9 to Zero
+  // UID 7 bytes : offset 3 to 9 is UID
+  for (int i=0; i<10; i++) response[i] = 0;
+  uidLength = activateTypeA(response, 1);
+  if ((response[0] == 0xFF) && (response[1] == 0xFF))
+    return 0;
+  // check for valid uid
+  if ((response[3] == 0x00) && (response[4] == 0x00) && (response[5] == 0x00) && (response[6] == 0x00))
+    return 0;
+  if ((response[3] == 0xFF) && (response[4] == 0xFF) && (response[5] == 0xFF) && (response[6] == 0xFF))
+    return 0;
+  for (int i=0; i<7; i++)
+    buffer[i] = response[i+3];
+  mifareHalt();
+  return uidLength;
 }
 
 bool PN5180ISO14443::isCardPresent() {
-    uint8_t buffer[10];
-	return (readCardSerial(buffer) >=4);
+  uint8_t buffer[10];
+  return (readCardSerial(buffer) >=4);
 }
-
diff --git a/PN5180ISO14443.h b/PN5180ISO14443.h
index 166d183..321d99f 100644
--- a/PN5180ISO14443.h
+++ b/PN5180ISO14443.h
@@ -25,7 +25,7 @@ class PN5180ISO14443 : public PN5180 {
 
 public:
   PN5180ISO14443(uint8_t SSpin, uint8_t BUSYpin, uint8_t RSTpin);
-  
+
 private:
   uint16_t rxBytesReceived();
 public:
@@ -37,10 +37,10 @@ class PN5180ISO14443 : public PN5180 {
   /*
    * Helper functions
    */
-public:   
+public:
   bool setupRF();
-  uint8_t readCardSerial(uint8_t *buffer);    
-  bool isCardPresent();    
+  uint8_t readCardSerial(uint8_t *buffer);
+  bool isCardPresent();
 };
 
 #endif /* PN5180ISO14443_H */
diff --git a/PN5180ISO15693.cpp b/PN5180ISO15693.cpp
index 53d1fc9..254232d 100644
--- a/PN5180ISO15693.cpp
+++ b/PN5180ISO15693.cpp
@@ -77,22 +77,22 @@ ISO15693ErrorCode PN5180ISO15693::getInventory(uint8_t *uid) {
  *  when ERROR flag is set:
  *    SOF, Resp.Flags, ErrorCode, CRC16, EOF
  *
- *     Response Flags:
-  *    xxxx.3xx0
-  *         |||\_ Error flag: 0=no error, 1=error detected, see error field
-  *         \____ Extension flag: 0=no extension, 1=protocol format is extended
-  *
-  *  If Error flag is set, the following error codes are defined:
-  *    01 = The command is not supported, i.e. the request code is not recognized.
-  *    02 = The command is not recognized, i.e. a format error occurred.
-  *    03 = The option is not supported.
-  *    0F = Unknown error.
-  *    10 = The specific block is not available.
-  *    11 = The specific block is already locked and cannot be locked again.
-  *    12 = The specific block is locked and cannot be changed.
-  *    13 = The specific block was not successfully programmed.
-  *    14 = The specific block was not successfully locked.
-  *    A0-DF = Custom command error codes
+ * Response Flags:
+ *    xxxx.3xx0
+ *         |||\_ Error flag: 0=no error, 1=error detected, see error field
+ *         \____ Extension flag: 0=no extension, 1=protocol format is extended
+ *
+ *  If Error flag is set, the following error codes are defined:
+ *    01 = The command is not supported, i.e. the request code is not recognized.
+ *    02 = The command is not recognized, i.e. a format error occurred.
+ *    03 = The option is not supported.
+ *    0F = Unknown error.
+ *    10 = The specific block is not available.
+ *    11 = The specific block is already locked and cannot be locked again.
+ *    12 = The specific block is locked and cannot be changed.
+ *    13 = The specific block was not successfully programmed.
+ *    14 = The specific block was not successfully locked.
+ *    A0-DF = Custom command error codes
  *
  *  when ERROR flag is NOT set:
  *    SOF, Flags, BlockData (len=blockLength), CRC16, EOF
@@ -472,16 +472,14 @@ ISO15693ErrorCode PN5180ISO15693::newpasswordICODESLIX2(uint8_t *newpassword, ui
 
   // set password to unlock the tag
   rc = setPassword(oldpassword, random);
-
   if (rc != ISO15693_EC_OK) {
     return rc;
   }
 
   // write new password
   rc = writePassword(newpassword, uid);
-  
-  return rc;
 
+  return rc;
 }
 
 
@@ -579,15 +577,15 @@ ISO15693ErrorCode PN5180ISO15693::issueISO15693Command(uint8_t *cmd, uint8_t cmd
   Serial.print("Read=");
   for (int i=0; i<len; i++) {
     Serial.print(formatHex((*resultPtr)[i]));
-    if (i<len-1) Serial.print(":");
+    if (i < len-1) Serial.print(":");
   }
   Serial.println();
 #endif
 
   uint32_t irqStatus = getIRQStatus();
   if (0 == (RX_SOF_DET_IRQ_STAT & irqStatus)) { // no card detected
-     clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
-     return EC_NO_CARD;
+    clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
+    return EC_NO_CARD;
   }
 
   uint8_t responseFlags = (*resultPtr)[0];
diff --git a/PN5180ISO15693.h b/PN5180ISO15693.h
index 5a8d753..8dd4d68 100644
--- a/PN5180ISO15693.h
+++ b/PN5180ISO15693.h
@@ -22,25 +22,25 @@
 #include "PN5180.h"
 
 enum ISO15693ErrorCode {
-  EC_NO_CARD = -1,
-  ISO15693_EC_OK = 0,
-  ISO15693_EC_NOT_SUPPORTED = 0x01,
-  ISO15693_EC_NOT_RECOGNIZED = 0x02,
+  EC_NO_CARD                       = -1,
+  ISO15693_EC_OK                   = 0x00,
+  ISO15693_EC_NOT_SUPPORTED        = 0x01,
+  ISO15693_EC_NOT_RECOGNIZED       = 0x02,
   ISO15693_EC_OPTION_NOT_SUPPORTED = 0x03,
-  ISO15693_EC_UNKNOWN_ERROR = 0x0f,
-  ISO15693_EC_BLOCK_NOT_AVAILABLE = 0x10,
+  ISO15693_EC_UNKNOWN_ERROR        = 0x0f,
+  ISO15693_EC_BLOCK_NOT_AVAILABLE  = 0x10,
   ISO15693_EC_BLOCK_ALREADY_LOCKED = 0x11,
-  ISO15693_EC_BLOCK_IS_LOCKED = 0x12,
+  ISO15693_EC_BLOCK_IS_LOCKED      = 0x12,
   ISO15693_EC_BLOCK_NOT_PROGRAMMED = 0x13,
-  ISO15693_EC_BLOCK_NOT_LOCKED = 0x14,
-  ISO15693_EC_CUSTOM_CMD_ERROR = 0xA0
+  ISO15693_EC_BLOCK_NOT_LOCKED     = 0x14,
+  ISO15693_EC_CUSTOM_CMD_ERROR     = 0xA0,
 };
 
 class PN5180ISO15693 : public PN5180 {
 
 public:
   PN5180ISO15693(uint8_t SSpin, uint8_t BUSYpin, uint8_t RSTpin);
-  
+
 private:
   ISO15693ErrorCode issueISO15693Command(uint8_t *cmd, uint8_t cmdLen, uint8_t **resultPtr);
 public:
@@ -50,7 +50,7 @@ class PN5180ISO15693 : public PN5180 {
   ISO15693ErrorCode writeSingleBlock(uint8_t *uid, uint8_t blockNo, uint8_t *blockData, uint8_t blockSize);
 
   ISO15693ErrorCode getSystemInfo(uint8_t *uid, uint8_t *blockSize, uint8_t *numBlocks);
-   
+
   // ICODE SLIX2 specific commands, see https://www.nxp.com/docs/en/data-sheet/SL2S2602.pdf
   ISO15693ErrorCode getRandomNumber(uint8_t *randomData);
   ISO15693ErrorCode setPassword(uint8_t *password, uint8_t *random);
@@ -62,10 +62,9 @@ class PN5180ISO15693 : public PN5180 {
   /*
    * Helper functions
    */
-public:   
+public:
   bool setupRF();
   const __FlashStringHelper *strerror(ISO15693ErrorCode errno);
-    
 };
 
 #endif /* PN5180ISO15693_H */
diff --git a/PN5180iClass.cpp b/PN5180iClass.cpp
index f844ad7..4c9db68 100644
--- a/PN5180iClass.cpp
+++ b/PN5180iClass.cpp
@@ -206,7 +206,7 @@ iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, u
   PN5180DEBUG(len);
   PN5180DEBUG("\n");
 
- *resultPtr = readData(len);
+  *resultPtr = readData(len);
   if (0L == *resultPtr) {
     PN5180DEBUG(F("*** ERROR in readData!\n"));
     return ICLASS_EC_UNKNOWN_ERROR;
@@ -216,15 +216,15 @@ iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, u
   Serial.print("Read=");
   for (int i=0; i<len; i++) {
     Serial.print(formatHex((*resultPtr)[i]));
-    if (i<len-1) Serial.print(":");
+    if (i < len-1) Serial.print(":");
   }
   Serial.println();
 #endif
 
   uint32_t irqStatus = getIRQStatus();
   if (0 == (RX_SOF_DET_IRQ_STAT & irqStatus)) { // no card detected
-     clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
-     return EC_NO_CARD;
+    clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
+    return EC_NO_CARD;
   }
 
   // Datasheet Picopass 2K V1.0  section 4.3.2
@@ -283,7 +283,6 @@ const __FlashStringHelper *PN5180iClass::strerror(iClassErrorCode errno) {
   switch (errno) {
     case EC_NO_CARD: return F("No card detected!");
     case ICLASS_EC_OK: return F("OK!");
-    default:
-      return F("Undefined error code in iClass!");
+    default: return F("Undefined error code in iClass!");
   }
 }
diff --git a/PN5180iClass.h b/PN5180iClass.h
index f48ecb6..e78e3b1 100644
--- a/PN5180iClass.h
+++ b/PN5180iClass.h
@@ -22,18 +22,18 @@
 #include "PN5180.h"
 
 enum {
-  ICLASS_CMD_HALT = 0x00,
-  ICLASS_CMD_ACTALL = 0x0A,
-  ICLASS_CMD_IDENTIFY = 0x0C,
-  ICLASS_CMD_SELECT = 0x81,
+  ICLASS_CMD_HALT      = 0x00,
+  ICLASS_CMD_ACTALL    = 0x0A,
+  ICLASS_CMD_IDENTIFY  = 0x0C,
+  ICLASS_CMD_SELECT    = 0x81,
   ICLASS_CMD_READCHECK = 0x88,
-  ICLASS_CMD_CHECK = 0x05,
-  ICLASS_CMD_READ = 0x0C,
+  ICLASS_CMD_CHECK     = 0x05,
+  ICLASS_CMD_READ      = 0x0C,
 };
 
 enum iClassErrorCode {
-  EC_NO_CARD = -1,
-  ICLASS_EC_OK = 0,
+  EC_NO_CARD              = -1,
+  ICLASS_EC_OK            = 0x00,
   ICLASS_EC_UNKNOWN_ERROR = 0xFE,
 };
 
diff --git a/examples/PN5180-FeliCa/PN5180-FeliCa.ino b/examples/PN5180-FeliCa/PN5180-FeliCa.ino
index 04fb5ca..b556bba 100644
--- a/examples/PN5180-FeliCa/PN5180-FeliCa.ino
+++ b/examples/PN5180-FeliCa/PN5180-FeliCa.ino
@@ -10,7 +10,7 @@
 // This file is part of the PN5180 library for the Arduino environment.
 //
 // This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public 
+// modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
 // version 2.1 of the License, or (at your option) any later version.
 //
@@ -122,7 +122,7 @@ void setup() {
     Serial.flush();
     exit(-1); // halt
   }
-  
+
   Serial.println(F("----------------------------------"));
   Serial.println(F("Reading firmware version..."));
   uint8_t firmwareVersion[2];
@@ -153,8 +153,8 @@ void loop() {
   Serial.println(F("----------------------------------"));
   Serial.print(F("Loop #"));
   Serial.println(loopCnt++);
-  #if defined(ARDUINO_ARCH_ESP32)  
-    Serial.println("Free heap: " + String(ESP.getFreeHeap())); 
+  #if defined(ARDUINO_ARCH_ESP32)
+    Serial.println("Free heap: " + String(ESP.getFreeHeap()));
   #endif
   uint8_t uid[20];
   // check for FeliCa card
@@ -169,10 +169,10 @@ void loop() {
     }
     Serial.println();
     Serial.println(F("----------------------------------"));
-    delay(1000); 
+    delay(1000);
     return;
   }
-  
+
   // no card detected
   Serial.println(F("*** No card detected!"));
-}
\ No newline at end of file
+}
diff --git a/examples/PN5180-Library/PN5180-Library.ino b/examples/PN5180-Library/PN5180-Library.ino
index 18e31a0..74087da 100644
--- a/examples/PN5180-Library/PN5180-Library.ino
+++ b/examples/PN5180-Library/PN5180-Library.ino
@@ -120,7 +120,7 @@ void setup() {
     Serial.flush();
     exit(-1); // halt
   }
-  
+
   Serial.println(F("----------------------------------"));
   Serial.println(F("Reading firmware version..."));
   uint8_t firmwareVersion[2];
@@ -188,28 +188,28 @@ void loop() {
   Serial.println(loopCnt++);
 
 /*
-  // code for unlocking an ICODE SLIX2 protected tag   
+  // code for unlocking an ICODE SLIX2 protected tag
   ISO15693ErrorCode myrc = nfc.unlockICODESLIX2(password);
   if (ISO15693_EC_OK == myrc) {
     Serial.println("unlockICODESLIX2 successful");
   }
 */
-  
-/* 
+
+/*
   // code for set a new SLIX2 privacy password
   nfc.getInventory(uid);
-  Serial.println("set new password"); 
-  
+  Serial.println("set new password");
+
   ISO15693ErrorCode myrc2 = nfc.newpasswordICODESLIX2(password, standardpassword, uid);
-  if (ISO15693_EC_OK == myrc2) { 
-   Serial.println("sucess! new password set");    
+  if (ISO15693_EC_OK == myrc2) {
+   Serial.println("sucess! new password set");
   }else{
-   Serial.println("fail! no new password set: "); 
-   Serial.println(nfc.strerror(myrc2));  
-   Serial.println(" "); 
-  } 
+   Serial.println("fail! no new password set: ");
+   Serial.println(nfc.strerror(myrc2));
+   Serial.println(" ");
+  }
  */
-  
+
   uint8_t uid[8];
   ISO15693ErrorCode rc = nfc.getInventory(uid);
   if (ISO15693_EC_OK != rc) {
@@ -293,7 +293,7 @@ void loop() {
 #endif /* WRITE_ENABLED */
 
 /*
-  // code for locking an ICODE SLIX2 protected tag   
+  // code for locking an ICODE SLIX2 protected tag
   ISO15693ErrorCode myrc = nfc.lockICODESLIX2(password);
   if (ISO15693_EC_OK == myrc) {
     Serial.println("lockICODESLIX2 successful");

From 78388d5b57e8b06d3938877ee28f4fecc82e3c1a Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 03:50:08 +0200
Subject: [PATCH 02/10] Remove Yoda notation

---
 PN5180.cpp                                 | 22 +++++++++++-----------
 PN5180ISO15693.cpp                         | 16 ++++++++--------
 PN5180iClass.cpp                           | 22 +++++++++++-----------
 examples/PN5180-FeliCa/PN5180-FeliCa.ino   |  2 +-
 examples/PN5180-Library/PN5180-Library.ino | 12 ++++++------
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index a37a269..a56c8b9 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -314,7 +314,7 @@ bool PN5180::sendData(uint8_t *data, int len, uint8_t validBits) {
    */
 
   PN5180TransceiveStat transceiveState = getTransceiveState();
-  if (PN5180_TS_WaitTransmit != transceiveState) {
+  if (transceiveState != PN5180_TS_WaitTransmit) {
     PN5180DEBUG(F("*** ERROR: Transceiver not in state WaitTransmit!?\n"));
     return false;
   }
@@ -341,7 +341,7 @@ uint8_t * PN5180::readData(int len, uint8_t *buffer /* = NULL */) {
     Serial.println(F("*** FATAL: Reading more than 508 bytes is not supported!"));
     return 0L;
   }
-  if (NULL == buffer) {
+  if (buffer == NULL) {
     buffer = readBuffer;
   }
 
@@ -415,7 +415,7 @@ bool PN5180::setRF_on() {
   transceiveCommand(cmd, 2);
   SPI.endTransaction();
 
-  while (0 == (TX_RFON_IRQ_STAT & getIRQStatus())); // wait for RF field to set up
+  while (!(getIRQStatus() & TX_RFON_IRQ_STAT)); // wait for RF field to set up
   clearIRQStatus(TX_RFON_IRQ_STAT);
   return true;
 }
@@ -434,7 +434,7 @@ bool PN5180::setRF_off() {
   transceiveCommand(cmd, 2);
   SPI.endTransaction();
 
-  while (0 == (TX_RFOFF_IRQ_STAT & getIRQStatus())); // wait for RF field to shut down
+  while (!(getIRQStatus() & TX_RFOFF_IRQ_STAT)); // wait for RF field to shut down
   clearIRQStatus(TX_RFOFF_IRQ_STAT);
   return true;
 }
@@ -488,7 +488,7 @@ bool PN5180::transceiveCommand(uint8_t *sendBuffer, size_t sendBufferLen, uint8_
 #endif
 
   // 0.
-  while (LOW != digitalRead(PN5180_BUSY)); // wait until busy is low
+  while (digitalRead(PN5180_BUSY) != LOW); // wait until busy is low
   // 1.
   digitalWrite(PN5180_NSS, LOW); delay(2);
   // 2.
@@ -496,15 +496,15 @@ bool PN5180::transceiveCommand(uint8_t *sendBuffer, size_t sendBufferLen, uint8_
     SPI.transfer(sendBuffer[i]);
   }
   // 3.
-  while(HIGH != digitalRead(PN5180_BUSY));  // wait until BUSY is high
+  while(digitalRead(PN5180_BUSY) != HIGH);  // wait until BUSY is high
   // 4.
   digitalWrite(PN5180_NSS, HIGH); delay(1);
   // 5.
-  while (LOW != digitalRead(PN5180_BUSY)); // wait unitl BUSY is low
+  while (digitalRead(PN5180_BUSY) != LOW); // wait unitl BUSY is low
 
   // check, if write-only
   //
-  if ((0 == recvBuffer) || (0 == recvBufferLen)) return true;
+  if ((recvBuffer == NULL) || (recvBufferLen == 0)) return true;
   PN5180DEBUG(F("Receiving SPI frame...\n"));
 
   // 1.
@@ -514,11 +514,11 @@ bool PN5180::transceiveCommand(uint8_t *sendBuffer, size_t sendBufferLen, uint8_
     recvBuffer[i] = SPI.transfer(0xff);
   }
   // 3.
-  while(HIGH != digitalRead(PN5180_BUSY));  // wait until BUSY is high
+  while(digitalRead(PN5180_BUSY) != HIGH);  // wait until BUSY is high
   // 4.
   digitalWrite(PN5180_NSS, HIGH); delay(1);
   // 5.
-  while(LOW != digitalRead(PN5180_BUSY));  // wait until BUSY is low
+  while(digitalRead(PN5180_BUSY) != LOW);  // wait until BUSY is low
 
 #ifdef DEBUG
   PN5180DEBUG(F("Received: "));
@@ -541,7 +541,7 @@ void PN5180::reset() {
   digitalWrite(PN5180_RST, HIGH); // 2ms to ramp up required
   delay(10);
 
-  while (0 == (IDLE_IRQ_STAT & getIRQStatus())); // wait for system to start up
+  while (!(getIRQStatus() & IDLE_IRQ_STAT)); // wait for system to start up
 
   clearIRQStatus(0xffffffff); // clear all flags
 }
diff --git a/PN5180ISO15693.cpp b/PN5180ISO15693.cpp
index 254232d..f2fc307 100644
--- a/PN5180ISO15693.cpp
+++ b/PN5180ISO15693.cpp
@@ -46,7 +46,7 @@ ISO15693ErrorCode PN5180ISO15693::getInventory(uint8_t *uid) {
 
   uint8_t *readBuffer;
   ISO15693ErrorCode rc = issueISO15693Command(inventory, sizeof(inventory), &readBuffer);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     return rc;
   }
 
@@ -121,7 +121,7 @@ ISO15693ErrorCode PN5180ISO15693::readSingleBlock(uint8_t *uid, uint8_t blockNo,
 
   uint8_t *resultPtr;
   ISO15693ErrorCode rc = issueISO15693Command(readSingleBlock, sizeof(readSingleBlock), &resultPtr);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     return rc;
   }
 
@@ -212,7 +212,7 @@ ISO15693ErrorCode PN5180ISO15693::writeSingleBlock(uint8_t *uid, uint8_t blockNo
 
   uint8_t *resultPtr;
   ISO15693ErrorCode rc = issueISO15693Command(writeCmd, writeCmdSize, &resultPtr);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     free(writeCmd);
     return rc;
   }
@@ -284,7 +284,7 @@ ISO15693ErrorCode PN5180ISO15693::getSystemInfo(uint8_t *uid, uint8_t *blockSize
 
   uint8_t *readBuffer;
   ISO15693ErrorCode rc = issueISO15693Command(sysInfo, sizeof(sysInfo), &readBuffer);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     return rc;
   }
 
@@ -547,10 +547,10 @@ ISO15693ErrorCode PN5180ISO15693::issueISO15693Command(uint8_t *cmd, uint8_t cmd
   sendData(cmd, cmdLen);
   delay(10);
   uint32_t status = getIRQStatus();
-  if (0 == (status & RX_SOF_DET_IRQ_STAT)) {
+  if (!(status & RX_SOF_DET_IRQ_STAT)) {
     return EC_NO_CARD;
   }
-  while (0 == (status & RX_IRQ_STAT)) {
+  while (!(status & RX_IRQ_STAT)) {
     delay(10);
     status = getIRQStatus();
   }
@@ -568,7 +568,7 @@ ISO15693ErrorCode PN5180ISO15693::issueISO15693Command(uint8_t *cmd, uint8_t cmd
   PN5180DEBUG("\n");
 
  *resultPtr = readData(len);
-  if (0L == *resultPtr) {
+  if (*resultPtr == NULL) {
     PN5180DEBUG(F("*** ERROR in readData!\n"));
     return ISO15693_EC_UNKNOWN_ERROR;
   }
@@ -583,7 +583,7 @@ ISO15693ErrorCode PN5180ISO15693::issueISO15693Command(uint8_t *cmd, uint8_t cmd
 #endif
 
   uint32_t irqStatus = getIRQStatus();
-  if (0 == (RX_SOF_DET_IRQ_STAT & irqStatus)) { // no card detected
+  if (!(irqStatus & RX_SOF_DET_IRQ_STAT)) { // no card detected
     clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
     return EC_NO_CARD;
   }
diff --git a/PN5180iClass.cpp b/PN5180iClass.cpp
index 4c9db68..7057a5a 100644
--- a/PN5180iClass.cpp
+++ b/PN5180iClass.cpp
@@ -36,7 +36,7 @@ iClassErrorCode PN5180iClass::ActivateAll() {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(actall, sizeof(actall), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -57,7 +57,7 @@ iClassErrorCode PN5180iClass::Identify(uint8_t *csn) {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(identify, sizeof(identify), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -84,7 +84,7 @@ iClassErrorCode PN5180iClass::Select(uint8_t *csn) {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(select, sizeof(select), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -107,7 +107,7 @@ iClassErrorCode PN5180iClass::ReadCheck(uint8_t *ccnr) {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(readcheck, sizeof(readcheck), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -134,7 +134,7 @@ iClassErrorCode PN5180iClass::Check(uint8_t *mac) {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(check, sizeof(check), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -151,7 +151,7 @@ iClassErrorCode PN5180iClass::Read(uint8_t blockNum, uint8_t *blockData) {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(read, sizeof(read), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -173,7 +173,7 @@ iClassErrorCode PN5180iClass::Halt() {
 
   uint8_t *readBuffer;
   iClassErrorCode rc = issueiClassCommand(halt, sizeof(halt), &readBuffer);
-  if (ICLASS_EC_OK != rc) {
+  if (rc != ICLASS_EC_OK) {
     return rc;
   }
 
@@ -190,7 +190,7 @@ iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, u
   sendData(cmd, cmdLen);
   delay(10);
 
-  if (0 == (getIRQStatus() & RX_SOF_DET_IRQ_STAT)) {
+  if (!(getIRQStatus() & RX_SOF_DET_IRQ_STAT)) {
     return EC_NO_CARD;
   }
 
@@ -207,7 +207,7 @@ iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, u
   PN5180DEBUG("\n");
 
   *resultPtr = readData(len);
-  if (0L == *resultPtr) {
+  if (*resultPtr == NULL) {
     PN5180DEBUG(F("*** ERROR in readData!\n"));
     return ICLASS_EC_UNKNOWN_ERROR;
   }
@@ -222,13 +222,13 @@ iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, u
 #endif
 
   uint32_t irqStatus = getIRQStatus();
-  if (0 == (RX_SOF_DET_IRQ_STAT & irqStatus)) { // no card detected
+  if (!(irqStatus & RX_SOF_DET_IRQ_STAT)) { // no card detected
     clearIRQStatus(TX_IRQ_STAT | IDLE_IRQ_STAT);
     return EC_NO_CARD;
   }
 
   // Datasheet Picopass 2K V1.0  section 4.3.2
-  if (RX_SOF_DET_IRQ_STAT == (RX_SOF_DET_IRQ_STAT & irqStatus)) {
+  if (irqStatus & RX_SOF_DET_IRQ_STAT) {
     clearIRQStatus(RX_SOF_DET_IRQ_STAT);
     return ICLASS_EC_OK;
   }
diff --git a/examples/PN5180-FeliCa/PN5180-FeliCa.ino b/examples/PN5180-FeliCa/PN5180-FeliCa.ino
index b556bba..289905d 100644
--- a/examples/PN5180-FeliCa/PN5180-FeliCa.ino
+++ b/examples/PN5180-FeliCa/PN5180-FeliCa.ino
@@ -116,7 +116,7 @@ void setup() {
   Serial.print(".");
   Serial.println(productVersion[0]);
 
-  if (0xff == productVersion[1]) { // if product version 255, the initialization failed
+  if (productVersion[1] == 0xff) { // if product version 255, the initialization failed
     Serial.println(F("Initialization failed!?"));
     Serial.println(F("Press reset to restart..."));
     Serial.flush();
diff --git a/examples/PN5180-Library/PN5180-Library.ino b/examples/PN5180-Library/PN5180-Library.ino
index 74087da..460d55d 100644
--- a/examples/PN5180-Library/PN5180-Library.ino
+++ b/examples/PN5180-Library/PN5180-Library.ino
@@ -114,7 +114,7 @@ void setup() {
   Serial.print(".");
   Serial.println(productVersion[0]);
 
-  if (0xff == productVersion[1]) { // if product version 255, the initialization failed
+  if (productVersion[1] == 0xff) { // if product version 255, the initialization failed
     Serial.println(F("Initialization failed!?"));
     Serial.println(F("Press reset to restart..."));
     Serial.flush();
@@ -173,7 +173,7 @@ void loop() {
     uint32_t irqStatus = nfc.getIRQStatus();
     showIRQStatus(irqStatus);
 
-    if (0 == (RX_SOF_DET_IRQ_STAT & irqStatus)) { // no card detected
+    if (!(irqStatus & RX_SOF_DET_IRQ_STAT)) { // no card detected
       Serial.println(F("*** No card detected!"));
     }
 
@@ -212,7 +212,7 @@ void loop() {
 
   uint8_t uid[8];
   ISO15693ErrorCode rc = nfc.getInventory(uid);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     Serial.print(F("Error in getInventory: "));
     Serial.println(nfc.strerror(rc));
     errorFlag = true;
@@ -228,7 +228,7 @@ void loop() {
   Serial.println(F("----------------------------------"));
   uint8_t blockSize, numBlocks;
   rc = nfc.getSystemInfo(uid, &blockSize, &numBlocks);
-  if (ISO15693_EC_OK != rc) {
+  if (rc != ISO15693_EC_OK) {
     Serial.print(F("Error in getSystemInfo: "));
     Serial.println(nfc.strerror(rc));
     errorFlag = true;
@@ -243,7 +243,7 @@ void loop() {
   uint8_t readBuffer[blockSize];
   for (int no=0; no<numBlocks; no++) {
     rc = nfc.readSingleBlock(uid, no, readBuffer, blockSize);
-    if (ISO15693_EC_OK != rc) {
+    if (rc != ISO15693_EC_OK) {
       Serial.print(F("Error in readSingleBlock #"));
       Serial.print(no);
       Serial.print(": ");
@@ -277,7 +277,7 @@ void loop() {
   }
   for (int no=0; no<numBlocks; no++) {
     rc = nfc.writeSingleBlock(uid, no, writeBuffer, blockSize);
-    if (ISO15693_EC_OK == rc) {
+    if (rc == ISO15693_EC_OK) {
       Serial.print(F("Wrote block #"));
       Serial.println(no);
     }

From 850fbc41d468a0bbff1675829bb9c5217f89b61d Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 03:55:06 +0200
Subject: [PATCH 03/10] return directly if there is no code in between

---
 PN5180ISO15693.cpp |  9 +++------
 PN5180iClass.cpp   | 21 +++------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/PN5180ISO15693.cpp b/PN5180ISO15693.cpp
index f2fc307..b273fd4 100644
--- a/PN5180ISO15693.cpp
+++ b/PN5180ISO15693.cpp
@@ -406,8 +406,7 @@ ISO15693ErrorCode PN5180ISO15693::setPassword(uint8_t *password, uint8_t *random
   setPassword[5] = password[1] ^ random[1];
   setPassword[6] = password[2] ^ random[0];
   setPassword[7] = password[3] ^ random[1];
-  ISO15693ErrorCode rc = issueISO15693Command(setPassword, sizeof(setPassword), &readBuffer);
-  return rc;
+  return issueISO15693Command(setPassword, sizeof(setPassword), &readBuffer);
 }
 
 ISO15693ErrorCode PN5180ISO15693::enablePrivacy(uint8_t *password, uint8_t *random) {
@@ -417,8 +416,7 @@ ISO15693ErrorCode PN5180ISO15693::enablePrivacy(uint8_t *password, uint8_t *rand
   setPrivacy[4] = password[1] ^ random[1];
   setPrivacy[5] = password[2] ^ random[0];
   setPrivacy[6] = password[3] ^ random[1];
-  ISO15693ErrorCode rc = issueISO15693Command(setPrivacy, sizeof(setPrivacy), &readBuffer);
-  return rc;
+  return issueISO15693Command(setPrivacy, sizeof(setPrivacy), &readBuffer);
 }
 
 ISO15693ErrorCode PN5180ISO15693::writePassword(uint8_t *password, uint8_t *uid) {
@@ -428,8 +426,7 @@ ISO15693ErrorCode PN5180ISO15693::writePassword(uint8_t *password, uint8_t *uid)
   writePassword[13] = password[1];
   writePassword[14] = password[2];
   writePassword[15] = password[3];
-  ISO15693ErrorCode rc = issueISO15693Command(writePassword, sizeof(writePassword), &readBuffer);
-  return rc;
+  return issueISO15693Command(writePassword, sizeof(writePassword), &readBuffer);
 }
 
 
diff --git a/PN5180iClass.cpp b/PN5180iClass.cpp
index 7057a5a..65d5692 100644
--- a/PN5180iClass.cpp
+++ b/PN5180iClass.cpp
@@ -35,12 +35,7 @@ iClassErrorCode PN5180iClass::ActivateAll() {
   uint8_t actall[] = {ICLASS_CMD_ACTALL};
 
   uint8_t *readBuffer;
-  iClassErrorCode rc = issueiClassCommand(actall, sizeof(actall), &readBuffer);
-  if (rc != ICLASS_EC_OK) {
-    return rc;
-  }
-
-  return ICLASS_EC_OK;
+  return issueiClassCommand(actall, sizeof(actall), &readBuffer);
 }
 
 iClassErrorCode PN5180iClass::Identify(uint8_t *csn) {
@@ -133,12 +128,7 @@ iClassErrorCode PN5180iClass::Check(uint8_t *mac) {
   }
 
   uint8_t *readBuffer;
-  iClassErrorCode rc = issueiClassCommand(check, sizeof(check), &readBuffer);
-  if (rc != ICLASS_EC_OK) {
-    return rc;
-  }
-
-  return ICLASS_EC_OK;
+  return issueiClassCommand(check, sizeof(check), &readBuffer);
 }
 
 iClassErrorCode PN5180iClass::Read(uint8_t blockNum, uint8_t *blockData) {
@@ -172,12 +162,7 @@ iClassErrorCode PN5180iClass::Halt() {
   uint8_t halt[] = {ICLASS_CMD_HALT};
 
   uint8_t *readBuffer;
-  iClassErrorCode rc = issueiClassCommand(halt, sizeof(halt), &readBuffer);
-  if (rc != ICLASS_EC_OK) {
-    return rc;
-  }
-
-  return ICLASS_EC_OK;
+  return issueiClassCommand(halt, sizeof(halt), &readBuffer);
 }
 
 iClassErrorCode PN5180iClass::issueiClassCommand(uint8_t *cmd, uint8_t cmdLen, uint8_t **resultPtr) {

From 21ec17a55ceb36ec4b273f718797f1ae5e9521ff Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 04:27:14 +0200
Subject: [PATCH 04/10] Unify and simplify command creation (and fix buffer
 overflows). This commit also fixes buffer overflows in
 PN5180ISO14443::mifareBlockWrite16() and PN5180ISO14443::mifareHalt() where
 the cmd buffer was 1 instead of the required 2 bytes long.

---
 PN5180.cpp         | 56 +++++++++++++++++++++++-----------------------
 PN5180FeliCa.cpp   | 18 +++++++--------
 PN5180ISO14443.cpp | 34 +++++++++++-----------------
 3 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index a56c8b9..4f02f0d 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -99,10 +99,10 @@ bool PN5180::writeRegister(uint8_t reg, uint32_t value) {
   For all 4 byte command parameter transfers (e.g. register values), the payload
   parameters passed follow the little endian approach (Least Significant Byte first).
    */
-  uint8_t buf[6] = { PN5180_WRITE_REGISTER, reg, p[0], p[1], p[2], p[3] };
+  uint8_t cmd[] = { PN5180_WRITE_REGISTER, reg, p[0], p[1], p[2], p[3] };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(buf, 6);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   return true;
@@ -129,10 +129,10 @@ bool PN5180::writeRegisterWithOrMask(uint8_t reg, uint32_t mask) {
   PN5180DEBUG("\n");
 #endif
 
-  uint8_t buf[6] = { PN5180_WRITE_REGISTER_OR_MASK, reg, p[0], p[1], p[2], p[3] };
+  uint8_t cmd[] = { PN5180_WRITE_REGISTER_OR_MASK, reg, p[0], p[1], p[2], p[3] };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(buf, 6);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   return true;
@@ -159,10 +159,10 @@ bool PN5180::writeRegisterWithAndMask(uint8_t reg, uint32_t mask) {
   PN5180DEBUG("\n");
 #endif
 
-  uint8_t buf[6] = { PN5180_WRITE_REGISTER_AND_MASK, reg, p[0], p[1], p[2], p[3] };
+  uint8_t cmd[] = { PN5180_WRITE_REGISTER_AND_MASK, reg, p[0], p[1], p[2], p[3] };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(buf, 6);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   return true;
@@ -180,10 +180,10 @@ bool PN5180::readRegister(uint8_t reg, uint32_t *value) {
   PN5180DEBUG(formatHex(reg));
   PN5180DEBUG(F("...\n"));
 
-  uint8_t cmd[2] = { PN5180_READ_REGISTER, reg };
+  uint8_t cmd[] = { PN5180_READ_REGISTER, reg };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 2, (uint8_t*)value, 4);
+  transceiveCommand(cmd, sizeof(cmd), (uint8_t*)value, 4);
   SPI.endTransaction();
 
   PN5180DEBUG(F("Register value=0x"));
@@ -208,15 +208,15 @@ bool PN5180::writeEEPROM(uint8_t addr, uint8_t *data, int len) {
   PN5180DEBUG(len);
   PN5180DEBUG(F("...\n"));
 
-  uint8_t buffer[len+2];
-  buffer[0] = PN5180_WRITE_EEPROM;
-  buffer[1] = addr;
+  uint8_t cmd[len+2];
+  cmd[0] = PN5180_WRITE_EEPROM;
+  cmd[1] = addr;
   for (int i=0; i<len; i++) {
-    buffer[2+i] = data[i];
+    cmd[2+i] = data[i];
   }
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(buffer, len+2);
+  transceiveCommand(cmd, len+2);
   SPI.endTransaction();
 
   return true;
@@ -245,10 +245,10 @@ bool PN5180::readEEprom(uint8_t addr, uint8_t *buffer, int len) {
   PN5180DEBUG(len);
   PN5180DEBUG(F("...\n"));
 
-  uint8_t cmd[3] = { PN5180_READ_EEPROM, addr, len };
+  uint8_t cmd[] = { PN5180_READ_EEPROM, addr, len };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 3, buffer, len);
+  transceiveCommand(cmd, sizeof(cmd), buffer, len);
   SPI.endTransaction();
 
 #ifdef DEBUG
@@ -295,11 +295,11 @@ bool PN5180::sendData(uint8_t *data, int len, uint8_t validBits) {
   PN5180DEBUG("\n");
 #endif
 
-  uint8_t buffer[len+2];
-  buffer[0] = PN5180_SEND_DATA;
-  buffer[1] = validBits; // number of valid bits of last byte are transmitted (0 = all bits are transmitted)
+  uint8_t cmd[len+2];
+  cmd[0] = PN5180_SEND_DATA;
+  cmd[1] = validBits; // number of valid bits of last byte are transmitted (0 = all bits are transmitted)
   for (int i=0; i<len; i++) {
-    buffer[2+i] = data[i];
+    cmd[2+i] = data[i];
   }
 
   writeRegisterWithAndMask(SYSTEM_CONFIG, 0xfffffff8);  // Idle/StopCom Command
@@ -320,7 +320,7 @@ bool PN5180::sendData(uint8_t *data, int len, uint8_t validBits) {
   }
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(buffer, len+2);
+  transceiveCommand(cmd, len+2);
   SPI.endTransaction();
 
   return true;
@@ -349,10 +349,10 @@ uint8_t * PN5180::readData(int len, uint8_t *buffer /* = NULL */) {
   PN5180DEBUG(len);
   PN5180DEBUG(F(")...\n"));
 
-  uint8_t cmd[2] = { PN5180_READ_DATA, 0x00 };
+  uint8_t cmd[] = { PN5180_READ_DATA, 0x00 };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 2, buffer, len);
+  transceiveCommand(cmd, sizeof(cmd), buffer, len);
   SPI.endTransaction();
 
 #ifdef DEBUG
@@ -392,10 +392,10 @@ bool PN5180::loadRFConfig(uint8_t txConf, uint8_t rxConf) {
   PN5180DEBUG(formatHex(rxConf));
   PN5180DEBUG("\n");
 
-  uint8_t cmd[3] = { PN5180_LOAD_RF_CONFIG, txConf, rxConf };
+  uint8_t cmd[] = { PN5180_LOAD_RF_CONFIG, txConf, rxConf };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 3);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   return true;
@@ -409,10 +409,10 @@ bool PN5180::loadRFConfig(uint8_t txConf, uint8_t rxConf) {
 bool PN5180::setRF_on() {
   PN5180DEBUG(F("Set RF ON\n"));
 
-  uint8_t cmd[2] = { PN5180_RF_ON, 0x00 };
+  uint8_t cmd[] = { PN5180_RF_ON, 0x00 };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 2);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   while (!(getIRQStatus() & TX_RFON_IRQ_STAT)); // wait for RF field to set up
@@ -428,10 +428,10 @@ bool PN5180::setRF_on() {
 bool PN5180::setRF_off() {
   PN5180DEBUG(F("Set RF OFF\n"));
 
-  uint8_t cmd[2] { PN5180_RF_OFF, 0x00 };
+  uint8_t cmd[] { PN5180_RF_OFF, 0x00 };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
-  transceiveCommand(cmd, 2);
+  transceiveCommand(cmd, sizeof(cmd));
   SPI.endTransaction();
 
   while (!(getIRQStatus() & TX_RFOFF_IRQ_STAT)); // wait for RF field to shut down
diff --git a/PN5180FeliCa.cpp b/PN5180FeliCa.cpp
index 536c723..b212bb2 100644
--- a/PN5180FeliCa.cpp
+++ b/PN5180FeliCa.cpp
@@ -55,7 +55,14 @@ bool PN5180FeliCa::setupRF() {
 * - 8 if a FeliCa tag was recognized
 */
 uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
-  uint8_t cmd[6];
+  uint8_t cmd[] = {
+    0x06, //total length
+    0x00, //POL_REQ command
+    0xFF, //
+    0xFF, // any target
+    0x01, // System Code request
+    0x00, // 1 timeslot only
+  };
   uint8_t uidLength = 0;
   // Load FeliCa 424 protocol
   if (!loadRFConfig(0x09, 0x89))
@@ -65,14 +72,7 @@ uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
     return 0;
 
   //send FeliCa request (every packet starts with length)
-  cmd[0] = 0x06;             //total length
-  cmd[1] = 0x00;             //POL_REQ command
-  cmd[2] = 0xFF;             //
-  cmd[3] = 0xFF;             // any target
-  cmd[4] = 0x01;             // System Code request
-  cmd[5] = 0x00;             // 1 timeslot only
-
-  if (!sendData(cmd, 6, 0x00))
+  if (!sendData(cmd, sizeof(cmd)))
     return 0;
   //wait a little to avoid bug with some cards
   delay(50);
diff --git a/PN5180ISO14443.cpp b/PN5180ISO14443.cpp
index 6a60f7b..47c121d 100644
--- a/PN5180ISO14443.cpp
+++ b/PN5180ISO14443.cpp
@@ -84,7 +84,7 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
     return 0;
   //Send REQA/WUPA, 7 bits in last byte
   cmd[0] = (kind == 0) ? 0x26 : 0x52;
-  if (!sendData(cmd, 1, 0x07))
+  if (!sendData(cmd, 1, 7))
     return 0;
   // READ 2 bytes ATQA into  buffer
   if (!readData(2, buffer))
@@ -92,7 +92,7 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
   //Send Anti collision 1, 8 bits in last byte
   cmd[0] = 0x93;
   cmd[1] = 0x20;
-  if (!sendData(cmd, 2, 0x00))
+  if (!sendData(cmd, 2))
     return 0;
   //Read 5 bytes, we will store at offset 2 for later usage
   if (!readData(5, cmd+2))
@@ -106,7 +106,7 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
   //Send Select anti collision 1, the remaining bytes are already in offset 2 onwards
   cmd[0] = 0x93;
   cmd[1] = 0x70;
-  if (!sendData(cmd, 7, 0x00))
+  if (!sendData(cmd, 7))
     return 0;
   //Read 1 byte SAK into buffer[2]
   if (!readData(1, buffer+2))
@@ -134,7 +134,7 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
     // Do anti collision 2
     cmd[0] = 0x95;
     cmd[1] = 0x20;
-    if (!sendData(cmd, 2, 0x00))
+    if (!sendData(cmd, 2))
       return 0;
     //Read 5 bytes. we will store at offset 2 for later use
     if (!readData(5, cmd+2))
@@ -152,7 +152,7 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
     //Send Select anti collision 2
     cmd[0] = 0x95;
     cmd[1] = 0x70;
-    if (!sendData(cmd, 7, 0x00))
+    if (!sendData(cmd, 7))
       return 0;
     //Read 1 byte SAK into buffer[2]
     if (!readData(1, buffer + 2))
@@ -165,11 +165,8 @@ uint8_t PN5180ISO14443::activateTypeA(uint8_t *buffer, uint8_t kind) {
 bool PN5180ISO14443::mifareBlockRead(uint8_t blockno, uint8_t *buffer) {
   bool success = false;
   uint16_t len;
-  uint8_t cmd[2];
-  // Send mifare command 30,blockno
-  cmd[0] = 0x30;
-  cmd[1] = blockno;
-  if (!sendData(cmd, 2, 0x00))
+  uint8_t cmd[] = { 0x30, blockno };
+  if (!sendData(cmd, sizeof(cmd)))
     return false;
   //Check if we have received any data from the tag
   delay(5);
@@ -184,34 +181,29 @@ bool PN5180ISO14443::mifareBlockRead(uint8_t blockno, uint8_t *buffer) {
 
 
 uint8_t PN5180ISO14443::mifareBlockWrite16(uint8_t blockno, uint8_t *buffer) {
-  uint8_t cmd[1];
+  uint8_t cmd[] = { 0xA0, blockno };
   // Clear RX CRC
   writeRegisterWithAndMask(CRC_RX_CONFIG, 0xFFFFFFFE);
 
   // Mifare write part 1
-  cmd[0] = 0xA0;
-  cmd[1] = blockno;
-  sendData(cmd, 2, 0x00);
+  sendData(cmd, sizeof(cmd));
   readData(1, cmd);
 
   // Mifare write part 2
-  sendData(buffer,16, 0x00);
+  sendData(buffer, 16);
   delay(10);
 
   // Read ACK/NAK
   readData(1, cmd);
 
   //Enable RX CRC calculation
-  writeRegisterWithOrMask(CRC_RX_CONFIG, 0x1);
+  writeRegisterWithOrMask(CRC_RX_CONFIG, 0x01);
   return cmd[0];
 }
 
 bool PN5180ISO14443::mifareHalt() {
-  uint8_t cmd[1];
-  //mifare Halt
-  cmd[0] = 0x50;
-  cmd[1] = 0x00;
-  sendData(cmd, 2, 0x00);
+  uint8_t cmd[] = { 0x50, 0x00 };
+  sendData(cmd, sizeof(cmd));
   return true;
 }
 

From 14f0f622fde215b64cc03dad12d362c33e804b9b Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 04:32:43 +0200
Subject: [PATCH 05/10] Simplify response buffer initialisation

---
 PN5180FeliCa.cpp   | 5 +----
 PN5180ISO14443.cpp | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/PN5180FeliCa.cpp b/PN5180FeliCa.cpp
index b212bb2..65269bc 100644
--- a/PN5180FeliCa.cpp
+++ b/PN5180FeliCa.cpp
@@ -96,12 +96,9 @@ uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
 }
 
 uint8_t PN5180FeliCa::readCardSerial(uint8_t *buffer) {
-  uint8_t response[20];
+  uint8_t response[20] = { 0 };
   uint8_t uidLength;
 
-    for (int i = 0; i < 20; i++)
-        response[i] = 0;
-
   uidLength = pol_req(response);
 
   // no reply
diff --git a/PN5180ISO14443.cpp b/PN5180ISO14443.cpp
index 47c121d..4160918 100644
--- a/PN5180ISO14443.cpp
+++ b/PN5180ISO14443.cpp
@@ -208,14 +208,13 @@ bool PN5180ISO14443::mifareHalt() {
 }
 
 uint8_t PN5180ISO14443::readCardSerial(uint8_t *buffer) {
-  uint8_t response[10];
+  uint8_t response[10] = { 0 };
   uint8_t uidLength;
   // Always return 10 bytes
   // Offset 0..1 is ATQA
   // Offset 2 is SAK.
   // UID 4 bytes : offset 3 to 6 is UID, offset 7 to 9 to Zero
   // UID 7 bytes : offset 3 to 9 is UID
-  for (int i=0; i<10; i++) response[i] = 0;
   uidLength = activateTypeA(response, 1);
   if ((response[0] == 0xFF) && (response[1] == 0xFF))
     return 0;

From c14ea405d125d8bf0925b7991b401846e16c9a06 Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 04:34:21 +0200
Subject: [PATCH 06/10] Simplify UID length handling in PN5180FeliCa::pol_req()

---
 PN5180FeliCa.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/PN5180FeliCa.cpp b/PN5180FeliCa.cpp
index 65269bc..d7528ff 100644
--- a/PN5180FeliCa.cpp
+++ b/PN5180FeliCa.cpp
@@ -63,7 +63,6 @@ uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
     0x01, // System Code request
     0x00, // 1 timeslot only
   };
-  uint8_t uidLength = 0;
   // Load FeliCa 424 protocol
   if (!loadRFConfig(0x09, 0x89))
     return 0;
@@ -86,13 +85,8 @@ uint8_t PN5180FeliCa::pol_req(uint8_t *buffer) {
     buffer[i] = internalBuffer[i];
   }
 
-  //check Response Code
-  if (buffer[1] != 0x01) {
-    uidLength = 0;
-  } else {
-    uidLength = 8;
-  }
-  return uidLength;
+  // Check response code and return corresponding UID length
+  return buffer[1] == 0x01 ? 8 : 0;
 }
 
 uint8_t PN5180FeliCa::readCardSerial(uint8_t *buffer) {

From a76a503d73544ff383310bae4d8205612a6a450a Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 04:35:31 +0200
Subject: [PATCH 07/10] Remove magic number (read buffer size) in
 PN5180::sendData()

---
 PN5180.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index 4f02f0d..885065d 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -337,9 +337,9 @@ bool PN5180::sendData(uint8_t *data, int len, uint8_t validBits) {
  * reception buffer is invalid. If the condition is not fulfilled, an exception is raised.
  */
 uint8_t * PN5180::readData(int len, uint8_t *buffer /* = NULL */) {
-  if (len > 508) {
+  if (len > sizeof(readBuffer)) {
     Serial.println(F("*** FATAL: Reading more than 508 bytes is not supported!"));
-    return 0L;
+    return 0;
   }
   if (buffer == NULL) {
     buffer = readBuffer;

From ab849f04b18235230795f2453326c0c1e9b04f16 Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 05:17:32 +0200
Subject: [PATCH 08/10] Remove warning about unused variables in
 PN5180ISO15693::getSystemInfo() when DEBUG is not set

---
 PN5180ISO15693.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/PN5180ISO15693.cpp b/PN5180ISO15693.cpp
index b273fd4..db4aea4 100644
--- a/PN5180ISO15693.cpp
+++ b/PN5180ISO15693.cpp
@@ -305,21 +305,20 @@ ISO15693ErrorCode PN5180ISO15693::getSystemInfo(uint8_t *uid, uint8_t *blockSize
 
   uint8_t infoFlags = readBuffer[1];
   if (infoFlags & 0x01) { // DSFID flag
-    uint8_t dsfid = *p++;
     PN5180DEBUG("DSFID=");  // Data storage format identifier
-    PN5180DEBUG(formatHex(dsfid));
+    PN5180DEBUG(formatHex(*p));
     PN5180DEBUG("\n");
+    p++;
   }
 #ifdef DEBUG
   else PN5180DEBUG(F("No DSFID\n"));
 #endif
 
   if (infoFlags & 0x02) { // AFI flag
-    uint8_t afi = *p++;
     PN5180DEBUG(F("AFI="));  // Application family identifier
-    PN5180DEBUG(formatHex(afi));
+    PN5180DEBUG(formatHex(*p));
     PN5180DEBUG(F(" - "));
-    switch (afi >> 4) {
+    switch (*p >> 4) {
       case 0: PN5180DEBUG(F("All families")); break;
       case 1: PN5180DEBUG(F("Transport")); break;
       case 2: PN5180DEBUG(F("Financial")); break;
@@ -336,22 +335,18 @@ ISO15693ErrorCode PN5180ISO15693::getSystemInfo(uint8_t *uid, uint8_t *blockSize
       default: PN5180DEBUG(F("Unknown")); break;
     }
     PN5180DEBUG("\n");
+    p++;
   }
 #ifdef DEBUG
   else PN5180DEBUG(F("No AFI\n"));
 #endif
 
   if (infoFlags & 0x04) { // VICC Memory size
-    *numBlocks = *p++;
-    *blockSize = *p++;
-    *blockSize = (*blockSize) & 0x1f;
-
-    *blockSize = *blockSize + 1; // range: 1-32
-    *numBlocks = *numBlocks + 1; // range: 1-256
-    uint16_t viccMemSize = (*blockSize) * (*numBlocks);
+    *numBlocks = (*p++) + 1;        // range: 1-256 TODO may cause overflow (blockSize needs to be 16 bit)
+    *blockSize = (*p++ & 0x1f) + 1; // range: 1-32
 
     PN5180DEBUG("VICC MemSize=");
-    PN5180DEBUG(viccMemSize);
+    PN5180DEBUG((*blockSize) * (*numBlocks));
     PN5180DEBUG(" BlockSize=");
     PN5180DEBUG(*blockSize);
     PN5180DEBUG(" NumBlocks=");
@@ -363,10 +358,10 @@ ISO15693ErrorCode PN5180ISO15693::getSystemInfo(uint8_t *uid, uint8_t *blockSize
 #endif
 
   if (infoFlags & 0x08) { // IC reference
-    uint8_t icRef = *p++;
     PN5180DEBUG("IC Ref=");
-    PN5180DEBUG(formatHex(icRef));
+    PN5180DEBUG(formatHex(*p));
     PN5180DEBUG("\n");
+    p++;
   }
 #ifdef DEBUG
   else PN5180DEBUG(F("No IC ref\n"));

From 258d405fea56f8999641f9befc401835b00a3b78 Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 05:32:35 +0200
Subject: [PATCH 09/10] Fix warning about signed/unsigned comparison in
 PN5180::sendData()

---
 PN5180.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index 885065d..38285f2 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -337,7 +337,7 @@ bool PN5180::sendData(uint8_t *data, int len, uint8_t validBits) {
  * reception buffer is invalid. If the condition is not fulfilled, an exception is raised.
  */
 uint8_t * PN5180::readData(int len, uint8_t *buffer /* = NULL */) {
-  if (len > sizeof(readBuffer)) {
+  if (len < 0 || (unsigned int)len > sizeof(readBuffer)) {
     Serial.println(F("*** FATAL: Reading more than 508 bytes is not supported!"));
     return 0;
   }

From e8268cc917b322892b3ca469c5c209e7aa37f653 Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 3 Jun 2022 05:34:43 +0200
Subject: [PATCH 10/10] Fix warning about different integer types in
 PN5180::readEEprom()

---
 PN5180.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PN5180.cpp b/PN5180.cpp
index 38285f2..55ac4e4 100644
--- a/PN5180.cpp
+++ b/PN5180.cpp
@@ -245,7 +245,7 @@ bool PN5180::readEEprom(uint8_t addr, uint8_t *buffer, int len) {
   PN5180DEBUG(len);
   PN5180DEBUG(F("...\n"));
 
-  uint8_t cmd[] = { PN5180_READ_EEPROM, addr, len };
+  uint8_t cmd[] = { PN5180_READ_EEPROM, addr, (uint8_t)len };
 
   SPI.beginTransaction(PN5180_SPI_SETTINGS);
   transceiveCommand(cmd, sizeof(cmd), buffer, len);