Added RATS (Request for Answer To Select) #271

Added ATQA information for card identification
Added MIFARE DESFire type
Improved RATS

Added the "Dumping memory contents not implemented for that PICC type." for ISO-14443 cards

updated keyword.txt

Added PPS (Protocol and Parameter Selection Request)

Change baud rates in PPS and hardcoded CID

Improved ATS response.

Made ATS response more user-friendly

Enable CRC for T=CL after succesfull PPS.

Added TCL_Transceive and TCL_Deselect methods.

Response to TCL_Transceive takes care if R-Block is received

Added private methos to help parse PCB Block response

Using a structure to transceive PCB blocks.

Renamed some methods and structures.

Change some method and structure names and fixed a bug in PPS.

Added sanity check to PPS command

Added method to send R-Block (ACK/NAK).
Also takes care if chaining is present in I-Block response.

PPS works at 106 and 212 Kbps (Higher speeds not working)
This commit is contained in:
jpg-consulting
2017-01-07 11:29:46 +01:00
committed by Rotzbua
parent c4e10ed549
commit 45b7e60584
3 changed files with 1000 additions and 8 deletions

View File

@@ -13,8 +13,11 @@ PICC_Command KEYWORD1
MIFARE_Misc KEYWORD1
PICC_Type KEYWORD1
StatusCode KEYWORD1
TagBitRates KEYWORD1
Uid KEYWORD1
CardInfo KEYWORD1
MIFARE_Key KEYWORD1
PcbBlock KEYWORD1
#######################################
# KEYWORD2 Methods and functions
@@ -47,6 +50,13 @@ PICC_WakeupA KEYWORD2
PICC_REQA_or_WUPA KEYWORD2
PICC_Select KEYWORD2
PICC_HaltA KEYWORD2
PICC_RATS KEYWORD2
PICC_PPS KEYWORD2
# Functions for communicating with ISO/IEC 14433-4 cards
TCL_Transceive KEYWORD2
TCL_TransceiveRBlock KEYWORD2
TCL_Deselect KEYWORD2
# Functions for communicating with MIFARE PICCs
PCD_Authenticate KEYWORD2
@@ -72,6 +82,7 @@ PICC_DumpDetailsToSerial KEYWORD2
PICC_DumpMifareClassicToSerial KEYWORD2
PICC_DumpMifareClassicSectorToSerial KEYWORD2
PICC_DumpMifareUltralightToSerial KEYWORD2
PICC_DumpISO14443_4 KEYWORD2
# Advanced functions for MIFARE
MIFARE_SetAccessBits KEYWORD2
@@ -168,6 +179,7 @@ PICC_CMD_SEL_CL1 LITERAL1
PICC_CMD_SEL_CL2 LITERAL1
PICC_CMD_SEL_CL3 LITERAL1
PICC_CMD_HLTA LITERAL1
PICC_CMD_RATS LITERAL1
PICC_CMD_MF_AUTH_KEY_A LITERAL1
PICC_CMD_MF_AUTH_KEY_B LITERAL1
PICC_CMD_MF_READ LITERAL1
@@ -187,6 +199,7 @@ PICC_TYPE_MIFARE_1K LITERAL1
PICC_TYPE_MIFARE_4K LITERAL1
PICC_TYPE_MIFARE_UL LITERAL1
PICC_TYPE_MIFARE_PLUS LITERAL1
PICC_TYPE_MIFARE_DESFIRE LITERAL1
PICC_TYPE_TNP3XXX LITERAL1
PICC_TYPE_NOT_COMPLETE LITERAL1
STATUS_OK LITERAL1
@@ -199,3 +212,7 @@ STATUS_INVALID LITERAL1
STATUS_CRC_WRONG LITERAL1
STATUS_MIFARE_NACK LITERAL1
FIFO_SIZE LITERAL1
BITRATE_106KBITS LITERAL1
BITRATE_212KBITS LITERAL1
BITRATE_424KBITS LITERAL1
BITRATE_848KBITS LITERAL1