FIX: adding a test to see if we managed to get the correct demodulation from an...

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c023d57f6a06467bc9ba16e47f303eeda00994b8..29b8032e1348412014165aa91818c42cfb42d188 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -21,196 +21,344 @@
 #include "util.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "util.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r

-\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
 #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

-static int CmdHelp(const char *Cmd);\r

 \r
 \r

-// int CmdReadBlk(const char *Cmd)\r
-// {\r
-       // int block = -1;\r
-       // sscanf(Cmd, "%d", &block);\r
-\r
-       // if ((block > 7) | (block < 0)) {\r
-               // PrintAndLog("Block must be between 0 and 7");\r
-               // return 1;\r
-       // }    \r
-\r
-       // UsbCommand c;\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
-       \r
-       // uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
-       \r
-       // GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //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
-       // ManchesterDemod(block);\r
-       // RepaintGraphWindow();\r
-  // return 0;\r
-// }\r
+//  0 = FSK\r
+//  1 = ASK\r
+//  2 = PSK\r
+//  4 = NZR (direct)\r
+typedef struct {\r
+       uint8_t modulation;\r
+       bool inversed;\r
+       uint32_t block0;\r
+} t55xx_conf_block_t;\r
+\r
+// Default configuration: FSK, not inversed.\r
+t55xx_conf_block_t config = { .modulation = 0, .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("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
+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("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("Usage:  lf t55xx trace [1]");\r
+       PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+       PrintAndLog("");\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("Usage:  lf t55xx info [1]");\r
+       PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
+       PrintAndLog("");\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("     <password>, OPTIONAL password 4bytes (8 hex symbols)");\r
+       PrintAndLog("");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx dump");\r
+       PrintAndLog("      lf t55xx dump feedbeef");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r

 \r
 \r

-int CmdReadBlk(const char *Cmd)\r
-{\r
-       int invert = 0;\r
-       int clk = 0;\r
-       int block = -1;\r
-       int errCnt;\r
-       size_t bitlen;\r
-       //int decodedBitlen;\r
-       uint32_t blockData;\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-       \r
-       sscanf(Cmd, "%d", &block);\r
-       \r
-       if ((block > 7) | (block < 0)) {\r
-               PrintAndLog("Block must be between 0 and 7");\r
-               return 1;\r
-       }\r
+static int CmdHelp(const char *Cmd);\r

 \r
 \r

-       UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } };\r
-       SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
-               PrintAndLog("command execution time out");\r
-               return 2;\r
-       }\r
-       \r
-       CmdSamples("12000");\r
+int CmdT55xxSetConfig(const char *Cmd){\r

 \r
 \r

-       bitlen = getFromGraphBuf(bits);\r
-       \r
-       errCnt = askrawdemod(bits, &bitlen, &clk, &invert);\r
+       int len;\r
+       bool inverse;\r
+       bool errors = FALSE;\r
+       uint8_t cmdp = 0;\r
+       char modulation[4] = {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
+       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
+                               len = 1;\r
+                       else if ( strcmp(modulation, "ASK" ) == 0)\r
+                               len = 2;\r
+                       else if ( strcmp(modulation, "PSK" ) == 0)\r
+                               len = 3;\r
+                       else if ( strcmp(modulation, "NZ" ) == 0)\r
+                               len = 4;\r
+                       else if ( strcmp(modulation, "BI" ) == 0)\r
+                               len = 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
        }\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
+       // No args\r
+       if (cmdp == 0) {\r
+               PrintAndLog("Modulation: %d", config.modulation);\r
+               PrintAndLog("Invert    : %d", config.inversed);\r
+               PrintAndLog("Block0    : %08X", config.block0);\r
+               return 0;\r

        }\r
        }\r

-\r
-       blockData = PackBits(0, 32, bits);\r
-\r
-       if ( block < 0)\r
-               PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bits,32) );\r
-       else\r
-               PrintAndLog(" Block %d    : 0x%08X  %s", block, blockData, sprint_bin(bits,32) );\r
-       \r
+       //Validations\r
+       if (errors)\r
+               return usage_t55xx_config();\r
+ \r
+       config.modulation = len;\r
+       config.inversed = inverse;\r
+       config.block0 = 0;\r

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

