#include "cmdlft55xx.h"\r
#include "util.h"\r
#include "data.h"\r
+#include "lfdemod.h"\r
+\r
+#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)\r
+#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits = \r
+\r
+int usage_t55xx_read(){\r
+ PrintAndLog("Usage: lf t55xx read <block> <password>");\r
+ PrintAndLog(" <block>, block number to read. Between 0-7");\r
+ PrintAndLog(" <password>, OPTIONAL password (8 hex characters)");\r
+ PrintAndLog("");\r
+ PrintAndLog(" sample: lf t55xx read 0 = try reading data from block 0");\r
+ PrintAndLog(" : lf t55xx read 0 feedbeef = try reading data from block 0 using password");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
+int usage_t55xx_write(){\r
+ PrintAndLog("Usage: lf t55xx wr <block> <data> [password]");\r
+ PrintAndLog(" <block>, block number to read. Between 0-7");\r
+ PrintAndLog(" <data>, 4 bytes of data to write (8 hex characters)");\r
+ PrintAndLog(" [password], OPTIONAL password 4bytes (8 hex characters)");\r
+ PrintAndLog("");\r
+ PrintAndLog(" sample: lf t55xx wd 3 11223344 = try writing data 11223344 to block 3");\r
+ PrintAndLog(" : lf t55xx wd 3 11223344 feedbeef = try writing data 11223344 to block 3 using password feedbeef");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
+int usage_t55xx_trace() {\r
+ PrintAndLog("Usage: lf t55xx trace [graph buffer data]");\r
+ PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+ PrintAndLog("");\r
+ PrintAndLog(" sample: lf t55xx trace");\r
+ PrintAndLog(" : lf t55xx trace 1");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
+int usage_t55xx_info() {\r
+ PrintAndLog("Usage: lf t55xx info [graph buffer data]");\r
+ PrintAndLog(" [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+ PrintAndLog("");\r
+ PrintAndLog(" sample: lf t55xx info");\r
+ PrintAndLog(" : lf t55xx info 1");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
+int usage_t55xx_dump(){\r
+ PrintAndLog("Usage: lf t55xx dump <password>");\r
+ PrintAndLog(" <password>, OPTIONAL password 4bytes (8 hex characters)");\r
+ PrintAndLog("");\r
+ PrintAndLog(" sample: lf t55xx dump");\r
+ PrintAndLog(" : lf t55xx dump feedbeef");\r
+ PrintAndLog("");\r
+ return 0;\r
+}\r
\r
-#define LF_TRACE_BUFF_SIZE 16000\r
static int CmdHelp(const char *Cmd);\r
\r
-\r
int CmdReadBlk(const char *Cmd)\r
{\r
- //default to invalid block\r
- int Block = -1;\r
- UsbCommand c;\r
+ int i = 0;\r
+ int block = -1;\r
+ int password = 0xFFFFFFFF; //default to blank Block 7\r
+ size_t bitlen = 0;\r
+ uint32_t blockData = 0;\r
+ uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+ \r
+ char cmdp = param_getchar(Cmd, 0);\r
+ if (cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_read();\r
+ return 0;\r
+ }\r
\r
- sscanf(Cmd, "%d", &Block);\r
+ int res = sscanf(Cmd, "%d %x", &block, &password);\r
\r
- if ((Block > 7) | (Block < 0)) {\r
+ if ( res < 1 || res > 2 ){\r
+ usage_t55xx_read();\r
+ return 1;\r
+ }\r
+ \r
+ if ((block < 0) | (block > 7)) {\r
PrintAndLog("Block must be between 0 and 7");\r
return 1;\r
} \r
\r
- PrintAndLog(" Reading page 0 block : %d", Block);\r
+ UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};\r
+ c.d.asBytes[0] = 0x0; \r
+\r
+ //Password mode\r
+ if ( res == 2 ) {\r
+ c.arg[2] = password;\r
+ c.d.asBytes[0] = 0x1; \r
+ }\r
\r
- // this command fills up BigBuff\r
- // \r
- c.cmd = CMD_T55XX_READ_BLOCK;\r
- c.d.asBytes[0] = 0x00;\r
- c.arg[0] = 0;\r
- c.arg[1] = Block;\r
- c.arg[2] = 0;\r
SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+ PrintAndLog("command execution time out");\r
+ return 2;\r
+ }\r
\r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ uint8_t got[12000];\r
+ GetFromBigBuf(got,sizeof(got),0);\r
+ WaitForResponse(CMD_ACK,NULL);\r
+\r
+ setGraphBuf(got, 12000);\r
+ \r
+ bitlen = getFromGraphBuf(bits);\r
+\r
+ int ans = 0;\r
+ ans = CmdFSKrawdemod("");\r
+ ans = CmdFSKrawdemod("1"); //invert?\r
+ ans = Cmdaskmandemod("");\r
+ ans = Cmdaskrawdemod("");\r
+ ans = CmdNRZrawDemod("");\r
+ ans = CmdPSK1rawDemod("");\r
+ ans = CmdPSK2rawDemod("");\r
\r
- GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
- WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
-\r
- for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]) - 128;\r
- }\r
- GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
- \r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 60");\r
+ // if ( !tryDemod(bits, bitlen) )\r
+ // return 3;\r
\r
- // Askdemod\r
- //Cmdaskdemod("1");\r
+ // //move bits back to DemodBuffer\r
+ // setDemodBuf(bits, bitlen, 0);\r
+ // printBitStream(bits, bitlen);\r
+ if ( !DemodBufferLen) \r
+ return 0;\r
\r
- uint8_t bits[1000];\r
- uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
+ for (;i<DemodBufferLen;++i)\r
+ bits[i]=DemodBuffer[i];\r
\r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+ blockData = PackBits(1, 32, bits);\r
+\r
+ if ( block < 0)\r
+ PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits+1,32) );\r
+ else\r
+ PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits+1,32) );\r
\r
- return 0;\r
+ return 0;\r
}\r
\r
\r
-int CmdReadBlkPWD(const char *Cmd)\r
-{\r
- int Block = -1; //default to invalid block\r
- int Password = 0xFFFFFFFF; //default to blank Block 7\r
- UsbCommand c;\r
+/*\r
+FSK1 / FSK1a\r
+size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 \r
\r
- sscanf(Cmd, "%d %x", &Block, &Password);\r
+FSK2 / FSK2a\r
+size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32 \r
+size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50 \r
+size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 \r
\r
- if ((Block > 7) | (Block < 0)) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- } \r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
+*/\r
+bool tryDemod(uint8_t bits[], size_t bitlen) {\r
+ \r
+ int invert = 0;\r
+ int clk = 0;\r
+ int errCnt, size;\r
+ int maxErr = 100;\r
+ uint8_t rflen, fchigh, fclow, dummy = 0;\r
+ uint16_t fcs=0;\r
+\r
+ // ASK - manchester demod\r
+ errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+ if ( analyseDemod(errCnt, bitlen, clk, invert) ) \r
+ return true;\r
+\r
+ // FSK demod\r
+ fcs = countFC(bits, bitlen, &dummy);\r
+ if (fcs == 0){\r
+ fchigh = 10;\r
+ fclow = 8;\r
+ }else{\r
+ fchigh = (fcs >> 8) & 0xFF;\r
+ fclow = fcs & 0xFF;\r
+ }\r
+ //get bit clock length\r
+ rflen = detectFSKClk(bits, bitlen, fchigh, fclow);\r
+ rflen = (rflen == 0) ? 50 : rflen;\r
+\r
+ size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow);\r
+ if ( analyseDemod(size, bitlen, clk, invert) ) \r
+ return true; \r
+ \r
+ // PSK demod\r
+ return false;\r
+}\r
+\r
+bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){\r
+ if (g_debugMode) \r
+ PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert);\r
+ //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);\r
+ \r
+ //throw away static - allow 1 and -1 (in case of threshold command first)\r
+ if ( errCnt == -1 || bitlen < 32 ){ \r
+ PrintAndLog("no success demod");\r
+ return false;\r
+ }\r
+ return true;\r
+}\r
\r
- PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password);\r
+int CmdWriteBlk(const char *Cmd)\r
+{\r
+ int block = 8; //default to invalid block\r
+ int data = 0xFFFFFFFF; //default to blank Block \r
+ int password = 0xFFFFFFFF; //default to blank Block 7\r
+ \r
+ char cmdp = param_getchar(Cmd, 0);\r
+ if (cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_write();\r
+ return 0;\r
+ }\r
+ \r
+ int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
+ \r
+ if ( res < 2 || res > 3) {\r
+ usage_t55xx_write();\r
+ return 1;\r
+ }\r
\r
- c.cmd = CMD_T55XX_READ_BLOCK;\r
- c.d.asBytes[0] = 0x1; //Password mode\r
- c.arg[0] = 0;\r
- c.arg[1] = Block;\r
- c.arg[2] = Password;\r
+ if (block > 7) {\r
+ PrintAndLog("Block must be between 0 and 7");\r
+ return 1;\r
+ }\r
+ \r
+ UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
+ c.d.asBytes[0] = 0x0; \r
+\r
+ PrintAndLog("Writing to T55x7");\r
+ PrintAndLog("block : %d", block);\r
+ PrintAndLog("data : 0x%08X", data);\r
+\r
+ //Password mode\r
+ if (res == 3) {\r
+ c.arg[2] = password;\r
+ c.d.asBytes[0] = 0x1; \r
+ PrintAndLog("pwd : 0x%08X", password);\r
+ }\r
SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
- \r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ return 0;\r
+}\r
\r
- GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
- WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+int CmdReadTrace(const char *Cmd)\r
+{\r
+ size_t bitlen;\r
+ uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
- for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]) - 128;\r
+ char cmdp = param_getchar(Cmd, 0);\r
+ \r
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_trace();\r
+ return 0;\r
}\r
- GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
\r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 -60"); \r
+ if ( strlen(Cmd)==0){\r
\r
- // Askdemod\r
- //Cmdaskdemod("1");\r
- \r
- uint8_t bits[1000];\r
- uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
+ UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
+ SendCommand(&c);\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+ PrintAndLog("command execution time out");\r
+ return 1;\r
+ }\r
+ //darn\r
+ //CmdSamples("12000");\r
+ }\r
+ \r
+ bitlen = getFromGraphBuf(bits);\r
+\r
+\r
+ RepaintGraphWindow();\r
+\r
+ uint8_t si = 5;\r
+ uint32_t bl0 = PackBits(si, 32, bits);\r
+ uint32_t bl1 = PackBits(si+32, 32, bits);\r
+ \r
+ uint32_t acl = PackBits(si, 8, bits); si += 8;\r
+ uint32_t mfc = PackBits(si, 8, bits); si += 8;\r
+ uint32_t cid = PackBits(si, 5, bits); si += 5;\r
+ uint32_t icr = PackBits(si, 3, bits); si += 3;\r
+ uint32_t year = PackBits(si, 4, bits); si += 4;\r
+ uint32_t quarter = PackBits(si, 2, bits); si += 2;\r
+ uint32_t lotid = PackBits(si, 12, bits); si += 12;\r
+ uint32_t wafer = PackBits(si, 5, bits); si += 5;\r
+ uint32_t dw = PackBits(si, 15, bits); \r
+ \r
+ PrintAndLog("");\r
+ PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);\r
+ PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d)", mfc, mfc);\r
+ PrintAndLog(" CID : 0x%02X (%d)", cid, cid);\r
+ PrintAndLog(" ICR IC Revision : %d",icr );\r
+ PrintAndLog(" Manufactured");\r
+ PrintAndLog(" Year/Quarter : %d/%d",2000+year, quarter );\r
+ PrintAndLog(" Lot ID : %d", lotid );\r
+ PrintAndLog(" Wafer number : %d", wafer);\r
+ PrintAndLog(" Die Number : %d", dw);\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Raw Data - Page 1");\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) );\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(bits+37,32) );\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ /*\r
+ TRACE - BLOCK O\r
+ Bits Definition HEX\r
+ 1-8 ACL Allocation class (ISO/IEC 15963-1) 0xE0 \r
+ 9-16 MFC Manufacturer ID (ISO/IEC 7816-6) 0x15 Atmel Corporation\r
+ 17-21 CID 0x1 = Atmel ATA5577M1 0x2 = Atmel ATA5577M2 \r
+ 22-24 ICR IC revision\r
+ 25-28 YEAR (BCD encoded) 9 (= 2009)\r
+ 29-30 QUARTER 1,2,3,4 \r
+ 31-32 LOT ID\r
+ \r
+ TRACE - BLOCK 1\r
+ 1-12 LOT ID \r
+ 13-17 Wafer number\r
+ 18-32 DW, die number sequential\r
+ */\r
\r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
return 0;\r
}\r
\r
+int CmdInfo(const char *Cmd){\r
+ /*\r
+ Page 0 Block 0 Configuration data.\r
+ Normal mode\r
+ Extended mode\r
+ */\r
+ char cmdp = param_getchar(Cmd, 0);\r
+\r
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_info();\r
+ return 0;\r
+ } else {\r
+ CmdReadBlk("0");\r
+ } \r
\r
-int CmdWriteBlk(const char *Cmd)\r
-{\r
- int Block = 8; //default to invalid block\r
- int Data = 0xFFFFFFFF; //default to blank Block \r
- UsbCommand c;\r
+ uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
\r
- sscanf(Cmd, "%x %d", &Data, &Block);\r
+ manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
+ \r
+ uint8_t si = 5;\r
+ uint32_t bl0 = PackBits(si, 32, bits);\r
+ \r
+ uint32_t safer = PackBits(si, 4, bits); si += 4; \r
+ uint32_t resv = PackBits(si, 7, bits); si += 7;\r
+ uint32_t dbr = PackBits(si, 3, bits); si += 3;\r
+ uint32_t extend = PackBits(si, 1, bits); si += 1;\r
+ uint32_t datamodulation = PackBits(si, 5, bits); si += 5;\r
+ uint32_t pskcf = PackBits(si, 2, bits); si += 2;\r
+ uint32_t aor = PackBits(si, 1, bits); si += 1; \r
+ uint32_t otp = PackBits(si, 1, bits); si += 1; \r
+ uint32_t maxblk = PackBits(si, 3, bits); si += 3;\r
+ uint32_t pwd = PackBits(si, 1, bits); si += 1; \r
+ uint32_t sst = PackBits(si, 1, bits); si += 1; \r
+ uint32_t fw = PackBits(si, 1, bits); si += 1;\r
+ uint32_t inv = PackBits(si, 1, bits); si += 1; \r
+ uint32_t por = PackBits(si, 1, bits); si += 1;\r
+ \r
+ PrintAndLog("");\r
+ PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Safer key : %s", GetSaferStr(safer));\r
+ PrintAndLog(" reserved : %d", resv);\r
+ PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr));\r
+ PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No");\r
+ PrintAndLog(" Modulation : %s", GetModulationStr(datamodulation) );\r
+ PrintAndLog(" PSK clock freq : %d", pskcf);\r
+ PrintAndLog(" AOR - Answer on Request : %s", (aor) ? "Yes":"No");\r
+ PrintAndLog(" OTP - One Time Pad : %s", (otp) ? "Yes - Warning":"No" );\r
+ PrintAndLog(" Max block : %d", maxblk);\r
+ PrintAndLog(" Password mode : %s", (pwd) ? "Yes":"No");\r
+ PrintAndLog(" Sequence Start Terminator : %s", (sst) ? "Yes":"No");\r
+ PrintAndLog(" Fast Write : %s", (fw) ? "Yes":"No");\r
+ PrintAndLog(" Inverse data : %s", (inv) ? "Yes":"No");\r
+ PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Raw Data - Page 0");\r
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(bits+5,32) );\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ \r
+ return 0;\r
+}\r
\r
- if (Block > 7) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- } \r
+int CmdDump(const char *Cmd){\r
\r
- PrintAndLog("Writting block %d with data %08X", Block, Data);\r
+ char s[20] = {0x00};\r
+ uint8_t pwd[4] = {0x00};\r
\r
- c.cmd = CMD_T55XX_WRITE_BLOCK;\r
- c.d.asBytes[0] = 0x0; //Normal mode\r
- c.arg[0] = Data;\r
- c.arg[1] = Block;\r
- c.arg[2] = 0;\r
- SendCommand(&c);\r
- return 0;\r
-}\r
+ char cmdp = param_getchar(Cmd, 0);\r
+ if ( cmdp == 'h' || cmdp == 'H') {\r
+ usage_t55xx_dump();\r
+ return 0;\r
+ }\r
\r
-int CmdWriteBlkPWD(const char *Cmd)\r
-{\r
- int Block = 8; //default to invalid block\r
- int Data = 0xFFFFFFFF; //default to blank Block \r
- int Password = 0xFFFFFFFF; //default to blank Block 7\r
- UsbCommand c;\r
-\r
- sscanf(Cmd, "%x %d %x", &Data, &Block, &Password);\r
-\r
- if (Block > 7) {\r
- PrintAndLog("Block must be between 0 and 7");\r
- return 1;\r
- } \r
-\r
- PrintAndLog("Writting block %d with data %08X and password %08X", Block, Data, Password);\r
-\r
- c.cmd = CMD_T55XX_WRITE_BLOCK;\r
- c.d.asBytes[0] = 0x1; //Password mode\r
- c.arg[0] = Data;\r
- c.arg[1] = Block;\r
- c.arg[2] = Password;\r
- SendCommand(&c);\r
- return 0;\r
+ bool hasPwd = ( strlen(Cmd) > 0); \r
+ if ( hasPwd ){\r
+ if (param_gethex(Cmd, 0, pwd, 8)) {\r
+ PrintAndLog("password must include 8 HEX symbols");\r
+ return 1;\r
+ }\r
+ }\r
+ \r
+ for ( int i = 0; i <8; ++i){\r
+ memset(s,0,sizeof(s));\r
+ if ( hasPwd ) {\r
+ sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]);\r
+ } else {\r
+ sprintf(s,"%d", i);\r
+ }\r
+ CmdReadBlk(s);\r
+ }\r
+ return 0;\r
}\r
\r
-int CmdReadTrace(const char *Cmd)\r
-{\r
- PrintAndLog(" Reading page 1 - tracedata");\r
+int CmdIceFsk(const char *Cmd){\r
\r
- UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
- SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
+ if (!HasGraphData()) return 0;\r
\r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
+ RepaintGraphWindow();\r
+ return 0;\r
+}\r
+int CmdIceManchester(const char *Cmd){\r
+ ManchesterDemod( -1);\r
+ return 0;\r
+}\r
+int ManchesterDemod(int blockNum){\r
\r
- GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
- WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+ if (!HasGraphData()) return 0;\r
+ \r
+ uint8_t sizebyte = 32;\r
+ // the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.\r
+ uint8_t offset = 5;\r
+ uint32_t blockData;\r
+ uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
+ uint8_t * bitstream = bits;\r
+ \r
+ manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); \r
+ blockData = PackBits(offset, sizebyte, bits);\r
\r
- for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]) - 128;\r
+ if ( blockNum < 0)\r
+ PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
+ else\r
+ PrintAndLog(" Block %d : 0x%08X %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );\r
+ \r
+ return 0;\r
+} \r
+\r
+char * GetBitRateStr(uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
+ switch (id){\r
+ case 0: \r
+ sprintf(retStr,"%d - RF/8",id);\r
+ break;\r
+ case 1:\r
+ sprintf(retStr,"%d - RF/16",id);\r
+ break;\r
+ case 2: \r
+ sprintf(retStr,"%d - RF/32",id);\r
+ break;\r
+ case 3:\r
+ sprintf(retStr,"%d - RF/40",id);\r
+ break;\r
+ case 4:\r
+ sprintf(retStr,"%d - RF/50",id);\r
+ break;\r
+ case 5:\r
+ sprintf(retStr,"%d - RF/64",id);\r
+ break;\r
+ case 6:\r
+ sprintf(retStr,"%d - RF/100",id);\r
+ break;\r
+ case 7:\r
+ sprintf(retStr,"%d - RF/128",id);\r
+ break;\r
+ default:\r
+ sprintf(retStr,"%d - (Unknown)",id);\r
+ break;\r
+ }\r
+\r
+ return buf;\r
+}\r
+\r
+char * GetSaferStr(uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
+ \r
+ sprintf(retStr,"%d",id);\r
+ if (id == 6) {\r
+ sprintf(retStr,"%d - pasdwd",id);\r
+ }\r
+ if (id == 9 ){\r
+ sprintf(retStr,"%d - testmode ",id);\r
}\r
- GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
\r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 -60"); \r
+ return buf;\r
+}\r
+char * GetModulationStr( uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
\r
- // Askdemod\r
- //Cmdaskdemod("1");\r
+ switch (id){\r
+ case 0: \r
+ sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r
+ break;\r
+ case 1:\r
+ sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
+ break;\r
+ case 2: \r
+ sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
+ break;\r
+ case 3:\r
+ sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
+ break;\r
+ case 4:\r
+ sprintf(retStr,"%d - FSK 1 RF/8 RF/5",id);\r
+ break;\r
+ case 5:\r
+ sprintf(retStr,"%d - FSK 2 RF/8 RF/10",id);\r
+ break;\r
+ case 6:\r
+ sprintf(retStr,"%d - FSK 1a RF/5 RF/8",id);\r
+ break;\r
+ case 7:\r
+ sprintf(retStr,"%d - FSK 2a RF/10 RF/8",id);\r
+ break;\r
+ case 8:\r
+ sprintf(retStr,"%d - Manschester",id);\r
+ break;\r
+ case 16:\r
+ sprintf(retStr,"%d - Biphase",id);\r
+ break;\r
+ case 17:\r
+ sprintf(retStr,"%d - Reserved",id);\r
+ break;\r
+ default:\r
+ sprintf(retStr,"0x%02X (Unknown)",id);\r
+ break;\r
+ }\r
+ return buf;\r
+}\r
\r
\r
- uint8_t bits[1000];\r
- uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
\r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
- \r
- return 0;\r
+ int i = start;\r
+ int j = len-1;\r
+ if (len > 32) {\r
+ return 0;\r
+ }\r
+ uint32_t tmp = 0;\r
+ for (; j >= 0; --j, ++i){\r
+ tmp |= bits[i] << j;\r
+ }\r
+ return tmp;\r
}\r
\r
static command_t CommandTable[] =\r
{\r
{"help", CmdHelp, 1, "This help"},\r
- {"rd", CmdReadBlk, 0, "<Block> -- Read T55xx block data (page 0)"},\r
- {"rdPWD", CmdReadBlkPWD, 0, "<Block> <Password> -- Read T55xx block data in password mode(page 0)"},\r
- {"wr", CmdWriteBlk, 0, "<Data> <Block> -- Write T55xx block data (page 0)"},\r
- {"wrPWD", CmdWriteBlkPWD, 0, "<Data> <Block> <Password> -- Write T55xx block data in password mode(page 0)"},\r
- {"trace", CmdReadTrace, 0, "Read T55xx traceability data (page 1)"},\r
+ {"read", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+ {"write", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+ {"trace", CmdReadTrace, 0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
+ {"info", CmdInfo, 0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
+ {"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff