From abff0402f6bc1e89bb690d316e5e4b8d5cfda0cf Mon Sep 17 00:00:00 2001 From: chenzitai Date: Tue, 31 Jul 2018 04:25:52 +0100 Subject: [PATCH] Full implement decoding half-Duplex Data Trans Protocol in iso14443-4 (Show PCB Block infos) (cherry picked from commit 9f469be) --- Software/Chameleon/ISO14443.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Software/Chameleon/ISO14443.py b/Software/Chameleon/ISO14443.py index 04fd6f6..1ee4596 100644 --- a/Software/Chameleon/ISO14443.py +++ b/Software/Chameleon/ISO14443.py @@ -68,6 +68,28 @@ class BlockData: # PCB note += self.type + " " + # Block number + if ((self.type == "IBlock" or self.type == "RBlock") and self.PCB & 0x01): + note += "BlkNo:1 " + + # Chaining? + if (self.type == "IBlock" and self.PCB & 0x10): + note += "Chaining " + + # ACK/NAK? for R-Block + if (self.type == "RBlock"): + if (self.PCB & 0x10): + note += "NAK " + else: + note += "ACK " + + # DESEL/WTX for SBlock + if (self.type == "SBlock"): + if (self.PCB & 0x30 == 0x00): + note += "DESEL " + elif (self.PCB & 0x30 == 0x30): + note += "WTX" + # CID if (self.CID != None): note += "CID:" + hex(self.CID) + " "