+// detect configuration?\r

 \r
 \r

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

 {\r
 {\r

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

 \r
 \r

+       char cmdp = param_getchar(Cmd, 0);\r
+       if (cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_read();\r

 \r
 \r

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

 \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("Block must be between 0 and 7");\r
                return 1;\r
        }       \r
 \r

-       PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password);\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
 \r

-       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} };\r
-       c.d.asBytes[0] = 0x1; //Password mode\r

        SendCommand(&c);\r
        SendCommand(&c);\r

-       WaitForResponse(CMD_ACK, NULL);\r
-               \r
-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 2;\r
+       }\r
+       \r
+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r

 \r
 \r

-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
+       setGraphBuf(got, 12000);\r

 \r
 \r

-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]);\r
+       if (block == 0){\r
+               // try a detection.     \r

        }\r
        }\r

-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       ManchesterDemod(Block); \r
+       \r
+       if (CmdDetectClockRate("f")){ //wave is almost certainly FSK\r
+               // FSK\r
+               if ( FSKrawDemod("0 0", FALSE) && test())\r
+                       printT55xx("FSK");\r
+               // FSK inverted\r
+               if ( FSKrawDemod("0 1", FALSE) && test()) \r
+                       printT55xx("FSK inv");\r
+    } else {\r
+               // ASK/MAN (autoclock, normal, maxerrors 1)\r
+               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) \r
+                       printT55xx("ASK/MAN");\r
+               \r
+               // ASK/MAN (autoclock, inverted, maxerrors 1)\r
+               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) \r
+                       printT55xx("ASK/MAN Inv");\r
+\r
+               // NZR (autoclock, normal, maxerrors 1)\r
+               if ( NRZrawDemod("0 0 1", FALSE)  && test()) \r
+                       printT55xx("NZR");\r
+               // NZR (autoclock, inverted, maxerrors 1)\r
+               if ( NRZrawDemod("0 1 1", FALSE)  && test()) \r
+                       printT55xx("NZR inv");\r
+               \r
+               // PSK (autoclock, normal, maxerrors 1)\r
+               if ( PSKDemod("0 0 1", FALSE)  && test()) \r
+                       printT55xx("PSK");\r

 \r
 \r

-       RepaintGraphWindow();\r
-  return 0;\r
+               // PSK (autoclock, inverted, maxerrors 1)\r
+               if ( PSKDemod("0 1 1", FALSE) && test()) \r
+                       printT55xx("PSK inv");\r
+               \r
+               //PSK2?\r
+               \r
+               // if (!BiphaseRawDecode("0",FALSE)  && test()) \r
+                       // printT55xx("BIPHASE");\r
+               \r
+               // if (!BiphaseRawDecode("1",FALSE) && test()) \r
+                       // printT55xx("BIPHASE inv");\r
+       }\r
+       return 0;\r

 }\r
 }\r

+bool test(){\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
-\r
-       sscanf(Cmd, "%d %x", &Block, &Data);\r
-\r
-  if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\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
 \r

-       PrintAndLog("Writing block %d  data %08X", Block, Data);\r
+       //PrintAndLog("test: %X %X %X ", safer, resv, extend);\r
+       \r
+       // 2nibble must be zeroed.\r
+       if ( resv > 0x00) return FALSE;\r

 \r
 \r

-       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}};\r
-  c.d.asBytes[0] = 0x0; //Normal mode\r
-  SendCommand(&c);\r
-  return 0;\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
 }\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
-\r
+void printT55xx(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
 \r

-       sscanf(Cmd, "%d %x %x",&Block, &Data, &Password);\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
 \r

-  if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\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

 \r
 \r

-       PrintAndLog("Writing block %d  data %08X  password %08X", Block, Data, Password);\r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\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
+       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
 \r

-       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}};\r
-  c.d.asBytes[0] = 0x1; //Password mode\r
-  SendCommand(&c);\r
-  return 0;\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
+       return 0;\r

 }\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
 }\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r

-       char cmdp = param_getchar(Cmd, 0);\r
+       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r

 \r
 \r

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

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

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


@@ -218,38 +366,33 @@ int CmdReadTrace(const char *Cmd)
        \r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r
        \r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r

-               WaitForResponse(CMD_ACK, NULL);\r
-\r
-               uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
-\r
-               GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //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
+               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+                       PrintAndLog("command execution time out");\r
+                       return 1;\r

                }\r
                }\r

-               GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
+               //darn\r
+               //CmdSamples("12000");\r

        }\r
        \r
        }\r
        \r

