#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_rd(){\r
- PrintAndLog("Usage: lf t55xx rd <block> <password>");\r
+int usage_t55xx_read(){\r
+ PrintAndLog("Usage: lf t55xx r
ead <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 rd 0 = try reading data from block 0");\r
- PrintAndLog(" : lf t55xx rd 0 feedbeef = try reading data from block 0 using password");\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_wr(){\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
\r
int CmdReadBlk(const char *Cmd)\r
{\r
+ int i = 0;\r
int block = -1;\r
int password = 0xFFFFFFFF; //default to blank Block 7\r
- size_t bitlen;\r
- uint32_t blockData;\r
+ size_t bitlen = 0;\r
+ uint32_t blockData = 0;\r
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
- \r
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_rd();\r
+ usage_t55xx_read();\r
return 0;\r
}\r
\r
int res = sscanf(Cmd, "%d %x", &block, &password);\r
\r
if ( res < 1 || res > 2 ){\r
- usage_t55xx_rd();\r
+ usage_t55xx_read();\r
return 1;\r
}\r
\r
}\r
\r
SendCommand(&c);\r
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
return 2;\r
}\r
\r
- CmdSamples("12000");\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
- if ( !tryDemod(bits, bitlen) )\r
- return 3;\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
+ // if ( !tryDemod(bits, bitlen) )\r
+ // return 3;\r
+ \r
+ // //move bits back to DemodBuffer\r
+ // setDemodBuf(bits, bitlen, 0);\r
+ // printBitStream(bits, bitlen);\r
+ if ( !DemodBufferLen) \r
+ return 0;\r
\r
- //move bits back to DemodBuffer\r
- setDemodBuf(bits, bitlen, 0);\r
- printBitStream(bits, bitlen);\r
+ for (;i<DemodBufferLen;++i)\r
+ bits[i]=DemodBuffer[i];\r
\r
- // // bits has the manchester encoded data.\r
- // errCnt = manrawdecode(bits, &bitlen); \r
- // if ( errCnt == -1 || bitlen < 32 ){ \r
- // PrintAndLog("no data found");\r
- // if (g_debugMode) \r
- // PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- // return 4;\r
- // }\r
-\r
blockData = PackBits(1, 32, bits);\r
\r
if ( block < 0)\r
\r
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_wr();\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_wr();\r
+ usage_t55xx_write();\r
return 1;\r
}\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
c.d.asBytes[0] = 0x0; \r
\r
- if (res == 2) {\r
- PrintAndLog("Writing block %d data %08X", block, data);\r
- } else {\r
- //Password mode\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("Writing block %d data %08X password %08X", block, data, password);\r
+ PrintAndLog("pwd : 0x%08X", password);\r
}\r
- \r
SendCommand(&c);\r
return 0;\r
}\r
\r
int CmdReadTrace(const char *Cmd)\r
{\r
- int invert = 0;\r
- int clk = 0;\r
- int errCnt;\r
size_t bitlen;\r
- int maxErr = 100;\r
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
char cmdp = param_getchar(Cmd, 0);\r
\r
UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
-\r
- CmdSamples("12000");\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
- //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
- errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
- \r
- //throw away static - allow 1 and -1 (in case of threshold command first)\r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 3;\r
- }\r
- if (g_debugMode) \r
- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
-\r
- //move bits back to DemodBuffer\r
- setDemodBuf(bits, bitlen, 0);\r
- \r
- // bits has the manchester encoded data.\r
- errCnt = manrawdecode(bits, &bitlen); \r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 4;\r
- }\r
\r
RepaintGraphWindow();\r
\r
static command_t CommandTable[] =\r
{\r
{"help", CmdHelp, 1, "This help"},\r
- {"rd", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
- {"wr", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\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
- {"man", CmdIceManchester, 0, "Manchester demod (with SST)"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff