FIXED: lf t55xx fsk now demods but only to binary.

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3820e590b02e6b21e74090f6fc47fe5337923214..8420465b93f231734436d40b902801fbf86a0152 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -28,9 +28,7 @@ static int CmdHelp(const char *Cmd);
 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r
-       //default to invalid block\r
        int Block = -1;\r
-       UsbCommand c;\r
 \r
        sscanf(Cmd, "%d", &Block);\r
 \r
@@ -39,10 +37,8 @@ int CmdReadBlk(const char *Cmd)
                return 1;\r
        }       \r
 \r
-       //PrintAndLog(" Reading page 0 block : %d", Block);\r
-\r
        // this command fills up BigBuff\r
-       // \r
+       UsbCommand c;\r
        c.cmd = CMD_T55XX_READ_BLOCK;\r
        c.d.asBytes[0] = 0x00;\r
        c.arg[0] = 0;\r
@@ -57,18 +53,10 @@ int CmdReadBlk(const char *Cmd)
        WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
 \r
        for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]) ;\r
+               GraphBuffer[j] = (int)data[j];\r
        }\r
        GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       \r
-       uint8_t bits[1000] = {0x00};\r
-       uint8_t * bitstream = bits;\r
-       \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
-       \r
-       uint32_t bl0     = PackBits(5, 32, bitstream);\r
-       PrintAndLog("     Block %d  : 0x%08X  %s", Block, bl0, sprint_bin(bitstream+5,32) );\r
-       \r
+       CmdIceManchester(Block);\r
        RepaintGraphWindow();\r
   return 0;\r
 }\r
@@ -105,15 +93,7 @@ int CmdReadBlkPWD(const char *Cmd)
                GraphBuffer[j] = ((int)data[j]) - 128;\r
        }\r
        GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-\r
-       uint8_t bits[1000] = {0x00};\r
-       uint8_t * bitstream = bits;\r
-       \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);  \r
-       \r
-       uint32_t bl0     = PackBits(5, 32, bitstream);\r
-       PrintAndLog("     Block %d  : 0x%08X  %s", Block, bl0, sprint_bin(bitstream+5,32) );\r
-       \r
+       CmdIceManchester(Block);        \r
        RepaintGraphWindow();\r
   return 0;\r
 }\r
@@ -169,20 +149,32 @@ int CmdWriteBlkPWD(const char *Cmd)
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
-       UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
-       SendCommand(&c);\r
-       WaitForResponse(CMD_ACK, NULL);\r
+       char cmdp = param_getchar(Cmd, 0);\r
 \r
-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:  lf t55xx trace  [use data from Graphbuffer]");\r
+               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
+               PrintAndLog("");\r
+               PrintAndLog("        sample: lf t55xx trace");\r
+               PrintAndLog("        sample: lf t55xx trace 1");\r
+               return 0;\r
+       }\r
 \r
-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+       if ( strlen(Cmd)==0){\r
+               UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
+               SendCommand(&c);\r
+               WaitForResponse(CMD_ACK, NULL);\r
 \r
-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]);\r
-               //GraphBuffer[j] = ((int)data[j]) - 128;\r
+               uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\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]);\r
+               }\r
+               GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
        }\r
-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
        \r
        uint8_t bits[1000] = {0x00};\r
        uint8_t * bitstream = bits;\r
@@ -247,9 +239,22 @@ int CmdInfo(const char *Cmd){
                Normal mode\r
                Extended mode\r
        */\r
-       // läs block 0 -  data finns i graphbuff\r
-       CmdReadBlk("0");\r
+       char cmdp = param_getchar(Cmd, 0);\r
+\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
+               PrintAndLog("Usage:  lf t55xx info  [use data from Graphbuffer]");\r
+               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
+               PrintAndLog("");\r
+               PrintAndLog("        sample: lf t55xx info");\r
+               PrintAndLog("        sample: lf t55xx info 1");\r
+               return 0;\r
+       }\r
+\r
+       if ( strlen(Cmd)==0){\r
+               CmdReadBlk("0");\r
+       }\r
        \r
+\r
        uint8_t bits[1000] = {0x00};\r
        uint8_t * bitstream = bits;\r
        \r
@@ -333,13 +338,31 @@ int CmdDump(const char *Cmd){
 }\r
 \r
 int CmdIceFsk(const char *Cmd){\r
-       //uint8_t bits[1000] = {0x00};\r
-       //uint8_t * bitstream = bits;\r
        iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
-       \r
        RepaintGraphWindow();\r
        return 0;\r
 }\r
+int CmdIceManchester(const char *Cmd){\r
+       ManchesterDemod( -1);\r
+       return 0;\r
+}\r
+int ManchesterDemod(int block){\r
+\r
+       int  blockNum = -1;\r
+       uint32_t blockData;\r
+       uint8_t  bits[1000] = {0x00};\r
+       uint8_t * bitstream = bits;\r
+       \r
+       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);  \r
+    blockData = PackBits(5, 32, bitstream);\r
+\r
+       if ( blockNum > -1){\r
+               PrintAndLog("   Block %d : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+5,32) );\r
+       }else{\r
+               PrintAndLog("   Decoded : 0x%08X  %s", blockData, sprint_bin(bitstream+5,32) );\r
+       }\r
+       return 0;\r
+} \r
 \r
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
@@ -455,10 +478,11 @@ static command_t CommandTable[] =
   {"rdPWD",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},\r
   {"wr",     CmdWriteBlk,    0, "<data> <block> -- Write T55xx block data (page 0)"},\r
   {"wrPWD",  CmdWriteBlkPWD, 0, "<data> <block> <password> -- Write T55xx block data with password"},\r
-  {"trace",  CmdReadTrace,   0, "Read T55xx traceability data (page 1 / blk 0-1)"},\r
-  {"info",   CmdInfo,        0, "Read T55xx configuration data (page0 /blk 0)"},\r
+  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1 / blk 0-1) "},\r
+  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page0 /blk 0)"},\r
   {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. optional with password"},\r
   {"fsk",    CmdIceFsk,      0, "FSK demod"},\r
+  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r