ADD: found another sub-type,

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 61c8ec2b352372eeafd0e1a87dfb5b4ce7631f15..a75d2fd37b78923bc6bbb986a2d8e2589f17a81a 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,6 +10,7 @@
 #include <stdio.h>\r
 #include <string.h>\r
 #include <inttypes.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <inttypes.h>\r

+#include <time.h>\r

 #include "proxmark3.h"\r
 #include "ui.h"\r
 #include "graph.h"\r
 #include "proxmark3.h"\r
 #include "ui.h"\r
 #include "graph.h"\r


@@ -22,57 +23,29 @@
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "../common/crc.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "../common/crc.h"\r

+#include "../common/iso14443crc.h"\r
+#include "cmdhf14a.h"\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
-//  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;\r
-\r
-// Default configuration: FSK, not inversed.\r
-t55xx_conf_block config = {0x00, FALSE, 0x00};\r
-\r
-       // FSK\r
-       // FSK inverted\r
-       //FSKrawDemod("", FALSE)\r
-       //FSKrawDemod("1", FALSE)\r
-\r
-       // ASK/MAN\r
-       // ASK/MAN inverted\r
-       //ASKmanDemod("", FALSE, FALSE)\r
-       \r
-       // NZR (autoclock, normal, maxerrors 1)\r
-       // NZR (autoclock, inverse, maxerrors 1)\r
-       //NRZrawDemod("0 0 1", FALSE) ) {\r
-               \r
-       // PSK (autoclock, normal, maxerrors 1)\r
-       // PSK (autoclock, inverse, maxerrors 1)\r
-       //PSKDemod("0 0 1", FALSE)\r
+#define CONFIGURATION_BLOCK 0x00\r
+#define TRACE_BLOCK 0x01\r
+\r
+// Default configuration\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};\r

 \r
 int usage_t55xx_config(){\r
 \r
 int usage_t55xx_config(){\r

-       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 0|1]");\r
+       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r

        PrintAndLog("Options:        ");\r
        PrintAndLog("Options:        ");\r

-       PrintAndLog("       h             This help");\r
-       PrintAndLog("       d <>          Set demodulation FSK / ASK / PSK / NZR");\r
-       PrintAndLog("       i [0|1]       Inverse data signal, Default: 0");\r
+       PrintAndLog("       h                        This help");\r
+       PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");\r
+       PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");\r
+       PrintAndLog("       i [1]                            Invert data signal, defaults to normal");\r
+       PrintAndLog("       o [offset]                       Set offset, where data should start decode in bitstream");\r
+       PrintAndLog("");\r

        PrintAndLog("Examples:");\r
        PrintAndLog("Examples:");\r

-       PrintAndLog("      lf t55xx config d FSK ");\r
-       PrintAndLog("                    FSK demodulation");\r
-       PrintAndLog("      lf t55xx config d FSK i 1");\r
-       PrintAndLog("                    FSK demodulation, inverse data");\r
-       PrintAndLog("      lf dump");\r
-       PrintAndLog("                    Dumps all block from tag");\r
-       PrintAndLog("      lf trace");\r
-       PrintAndLog("                    Read trace block and decode it");\r
-       PrintAndLog("      lf info");\r
-       PrintAndLog("                    Read configuration and decode it");\r
+       PrintAndLog("      lf t55xx config d FSK          - FSK demodulation");\r
+       PrintAndLog("      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");\r
+       PrintAndLog("      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");\r
+       PrintAndLog("");\r

        return 0;\r
 }\r
 int usage_t55xx_read(){\r
        return 0;\r
 }\r
 int usage_t55xx_read(){\r


@@ -80,8 +53,9 @@ int usage_t55xx_read(){
     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 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("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


@@ -91,62 +65,150 @@ int usage_t55xx_write(){
        PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r
     PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
     PrintAndLog("");\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("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("");\r

-       PrintAndLog("        sample: lf t55xx dump");\r
-       PrintAndLog("              : lf t55xx dump feedbeef");\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

-int CmdT55xxSetConfig(const char *Cmd){\r
-       \r
-       uint8_t paramNum =0;\r
-       if(param_getchar(Cmd, paramNum) == 'h')\r
+int CmdT55xxSetConfig(const char *Cmd) {\r
+\r
+       uint8_t offset = 0;\r
+       bool errors = FALSE;\r
+       uint8_t cmdp = 0;\r
+       char modulation[5] = {0x00};\r
+       char tmp = 0x00;\r
+       uint8_t bitRate = 0;\r
+       uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r

        {\r
        {\r

-               return usage_t55xx_config();\r
+               tmp = param_getchar(Cmd, cmdp);\r
+               switch(tmp)\r
+               {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_config();\r
+               case 'b':\r
+                       errors |= param_getdec(Cmd, cmdp+1, &bitRate);\r
+                       if ( !errors){\r
+                               uint8_t i = 0;\r
+                               for (; i < 9; i++){\r
+                                       if (rates[i]==bitRate) {\r
+                                               config.bitrate = i;\r
+                                               break;\r
+                                       }\r
+                               }\r
+                               if (i==9) errors = TRUE;\r
+                       }\r
+                       cmdp+=2;\r
+                       break;\r
+               case 'd':\r
+                       param_getstr(Cmd, cmdp+1, modulation);\r
+                       cmdp += 2;\r
+\r
+                       if ( strcmp(modulation, "FSK" ) == 0)\r
+                               config.modulation = DEMOD_FSK;\r
+                       else if ( strcmp(modulation, "FSK1" ) == 0)\r
+                               config.modulation = DEMOD_FSK1;\r
+                       else if ( strcmp(modulation, "FSK1a" ) == 0)\r
+                               config.modulation = DEMOD_FSK1a;\r
+                       else if ( strcmp(modulation, "FSK2" ) == 0)\r
+                               config.modulation = DEMOD_FSK2;\r
+                       else if ( strcmp(modulation, "FSK2a" ) == 0)\r
+                               config.modulation = DEMOD_FSK2a;\r
+                       else if ( strcmp(modulation, "ASK" ) == 0)\r
+                               config.modulation = DEMOD_ASK;\r
+                       else if ( strcmp(modulation, "NRZ" ) == 0)\r
+                               config.modulation = DEMOD_NRZ;\r
+                       else if ( strcmp(modulation, "PSK1" ) == 0)\r
+                               config.modulation = DEMOD_PSK1;\r
+                       else if ( strcmp(modulation, "PSK2" ) == 0)\r
+                               config.modulation = DEMOD_PSK2;\r
+                       else if ( strcmp(modulation, "PSK3" ) == 0)\r
+                               config.modulation = DEMOD_PSK3;\r
+                       else if ( strcmp(modulation, "BIa" ) == 0)\r
+                               config.modulation = DEMOD_BIa;\r
+                       else if ( strcmp(modulation, "BI" ) == 0)\r
+                               config.modulation = DEMOD_BI;\r
+                       else {\r
+                               PrintAndLog("Unknown modulation '%s'", modulation);\r
+                               errors = TRUE;\r
+                       }\r
+                       break;\r
+               case 'i':\r
+                       config.inverted = param_getchar(Cmd,cmdp+1) == '1';\r
+                       cmdp+=2;\r
+                       break;\r
+               case 'o':\r
+                       errors |= param_getdec(Cmd, cmdp+1, &offset);\r
+                       if ( !errors )\r
+                               config.offset = offset;\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
        }\r
 \r

-       uint8_t buff[] = { 0x01, 0x01, 0x01, 0x01,\r
-                                          0x01, 0x01, 0x01, 0x01,\r
-                                          0x01, 0x40, 0x01, 0x01, 0x04 };\r
-       PrintAndLog("CRC-8: %x",CRC8Maxim(buff, 13));\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
 \r

-       //config = { 0, FALSE};\r
+       config.block0 = 0;\r
+       printConfiguration ( config );\r

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

-// detect configuration?\r
-\r
-int CmdReadBlk(const char *Cmd)\r
-{\r
+int CmdT55xxReadBlock(const char *Cmd) {\r

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


@@ -156,10 +218,9 @@ int CmdReadBlk(const char *Cmd)
 \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_read();\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


@@ -184,80 +245,431 @@ int CmdReadBlk(const char *Cmd)
        uint8_t got[12000];\r
        GetFromBigBuf(got,sizeof(got),0);\r
        WaitForResponse(CMD_ACK,NULL);\r
        uint8_t got[12000];\r
        GetFromBigBuf(got,sizeof(got),0);\r
        WaitForResponse(CMD_ACK,NULL);\r

-\r

        setGraphBuf(got, 12000);\r
        setGraphBuf(got, 12000);\r

+       DemodBufferLen=0;\r
+       if (!DecodeT55xxBlock()) return 3;\r
+       char blk[10]={0};\r
+       sprintf(blk,"%d", block);\r
+       printT55xxBlock(blk);\r
+       return 0;\r
+}\r

 \r
 \r

-       if (block == 0){\r
-               // try a detection.\r
-               \r
+bool DecodeT55xxBlock(){\r
+       \r
+       char buf[9] = {0x00};\r
+       char *cmdStr = buf;\r
+       int ans = 0;\r
+       uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r
+\r
+       DemodBufferLen = 0x00;\r
+\r
+       switch( config.modulation ){\r
+               case DEMOD_FSK:\r
+                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+                       CmdLtrim(cmdStr);                       \r
+                       sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted );\r
+                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_FSK1:\r
+               case DEMOD_FSK1a:               \r
+                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+                       CmdLtrim(cmdStr);                       \r
+                       sprintf(cmdStr,"%d %d 8 5", bitRate[config.bitrate], config.inverted  );\r
+                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_FSK2:\r
+               case DEMOD_FSK2a:\r
+                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
+                       CmdLtrim(cmdStr);                       \r
+                       sprintf(cmdStr,"%d %d 10 8", bitRate[config.bitrate], config.inverted  );\r
+                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_ASK:\r
+                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = ASKmanDemod(cmdStr, FALSE, FALSE);\r
+                       break;\r
+               case DEMOD_PSK1:\r
+                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = PSKDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_PSK2:\r
+                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = PSKDemod(cmdStr, FALSE);\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = PSKDemod(cmdStr, FALSE);\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = NRZrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_BI:\r
+               case DEMOD_BIa:\r
+                       sprintf(cmdStr,"0 %d %d 0", bitRate[config.bitrate], config.inverted );\r
+                       ans = ASKbiphaseDemod(cmdStr, FALSE);\r
+                       break;\r
+               default:\r
+                       return FALSE;\r

        }\r
        }\r

+       return (bool) ans;\r
+}\r
+\r
+int CmdT55xxDetect(const char *Cmd){\r
+\r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_detect();\r
+       \r
+       if (strlen(Cmd)==0)\r
+               AquireData( CONFIGURATION_BLOCK );\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
+// detect configuration?\r
+bool tryDetectModulation(){\r
+       char cmdStr[8] = {0};\r
+       uint8_t hits = 0;\r
+       t55xx_conf_block_t tests[15];\r

        \r
        \r

-       if (CmdDetectClockRate("f")){ //wave is almost certainly FSK\r
-      //call FSK DEMOD\r
-               // FSK\r
-               if ( FSKrawDemod("", FALSE))\r
-                       printT55xx("FSK");\r
-               // FSK inverted\r
-               if ( FSKrawDemod("1", FALSE)) \r
-                       printT55xx("FSK inv");\r
-    } else {\r
-               // ASK/MAN (autoclock, normal, maxerrors 1)\r
-               if ( ASKmanDemod("0 0 1", FALSE, FALSE) )\r
-                       printT55xx("ASK/MAN");\r
+       if (GetFskClock("", FALSE, FALSE)){ \r
+               uint8_t fc1 = 0, fc2 = 0, clk=0;\r
+               fskClocks(&fc1, &fc2, &clk, FALSE);\r
+               sprintf(cmdStr,"%d", clk/2);\r
+               CmdLtrim(cmdStr);\r
+               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       if (fc1==8 && fc2 == 5)\r
+                               tests[hits].modulation = DEMOD_FSK1a;\r
+                       else if (fc1==10 && fc2 == 8)\r
+                               tests[hits].modulation = DEMOD_FSK2;\r
+\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       if (fc1==8 && fc2 == 5)\r
+                               tests[hits].modulation = DEMOD_FSK1;\r
+                       else if (fc1==10 && fc2 == 8)\r
+                               tests[hits].modulation = DEMOD_FSK2a;\r
+\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+       } else {\r
+               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+                       }\r
+\r
+               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test(DEMOD_ASK, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+                       }\r

                \r
                \r

-               // ASK/MAN (autoclock, inverted, maxerrors 1)\r
-               if ( ASKmanDemod("0 1 1", FALSE, FALSE) )\r
-                       printT55xx("ASK/MAN Inv");\r
-\r
-               // NZR (autoclock, normal, maxerrors 1)\r
-               if  ( NRZrawDemod("0 0 1", FALSE) )\r
-                       printT55xx("NZR");\r
-               // NZR (autoclock, inverted, maxerrors 1)\r
-               if  ( NRZrawDemod("0 1 1", FALSE) )\r
-                       printT55xx("NZR inv");\r
+               if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_NRZ;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+\r
+               if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_NRZ;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+                       }\r

                \r
                \r

-               // PSK (autoclock, normal, maxerrors 1)\r
-               if (!PSKDemod("0 0 1", FALSE))\r
-                       printT55xx("PSK");\r
+               if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_PSK1;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+               \r
+               if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_PSK1;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK2, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK2;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+               } // inverse waves does not affect this demod\r

 \r
 \r

-               // PSK (autoclock, inverted, maxerrors 1)\r
-               if (!PSKDemod("0 1 1", FALSE))\r
-                       printT55xx("PSK inv");\r
+               // PSK3 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK3;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+               } // inverse waves does not affect this demod\r
+       \r
+               if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
+                       tests[hits].modulation = DEMOD_BI;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+               if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) {\r
+                       tests[hits].modulation = DEMOD_BIa;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+       }               \r
+       if ( hits == 1) {\r
+               config.modulation = tests[0].modulation;\r
+               config.inverted = tests[0].inverted;\r
+               config.offset = tests[0].offset;\r
+               config.block0 = tests[0].block0;\r
+               printConfiguration( config );\r
+               return TRUE;\r

        }\r
        }\r

-       return 0;\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 testModulation(uint8_t mode, uint8_t modread){\r
+       switch( mode ){\r
+               case DEMOD_FSK:\r
+                       if (modread > 3 && modread < 8) return TRUE;\r
+                       break;\r
+               case DEMOD_ASK:\r
+                       if (modread == DEMOD_ASK) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK1:\r
+                       if (modread == DEMOD_PSK1) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK2:\r
+                       if (modread == DEMOD_PSK2) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       if (modread == DEMOD_PSK3) return TRUE;\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       if (modread == DEMOD_NRZ) return TRUE;\r
+                       break;\r
+               case DEMOD_BI:\r
+                       if (modread == DEMOD_BI) return TRUE;\r
+                       break;\r
+               case DEMOD_BIa:\r
+                       if (modread == DEMOD_BIa) return TRUE;\r
+                       break;          \r
+               default:\r
+                       return FALSE;\r
+       }\r
+       return FALSE;\r
+}\r
+\r
+bool testBitRate(uint8_t readRate, uint8_t mod){\r
+       uint8_t expected[8] = {8, 16, 32, 40, 50, 64, 100, 128};\r
+       uint8_t detRate = 0;\r
+       switch( mod ){\r
+               case DEMOD_FSK:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_FSK1:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_FSK1a:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_FSK2:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_FSK2a:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_ASK:\r
+                       detRate = GetAskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_PSK1:\r
+                       detRate = GetPskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_PSK2:\r
+                       detRate = GetPskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       detRate = GetPskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       detRate = GetNrzClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               case DEMOD_BI:\r
+               case DEMOD_BIa:\r
+                       detRate = GetAskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) {\r
+                               config.bitrate = readRate;\r
+                               return TRUE;\r
+                       }\r
+                       break;\r
+               default:\r
+                       return FALSE;\r
+       }\r
+       return FALSE;\r

 }\r
 \r
 }\r
 \r

-void printT55xx(const char *demodStr){\r
+bool test(uint8_t mode, uint8_t *offset){\r
+\r
+       if ( !DemodBufferLen) return FALSE;\r
+       uint8_t si = 0;\r
+       for (uint8_t idx = 0; idx < 64; idx++){\r
+               si = idx;\r
+               if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;          // configuration block with only zeros is impossible.\r
+\r
+               uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;           //master key\r
+               uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode\r
+               // 2nibble must be zeroed.\r
+               // moved test to here, since this gets most faults first.\r
+               if ( resv > 0x00) continue;\r
+\r
+               uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3;   //new\r
+               uint8_t bitRate  = PackBits(si, 3, DemodBuffer); si += 3;   //new  could check bit rate\r
+               uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\r
+               uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new\r
+               //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //new  could check psk cr\r
+               uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24 , 30, 31 could be tested for 0 if not extended mode\r
+               uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
+               \r
+               //if extended mode\r
+               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r
+\r
+               if (!extMode){\r
+                       if (nml01 || nml02 || xtRate) continue;\r
+               }\r
+               //test modulation\r
+               if (!testModulation(mode, modread)) continue;\r
+\r
+               *offset = idx;\r
+               if (!testBitRate(bitRate, mode)) continue;\r
+               return TRUE;\r
+       }\r
+       return FALSE;\r
+}\r
+\r
+void printT55xxBlock(const char *blockNum){\r

        \r
        \r

+       uint8_t i = config.offset;\r
+       uint8_t endpos = 32 + i;\r

        uint32_t blockData = 0;\r
        uint32_t blockData = 0;\r

-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-               \r
-       if ( !DemodBufferLen) \r
+       uint8_t bits[64] = {0x00};\r
+\r
+       if ( !DemodBufferLen) return;\r
+\r
+       if ( endpos > DemodBufferLen){\r
+               PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);\r

                return;\r
                return;\r

+       }\r
+\r
+       for (; i < endpos; ++i)\r
+               bits[i - config.offset]=DemodBuffer[i];\r
+\r
+       blockData = PackBits(0, 32, bits);\r
+       PrintAndLog("[%s] 0x%08X  %s", blockNum, blockData, sprint_bin(bits,32));\r
+}\r
+\r
+int special(const char *Cmd) {\r
+       uint32_t blockData = 0;\r
+       uint8_t bits[32] = {0x00};\r
+\r
+       PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+       PrintAndLog("----------------------------------------------------");\r
+       int i,j = 0;\r
+       for (; j < 64; ++j){\r
+               \r
+               for (i = 0; i < 32; ++i)\r
+                       bits[i]=DemodBuffer[j+i];\r

        \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
+               blockData = PackBits(0, 32, bits);\r
+               \r
+               PrintAndLog("[%02d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));    \r
+       }\r
+       return 0;\r
+}\r
+\r
+void printConfiguration( t55xx_conf_block_t b){\r
+       PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
+       PrintAndLog("Bit Rate   : %s", GetBitRateStr(b.bitrate) );\r
+       PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r
+       PrintAndLog("Offset     : %d", b.offset);\r
+       PrintAndLog("Block0     : 0x%08X", b.block0);\r
+       PrintAndLog("");\r

 }\r
 \r
 }\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
-\r
-PSK1\r
-errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
-*/\r
-int CmdWriteBlk(const char *Cmd)\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


@@ -277,16 +689,14 @@ int CmdWriteBlk(const char *Cmd)
        }\r
 \r
        if (block > 7) {\r
        }\r
 \r
        if (block > 7) {\r

-               PrintAndLog("Block must be between 0 and 7");\r
+               PrintAndLog("Block number 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
                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
+       PrintAndLog("Writing to block: %d  data  : 0x%08X", block, data);\r

 \r
        //Password mode\r
        if (res == 3) {\r
 \r
        //Password mode\r
        if (res == 3) {\r


@@ -298,66 +708,71 @@ int CmdWriteBlk(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

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

 {\r
 {\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
 \r

-       if ( strlen(Cmd)==0){\r
-       \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
+       if (strlen(Cmd)==0)\r
+               AquireData( TRACE_BLOCK );\r

        \r
        \r

-       size_t bitlen = getFromGraphBuf(bits);\r
-       if ( bitlen == 0 )\r
-               return 2;\r
+       if (!DecodeT55xxBlock()) return 1;\r
+\r
+       if ( !DemodBufferLen) return 1;\r

        \r
        RepaintGraphWindow();\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
+       uint8_t repeat = 0;\r
+       if (config.offset > 5) \r
+               repeat = 32;\r
+       uint8_t si = config.offset+repeat;\r
+       uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
+       uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
+       // uint32_t bl2     = PackBits(si+64, 32, DemodBuffer);\r

        \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 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, 14, DemodBuffer); si += 14;\r
+       uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t dw      = PackBits(si, 15, DemodBuffer); \r

        \r
        \r

-       PrintAndLog("");\r
+       \r
+       time_t t = time(NULL);\r
+       struct tm tm = *localtime(&t);\r
+       if ( year > tm.tm_year-110)\r
+               year += 2000;\r
+       else\r
+               year += 2010;\r
+\r
+       if ( acl != 0xE0 ) {\r
+               PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
+               return 1;\r
+       }\r
+\r

        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", acl, acl);\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(" MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc));\r
+       PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r

        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r

-       PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );\r
+       PrintAndLog("     Year/Quarter : 20?%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+config.offset+repeat,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
+       //PrintAndLog("     Block 2  : 0x%08X  %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+64,32) );\r

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

+\r
+\r

        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r
        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r


@@ -378,7 +793,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


@@ -386,33 +801,33 @@ int CmdInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r

-       if (cmdp == 'h' || cmdp == 'H') {\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')\r

                return usage_t55xx_info();\r
                return usage_t55xx_info();\r

-       } else {\r
-               CmdReadBlk("0");\r
-       }       \r
-\r
-       // config\r

        \r
        \r

-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
+       if (strlen(Cmd)==0)\r
+               AquireData( CONFIGURATION_BLOCK );\r
+       \r
+       if (!DecodeT55xxBlock()) return 1;\r
+\r
+       if ( !DemodBufferLen) return 1;\r

 \r
 \r

-       uint8_t si = 1;\r
-       uint32_t bl0      = PackBits(si, 32, bits);\r
+       uint8_t si = config.offset;\r
+       uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r

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


@@ -421,25 +836,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(" PSK clock freq            : %d", pskcf);\r
+       PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r
+       PrintAndLog(" PSK clock frequency       : %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(" 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+config.offset,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


@@ -465,41 +880,74 @@ 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
+int AquireData( uint8_t block ){\r
+\r
+       UsbCommand c;\r
+       \r
+       if ( block == CONFIGURATION_BLOCK ) \r
+               c.cmd = CMD_T55XX_READ_BLOCK;\r
+       else if (block == TRACE_BLOCK )\r
+               c.cmd = CMD_T55XX_READ_TRACE;\r
+               \r
+       c.arg[0] = 0x00;\r
+       c.arg[1] = 0x00;\r
+       c.arg[2] = 0x00;\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
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 1;\r

        }\r
        }\r

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

        return 0;\r
 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r
        return 0;\r
 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r

-       static char buf[40];\r
+       static char buf[20];\r

        char *retStr = buf;\r
                switch (id){\r
                case 0: \r
        char *retStr = buf;\r
                switch (id){\r
                case 0: \r

-                       sprintf(retStr,"%d - RF/8",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/8",id);\r

                        break;\r
                case 1:\r
                        break;\r
                case 1:\r

-                       sprintf(retStr,"%d - RF/16",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/16",id);\r

                        break;\r
                case 2:         \r
                        break;\r
                case 2:         \r

-                       sprintf(retStr,"%d - RF/32",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/32",id);\r

                        break;\r
                case 3:\r
                        break;\r
                case 3:\r

-                       sprintf(retStr,"%d - RF/40",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/40",id);\r

                        break;\r
                case 4:\r
                        break;\r
                case 4:\r

-                       sprintf(retStr,"%d - RF/50",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/50",id);\r

                        break;\r
                case 5:\r
                        break;\r
                case 5:\r

-                       sprintf(retStr,"%d - RF/64",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/64",id);\r

                        break;\r
                case 6:\r
                        break;\r
                case 6:\r

-                       sprintf(retStr,"%d - RF/100",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/100",id);\r

                        break;\r
                case 7:\r
                        break;\r
                case 7:\r

-                       sprintf(retStr,"%d - RF/128",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - RF/128",id);\r

                        break;\r
                default:\r
                        break;\r
                default:\r

-                       sprintf(retStr,"%d - (Unknown)",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);\r

                        break;\r
                }\r
 \r
                        break;\r
                }\r
 \r


@@ -507,59 +955,122 @@ char * GetBitRateStr(uint32_t id){
 }\r
 \r
 char * GetSaferStr(uint32_t id){\r
 }\r
 \r
 char * GetSaferStr(uint32_t id){\r

-       static char buf[40];\r
+       static char buf[20];\r

        char *retStr = buf;\r
        \r
        char *retStr = buf;\r
        \r

-       sprintf(retStr,"%d",id);\r
+       snprintf(retStr,sizeof(buf),"%d",id);\r

        if (id == 6) {\r
        if (id == 6) {\r

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

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

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

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

+\r

 char * GetModulationStr( uint32_t id){\r
 char * GetModulationStr( uint32_t id){\r

-       static char buf[40];\r
+       static char buf[60];\r

        char *retStr = buf;\r
        \r
        switch (id){\r
                case 0: \r
        char *retStr = buf;\r
        \r
        switch (id){\r
                case 0: \r

-                       sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);\r

                        break;\r
                case 1:\r
                        break;\r
                case 1:\r

-                       sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);\r

                        break;\r
                case 2:         \r
                        break;\r
                case 2:         \r

-                       sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);\r

                        break;\r
                case 3:\r
                        break;\r
                case 3:\r

-                       sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);\r

                        break;\r
                case 4:\r
                        break;\r
                case 4:\r

-                       sprintf(retStr,"%d - FSK 1 RF/8  RF/5",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id);\r

                        break;\r
                case 5:\r
                        break;\r
                case 5:\r

-                       sprintf(retStr,"%d - FSK 2 RF/8  RF/10",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id);\r

                        break;\r
                case 6:\r
                        break;\r
                case 6:\r

-                       sprintf(retStr,"%d - FSK 1a RF/5  RF/8",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id);\r

                        break;\r
                case 7:\r
                        break;\r
                case 7:\r

-                       sprintf(retStr,"%d - FSK 2a RF/10  RF/8",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id);\r

                        break;\r
                case 8:\r
                        break;\r
                case 8:\r

-                       sprintf(retStr,"%d - Manschester",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - Manschester",id);\r

                        break;\r
                case 16:\r
                        break;\r
                case 16:\r

-                       sprintf(retStr,"%d - Biphase",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - Biphase",id);\r
+                       break;\r
+               case 0x18:\r
+                       snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);\r

                        break;\r
                case 17:\r
                        break;\r
                case 17:\r

-                       sprintf(retStr,"%d - Reserved",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - Reserved",id);\r
+                       break;\r
+               default:\r
+                       snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);\r
+                       break;\r
+               }\r
+       return buf;\r
+}\r
+\r
+char * GetModelStrFromCID(uint32_t cid){\r
+               \r
+       static char buf[10];\r
+       char *retStr = buf;\r
+       \r
+       if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");\r
+       if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");        \r
+       return buf;\r
+}\r
+\r
+char * GetSelectedModulationStr( uint8_t id){\r
+\r
+       static char buf[20];\r
+       char *retStr = buf;\r
+\r
+       switch (id){\r
+               case DEMOD_FSK:\r
+                       snprintf(retStr,sizeof(buf),"FSK");\r
+                       break;\r
+               case DEMOD_FSK1:\r
+                       snprintf(retStr,sizeof(buf),"FSK1");\r
+                       break;\r
+               case DEMOD_FSK1a:\r
+                       snprintf(retStr,sizeof(buf),"FSK1a");\r
+                       break;\r
+               case DEMOD_FSK2:\r
+                       snprintf(retStr,sizeof(buf),"FSK2");\r
+                       break;\r
+               case DEMOD_FSK2a:\r
+                       snprintf(retStr,sizeof(buf),"FSK2a");\r
+                       break;\r
+               case DEMOD_ASK:         \r
+                       snprintf(retStr,sizeof(buf),"ASK");\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       snprintf(retStr,sizeof(buf),"DIRECT/NRZ");\r
+                       break;\r
+               case DEMOD_PSK1:\r
+                       snprintf(retStr,sizeof(buf),"PSK1");\r
+                       break;\r
+               case DEMOD_PSK2:\r
+                       snprintf(retStr,sizeof(buf),"PSK2");\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       snprintf(retStr,sizeof(buf),"PSK3");\r
+                       break;\r
+               case DEMOD_BI:\r
+                       snprintf(retStr,sizeof(buf),"BIPHASE");\r
+                       break;\r
+               case DEMOD_BIa:\r
+                       snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");\r

                        break;\r
                default:\r
                        break;\r
                default:\r

-                       sprintf(retStr,"0x%02X (Unknown)",id);\r
+                       snprintf(retStr,sizeof(buf),"(Unknown)");\r

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


@@ -569,25 +1080,27 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
        \r
        int i = start;\r
        int j = len-1;\r
        \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
+\r
+       if (len > 32) return 0;\r
+\r
+       uint32_t tmp = 0;\r
+       for (; j >= 0; --j, ++i)\r

                tmp     |= bits[i] << j;\r
                tmp     |= bits[i] << j;\r

-       }\r
+\r

        return tmp;\r
 }\r
 \r
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,           1, "This help"},\r
        return tmp;\r
 }\r
 \r
 static command_t CommandTable[] =\r
 {\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
+  {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r
+  {"detect", CmdT55xxDetect,    0, "[1] 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
+  {"special", special,          0, "Show block changes with 64 different offsets"},\r

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