CHG: minor output change, when printing found multiple modulations

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b060bdee83b94aaa829b06b43a31ccff51b1d3e1..aec47dc0accc7d9ba66beb16fc81d657f7badbbc 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -21,100 +21,166 @@
 #include "util.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "util.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r

+#include "../common/crc.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
 \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_rd(){\r
-       PrintAndLog("Usage:  lf t55xx rd <block> <password>");\r
+// Default configuration: ASK, not inversed.\r
+t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};\r
+\r
+int usage_t55xx_config(){\r
+       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");\r
+       PrintAndLog("Options:        ");\r
+       PrintAndLog("       h                        This help");\r
+       PrintAndLog("       d <FSK|ASK|PSK|NZ|BI>    Set demodulation FSK / ASK / PSK / NZ / Biphase");\r
+       PrintAndLog("       i [1]                    Inverse data signal, defaults to normal");\r
+       PrintAndLog("");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx config d FSK     - FSK demodulation");\r
+       PrintAndLog("      lf t55xx config d FSK i 1 - FSK demodulation, inverse data");\r
+       PrintAndLog("");\r
+       return 0;\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("     <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("Examples:");\r
+    PrintAndLog("      lf t55xx read 0           - read data from block 0");\r
+       PrintAndLog("      lf t55xx read 0 feedbeef  - read data from block 0 password feedbeef");\r

        PrintAndLog("");\r
        return 0;\r
 }\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
     PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
     PrintAndLog("");\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("Examples:");\r
+    PrintAndLog("      lf t55xx wd 3 11223344           - write 11223344 to block 3");\r
+       PrintAndLog("      lf t55xx wd 3 11223344 feedbeef  - write 11223344 to block 3 password feedbeef");\r

        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_trace() {\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_trace() {\r

-       PrintAndLog("Usage:  lf t55xx trace  [graph buffer data]");\r
+       PrintAndLog("Usage:  lf t55xx trace [1]");\r

        PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
        PrintAndLog("");\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("Examples:");\r
+       PrintAndLog("      lf t55xx trace");\r
+       PrintAndLog("      lf t55xx trace 1");\r

        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_info() {\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_info() {\r

-       PrintAndLog("Usage:  lf t55xx info [graph buffer data]");\r
+       PrintAndLog("Usage:  lf t55xx info [1]");\r

        PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
        PrintAndLog("");\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("Examples:");\r
+       PrintAndLog("      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("");\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("     <password>, OPTIONAL password 4bytes (8 hex symbols)");\r

        PrintAndLog("");\r
        PrintAndLog("");\r

-       PrintAndLog("        sample: lf t55xx dump");\r
-       PrintAndLog("              : lf t55xx dump feedbeef");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx dump");\r
+       PrintAndLog("      lf t55xx dump feedbeef");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
+int usage_t55xx_detect(){\r
+       PrintAndLog("Usage:  lf t55xx detect");\r
+       PrintAndLog("");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx detect");\r
+       PrintAndLog("      lf t55xx detect 1");\r

        PrintAndLog("");\r
        return 0;\r
 }\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
        PrintAndLog("");\r
        return 0;\r
 }\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \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
-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
+int CmdT55xxSetConfig(const char *Cmd){\r

 \r
 \r

-*/\r
+       int len = 0;\r
+       int foundModulation = 2;\r
+       bool inverse = FALSE;\r
+       bool errors = FALSE;\r
+       uint8_t cmdp = 0;\r
+       char modulation[4] = {0x00};\r
+       \r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
+       {\r
+               switch(param_getchar(Cmd, cmdp))\r
+               {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_config();\r
+               case 'd':\r
+                       len = param_getstr(Cmd, cmdp+1, modulation);\r
+                       cmdp+= len+1;\r
+                       //FSK|ASK|PSK|NZ|BI\r
+                       if ( strcmp(modulation, "FSK" ) == 0)\r
+                               foundModulation = 1;\r
+                       else if ( strcmp(modulation, "ASK" ) == 0)\r
+                               foundModulation = 2;\r
+                       else if ( strcmp(modulation, "PSK" ) == 0)\r
+                               foundModulation = 3;\r
+                       else if ( strcmp(modulation, "NZ" ) == 0)\r
+                               foundModulation = 4;\r
+                       else if ( strcmp(modulation, "BI" ) == 0)\r
+                               foundModulation = 5;\r
+                       else {\r
+                               PrintAndLog("Unknown modulation '%s'", modulation);\r
+                               errors = TRUE;\r
+                       }\r
+                       break;\r
+               case 'i':\r
+                       inverse = param_getchar(Cmd,cmdp+1) == '1';\r
+                       cmdp+=2;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = TRUE;\r
+                       break;\r
+               }\r
+       }\r
+       // No args\r
+       if (cmdp == 0) {\r
+               printConfiguration( config );\r
+               return 0;\r
+       }\r
+       //Validations\r
+       if (errors)\r
+               return usage_t55xx_config();\r
+ \r
+       config.modulation = foundModulation;\r
+       config.inversed = inverse;\r
+       config.block0 = 0;\r
+       return 0;\r
+}\r

 \r
 \r

-int CmdReadBlk(const char *Cmd)\r
+int CmdT55xxReadBlock(const char *Cmd)\r

 {\r
 {\r

-       int invert = 0;\r
-       int clk = 0;\r

        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r

-       int errCnt;\r
-       size_t bitlen;\r
-       int maxErr = 100;\r
-    //uint8_t askAmp = 0;\r
-       uint32_t blockData;\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-       \r
-       \r
+\r

        char cmdp = param_getchar(Cmd, 0);\r
        char cmdp = param_getchar(Cmd, 0);\r

-       if (cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_rd();\r
-               return 0;\r
-       }\r
+       if (cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_read();\r

 \r
        int res = sscanf(Cmd, "%d %x", &block, &password);\r
 \r
 \r
        int res = sscanf(Cmd, "%d %x", &block, &password);\r
 \r

-       if ( res < 1 || res > 2 ){\r
-               usage_t55xx_rd();\r
-               return 1;\r
-       }\r
+       if ( res < 1 || res > 2 )\r
+               return usage_t55xx_read();\r
+\r

        \r
        if ((block < 0) | (block > 7)) {\r
                PrintAndLog("Block must be between 0 and 7");\r
        \r
        if ((block < 0) | (block > 7)) {\r
                PrintAndLog("Block must be between 0 and 7");\r


@@ -131,52 +197,214 @@ int CmdReadBlk(const char *Cmd)
        }\r
 \r
        SendCommand(&c);\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
                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
+       setGraphBuf(got, 12000);\r

 \r
 \r

-       bitlen = getFromGraphBuf(bits);\r
+       DecodeT55xxBlock();\r
+       printT55xxBlock("");\r
+       return 0;\r
+}\r
+\r
+void DecodeT55xxBlock(){\r

        \r
        \r

-       //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
-       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+       char buf[6] = {0x00};\r
+       char *cmdStr = buf;\r
+\r
+       // clearing the DemodBuffer.\r
+       DemodBufferLen = 0x00;\r

        \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
-       printBitStream(bits,bitlen);\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
+       // use the configuration\r
+       switch( config.modulation ){\r
+               case 1:\r
+                       sprintf(cmdStr,"0 %d", config.inversed );\r
+                       FSKrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case 2:\r
+                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       ASKmanDemod(cmdStr, FALSE, FALSE);\r
+                       break;\r
+               case 3:\r
+                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       PSKDemod(cmdStr, FALSE);\r
+                       break;\r
+               case 4:\r
+                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       NRZrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case 5:\r
+                       //BiphaseRawDecode("0",FALSE);\r
+                       break;\r
+               default:\r
+               return;\r

        }\r
        }\r

+}\r

 \r
 \r

-       blockData = PackBits(1, 32, bits);\r
+int CmdT55xxDetect(const char *Cmd){\r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if (cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_detect();\r
+       \r
+       // read block 0, Page 0. Configuration.\r
+       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};\r
+       c.d.asBytes[0] = 0x0; \r

 \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
+       //Password mode\r
+       // if ( res == 2 ) {\r
+               // c.arg[2] = password;\r
+               // c.d.asBytes[0] = 0x1; \r
+       // }\r
+\r
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return FALSE;\r
+       }\r

        \r
        \r

+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
+       setGraphBuf(got, 12000);\r
+       \r
+       if ( !tryDetectModulation() ){\r
+               PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
+       }\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int CmdWriteBlk(const char *Cmd)\r
+// detect configuration?\r
+bool tryDetectModulation(){\r
+       \r
+       uint8_t hits = 0;\r
+       t55xx_conf_block_t tests[10];\r
+       \r
+       if (GetFskClock("", FALSE, FALSE)){ \r
+               if ( FSKrawDemod("0 0", FALSE) && test()){\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = FALSE;\r
+                       ++hits;\r
+               }\r
+               if ( FSKrawDemod("0 1", FALSE) && test()) {\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = TRUE;\r
+                       ++hits;\r
+                       }\r
+    } else {\r
+               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = FALSE;\r
+                       ++hits;\r
+                       }\r
+\r
+               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) {\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = TRUE;\r
+                       ++hits;\r
+                       }\r
+               \r
+               if ( NRZrawDemod("0 0 1", FALSE)  && test()) {\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = FALSE;\r
+                       ++hits;\r
+               }\r
+\r
+               if ( NRZrawDemod("0 1 1", FALSE)  && test()) {\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = TRUE;\r
+                       ++hits;\r
+                       }\r
+               \r
+               if ( PSKDemod("0 0 1", FALSE) >= 0 && test()) {\r
+                       tests[hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = FALSE;\r
+                       ++hits;\r
+               }\r
+               \r
+               if ( PSKDemod("0 1 1", FALSE) >= 0 && test()) {\r
+                       tests[hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = TRUE;\r
+                       ++hits;\r
+               }\r
+               //PSK2?\r
+               // if (!BiphaseRawDecode("0",FALSE)  && test()) {\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = FALSE;\r
+               //}\r
+               // if (!BiphaseRawDecode("1",FALSE) && test()) {\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = TRUE;\r
+               // }\r
+       }               \r
+       if ( hits == 1) {\r
+               config.modulation = tests[0].modulation;\r
+               config.inversed = tests[0].inversed;\r
+               printConfiguration( config );\r
+               return TRUE;\r
+       }\r
+       \r
+       if ( hits > 1) {\r
+               PrintAndLog("Found [%d] possible matches for modulation.",hits);\r
+               for(int i=0; i<hits; ++i){\r
+                       PrintAndLog("--[%d]---------------", i+1);\r
+                       printConfiguration( tests[i] );\r
+               }\r
+       }\r
+       return FALSE;\r
+}\r
+\r
+bool test(){\r
+\r
+       if ( !DemodBufferLen) \r
+               return false;\r
+       \r
+       uint8_t si = 1;\r
+       uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;       \r
+       uint8_t resv     = PackBits(si, 7, DemodBuffer); si += 7+3;\r
+       uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;\r
+\r
+       //PrintAndLog("test: %X %X %X ", safer, resv, extend);\r
+       \r
+       // 2nibble must be zeroed.\r
+       if ( resv > 0x00) return FALSE;\r
+\r
+       if ( safer == 0x6 || safer == 0x9){\r
+               if ( extend == 0x00)\r
+                       return TRUE;\r
+       }\r
+       if ( resv== 0x00) return TRUE;\r
+       return FALSE;\r
+}\r
+\r
+void printT55xxBlock(const char *demodStr){\r
+       \r
+       uint32_t blockData = 0;\r
+       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+               \r
+       if ( !DemodBufferLen) \r
+               return;\r
+       \r
+       int i =0;\r
+    for (;i<DemodBufferLen;++i)\r
+               bits[i]=DemodBuffer[i];\r
+       \r
+       blockData = PackBits(1, 32, bits);\r
+       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits+1,32), demodStr);\r
+}\r
+\r
+void printConfiguration( t55xx_conf_block_t b){\r
+       PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
+       PrintAndLog("Inverted   : %s", (b.inversed) ? "Yes" : "No" );\r
+       PrintAndLog("Block0     : %08X", b.block0);\r
+       PrintAndLog("");\r
+}\r
+\r
+int CmdT55xxWriteBlock(const char *Cmd)\r

 {\r
        int block = 8; //default to invalid block\r
        int data = 0xFFFFFFFF; //default to blank Block \r
 {\r
        int block = 8; //default to invalid block\r
        int data = 0xFFFFFFFF; //default to blank Block \r


@@ -184,14 +412,14 @@ int CmdWriteBlk(const char *Cmd)
        \r
        char cmdp = param_getchar(Cmd, 0);\r
        if (cmdp == 'h' || cmdp == 'H') {\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
                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
                return 1;\r
        }\r
 \r


@@ -203,86 +431,64 @@ int CmdWriteBlk(const char *Cmd)
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        c.d.asBytes[0] = 0x0; \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
                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

-       \r

        SendCommand(&c);\r
        return 0;\r
 }\r
 \r
        SendCommand(&c);\r
        return 0;\r
 }\r
 \r

-int CmdReadTrace(const char *Cmd)\r
+int CmdT55xxReadTrace(const char *Cmd)\r

 {\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
        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
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+               return usage_t55xx_trace();\r

 \r
        if ( strlen(Cmd)==0){\r
        \r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r
 \r
        if ( strlen(Cmd)==0){\r
        \r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r

-               WaitForResponse(CMD_ACK, NULL);\r
+               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+                       PrintAndLog("command execution time out");\r
+                       return 1;\r
+               }\r

 \r
 \r

-               CmdSamples("12000");\r
+               uint8_t got[12000];\r
+               GetFromBigBuf(got,sizeof(got),0);\r
+               WaitForResponse(CMD_ACK,NULL);\r
+               setGraphBuf(got, 12000);\r

        }\r
        \r
        }\r
        \r

-       bitlen = getFromGraphBuf(bits);\r
+       DecodeT55xxBlock();\r

 \r
 \r

-       //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
-       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+       if ( !DemodBufferLen) \r
+               return 2;\r

        \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
        uint8_t si = 5;\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
+       uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
+       uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
+       \r
+       uint32_t acl     = PackBits(si,  8, DemodBuffer); si += 8;\r
+       uint32_t mfc     = PackBits(si, 8, DemodBuffer); si += 8;\r
+       uint32_t cid     = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
+       uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
+       uint32_t lotid    = PackBits(si, 12, DemodBuffer); si += 12;\r
+       uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
+       \r
+       year += 2000;\r

        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r


@@ -292,14 +498,14 @@ int CmdReadTrace(const char *Cmd)
        PrintAndLog(" CID                                     : 0x%02X (%d)", cid, cid);\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\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("     Year/Quarter : %d/%d",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("     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("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );\r

        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r
        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r


@@ -321,7 +527,7 @@ int CmdReadTrace(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

-int CmdInfo(const char *Cmd){\r
+int CmdT55xxInfo(const char *Cmd){\r

        /*\r
                Page 0 Block 0 Configuration data.\r
                Normal mode\r
        /*\r
                Page 0 Block 0 Configuration data.\r
                Normal mode\r


@@ -329,34 +535,56 @@ int CmdInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \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
+       if (cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_info();\r
+       \r
+       if (strlen(Cmd)==0){\r
+               \r
+               // read block 0, Page 0. Configuration.\r
+               UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 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
 \r

-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
+               SendCommand(&c);\r
+               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+                       PrintAndLog("command execution time out");\r
+                       return 1;\r
+               }\r

 \r
 \r

-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
+               uint8_t got[12000];\r
+               GetFromBigBuf(got,sizeof(got),0);\r
+               WaitForResponse(CMD_ACK,NULL);\r
+               setGraphBuf(got, 12000);\r
+       }\r

        \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
+       DecodeT55xxBlock();\r
+\r
+       if ( !DemodBufferLen) \r
+               return 2;\r
+       \r
+       \r
+       uint8_t si = 1;\r
+       uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r
+       \r
+       uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;      \r
+       uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;\r
+       uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;\r
+       uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;\r
+       uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;\r
+       uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;\r

                \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r
                \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r


@@ -365,25 +593,25 @@ int CmdInfo(const char *Cmd){
        PrintAndLog(" reserved                  : %d", resv);\r
        PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\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(" Modulation                : %s", GetModulationStr(datamod));\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(" 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(" 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(" 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("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r

        PrintAndLog("-------------------------------------------------------------");\r
        \r
        return 0;\r
 }\r
 \r
        PrintAndLog("-------------------------------------------------------------");\r
        \r
        return 0;\r
 }\r
 \r

-int CmdDump(const char *Cmd){\r
+int CmdT55xxDump(const char *Cmd){\r

 \r
        char s[20] = {0x00};\r
        uint8_t pwd[4] = {0x00};\r
 \r
        char s[20] = {0x00};\r
        uint8_t pwd[4] = {0x00};\r


@@ -409,45 +637,11 @@ int CmdDump(const char *Cmd){
                } else {\r
                        sprintf(s,"%d", i);\r
                }\r
                } else {\r
                        sprintf(s,"%d", i);\r
                }\r

-               CmdReadBlk(s);\r
+               CmdT55xxReadBlock(s);\r

        }\r
        return 0;\r
 }\r
 \r
        }\r
        return 0;\r
 }\r
 \r

-int CmdIceFsk(const char *Cmd){\r
-\r
-       if (!HasGraphData()) return 0;\r
-\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
-       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
-       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
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r


@@ -490,10 +684,10 @@ char * GetSaferStr(uint32_t id){
        \r
        sprintf(retStr,"%d",id);\r
        if (id == 6) {\r
        \r
        sprintf(retStr,"%d",id);\r
        if (id == 6) {\r

-               sprintf(retStr,"%d - pasdwd",id);\r
+               sprintf(retStr,"%d - passwd",id);\r

        }\r
        if (id == 9 ){\r
        }\r
        if (id == 9 ){\r

-               sprintf(retStr,"%d - testmode ",id);\r
+               sprintf(retStr,"%d - testmode",id);\r

        }\r
        \r
        return buf;\r
        }\r
        \r
        return buf;\r


@@ -543,6 +737,33 @@ char * GetModulationStr( uint32_t id){
        return buf;\r
 }\r
 \r
        return buf;\r
 }\r
 \r

+char * GetSelectedModulationStr( uint8_t id){\r
+\r
+       static char buf[16];\r
+       char *retStr = buf;\r
+       \r
+       switch (id){\r
+               case DEMOD_FSK:\r
+                       sprintf(retStr,"FSK (%d)",id);\r
+                       break;\r
+               case DEMOD_ASK:         \r
+                       sprintf(retStr,"ASK (%d)",id);\r
+                       break;\r
+               case DEMOD_NZR:\r
+                       sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
+                       break;\r
+               case DEMOD_PSK:\r
+                       sprintf(retStr,"PSK (%d)",id);\r
+                       break;\r
+               case DEMOD_BI:\r
+                       sprintf(retStr,"BIPHASE (%d)",id);\r
+                       break;\r
+               default:\r
+                       sprintf(retStr,"(Unknown)");\r
+                       break;\r
+               }\r
+       return buf;\r
+}\r

 \r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
 \r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r


@@ -560,13 +781,14 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
 \r
 static command_t CommandTable[] =\r
 {\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
-  {"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
+  {"help",   CmdHelp,           1, "This help"},\r
+  {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},\r
+  {"detect", CmdT55xxDetect,    0, "Try detecting the tag modulation from reading the configuration block."},\r
+  {"read",   CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+  {"write",  CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+  {"trace",  CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},\r
+  {"info",   CmdT55xxInfo,      0, "[1] Show T55xx configuration data (page 0/ blk 0)"},\r
+  {"dump",   CmdT55xxDump,      0, "[password] Dump T55xx card block 0-7. [optional password]"},\r

   {NULL, NULL, 0, NULL}\r
 };\r
 \r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r