-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
-       uint8_t * bitstream = bits;\r
+       size_t bitlen = getFromGraphBuf(bits);\r
+       if ( bitlen == 0 )\r
+               return 2;\r

        \r
        \r

-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);\r

        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r
        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r

-       uint32_t bl0     = PackBits(si, 32, bitstream);\r
-       uint32_t bl1     = PackBits(si+32, 32, bitstream);\r
+       uint32_t bl0     = PackBits(si, 32, bits);\r
+       uint32_t bl1     = PackBits(si+32, 32, bits);\r

        \r
        \r

-       uint32_t acl     = PackBits(si,  8, bitstream); si += 8;\r
-       uint32_t mfc     = PackBits(si, 8, bitstream); si += 8;\r
-       uint32_t cid     = PackBits(si, 5, bitstream); si += 5;\r
-       uint32_t icr     = PackBits(si, 3, bitstream); si += 3;\r
-       uint32_t year    = PackBits(si, 4, bitstream); si += 4;\r
-       uint32_t quarter = PackBits(si, 2, bitstream); si += 2;\r
-       uint32_t lotid    = PackBits(si, 12, bitstream); si += 12;\r
-       uint32_t wafer   = PackBits(si, 5, bitstream); si += 5;\r
-       uint32_t dw      = PackBits(si, 15, bitstream); \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
        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r


@@ -265,8 +408,8 @@ int CmdReadTrace(const char *Cmd)
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r

-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bitstream+5,32) );\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bitstream+37,32) );\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
        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r


@@ -296,31 +439,24 @@ 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
-               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
+       if (cmdp == 'h' || cmdp == 'H') {\r
+               return usage_t55xx_info();\r
+       } else {\r

                CmdReadBlk("0");\r
        }       \r
 \r
                CmdReadBlk("0");\r
        }       \r
 \r

+       // config\r
+       \r

        uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
 \r
        uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
 \r

-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
-       \r
-       uint8_t si = 5;\r
+       uint8_t si = 1;\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 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 datamod  = 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 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


@@ -338,14 +474,14 @@ 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(" Inverse data              : %s", (inv) ? "Yes":"No");\r
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r


@@ -358,17 +494,16 @@ int CmdInfo(const char *Cmd){
 \r
 int CmdDump(const char *Cmd){\r
 \r
 \r
 int CmdDump(const char *Cmd){\r
 \r

-       char cmdp = param_getchar(Cmd, 0);\r
-       char s[20];\r
+       char s[20] = {0x00};\r

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

-       bool hasPwd = ( strlen(Cmd) > 0);\r
-       \r
+\r
+       char cmdp = param_getchar(Cmd, 0);\r

        if ( cmdp == 'h' || cmdp == 'H') {\r
        if ( cmdp == 'h' || cmdp == 'H') {\r

-               PrintAndLog("Usage:  lf t55xx dump <password>");\r
-               PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
+               usage_t55xx_dump();\r

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

-       \r
+\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
        if ( hasPwd ){\r
                if (param_gethex(Cmd, 0, pwd, 8)) {\r
                        PrintAndLog("password must include 8 HEX symbols");\r


@@ -380,49 +515,14 @@ int CmdDump(const char *Cmd){
                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
                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

-                       CmdReadBlkPWD(s);\r

                } else {\r
                        sprintf(s,"%d", i);\r
                } else {\r
                        sprintf(s,"%d", i);\r

-                       CmdReadBlk(s);\r

                }\r
                }\r

+               CmdReadBlk(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


@@ -465,10 +565,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


@@ -518,7 +618,6 @@ char * GetModulationStr( uint32_t id){
        return buf;\r
 }\r
 \r
        return buf;\r
 }\r
 \r

-\r

 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
        int i = start;\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
        int i = start;\r


@@ -535,16 +634,13 @@ 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> -- Read T55xx block data (page 0)"},\r
-  {"rdpwd",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},\r
-  {"wr",     CmdWriteBlk,    0, "<block> <data> -- Write T55xx block data (page 0)"},\r
-  {"wrpwd",  CmdWriteBlkPWD, 0, "<block> <password> <data> -- Write T55xx block data with 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 with password"},\r
-  //{"fsk",    CmdIceFsk,      0, "FSK demod"},\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
+  {"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
   {NULL, NULL, 0, NULL}\r
 };\r
 \r