ADD: @piwi's fixes to "hf snoop" where it empties the bigbuffer before snooping.

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 93d8f99ca419c8b109839b005bc4635df9219314..9a98108064aae8aa566229bc5a7301553c827892 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


@@ -25,50 +26,74 @@
 #include "../common/iso14443crc.h"\r
 #include "cmdhf14a.h"\r
 \r
 #include "../common/iso14443crc.h"\r
 #include "cmdhf14a.h"\r
 \r

+#define T55x7_CONFIGURATION_BLOCK 0x00\r
+#define T55x7_PAGE0 0x00\r
+#define T55x7_PAGE1 0x01\r
+#define T55x7_PWD      0x00000010\r
+#define REGULAR_READ_MODE_BLOCK 0xFF\r
+\r

 // Default configuration\r
 // Default configuration\r

-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00};\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};\r
+\r
+t55xx_conf_block_t Get_t55xx_Config(){\r
+       return config;\r
+}\r
+void Set_t55xx_Config(t55xx_conf_block_t conf){\r
+       config = conf;\r
+}\r

 \r
 int usage_t55xx_config(){\r
        PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
 \r
 int usage_t55xx_config(){\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("       h                        This help");\r

-       PrintAndLog("       d <FSK|ASK|PSK1|PSK2|NZ|BI>    Set demodulation FSK / ASK / PSK / NZ / Biphase");\r
-       PrintAndLog("       i [1]                    Inverse data signal, defaults to normal");\r
-       PrintAndLog("       o [offset]               Set offset, where data should start decode in bitstream");\r
+       PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");\r
+       PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NRZ / 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("      lf t55xx config d FSK          - FSK demodulation");\r
        PrintAndLog("      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");\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("      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from bitpos 3 to decode 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
        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("Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     b <block>    - block number to read. Between 0-7");\r
+       PrintAndLog("     p <password> - OPTIONAL password (8 hex characters)");\r
+       PrintAndLog("     o            - OPTIONAL override safety check");\r
+       PrintAndLog("     1            - OPTIONAL read Page 1 instead of Page 0");\r
+       PrintAndLog("     ****WARNING****");\r
+       PrintAndLog("     Use of read with password on a tag not configured for a pwd");\r
+       PrintAndLog("     can damage the tag");\r

     PrintAndLog("");\r
        PrintAndLog("Examples:");\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("      lf t55xx read b 0                               - read data from block 0");\r
+       PrintAndLog("      lf t55xx read b 0 p feedbeef         - read data from block 0 password feedbeef");\r
+       PrintAndLog("      lf t55xx read b 0 p feedbeef o       - read data from block 0 password feedbeef safety check");\r

        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_write(){\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("Usage:  lf t55xx wr [b <block>] [d <data>] [p <password>] [1]");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     b <block>    - block number to write. Between 0-7");\r
+       PrintAndLog("     d <data>     - 4 bytes of data to write (8 hex characters)");\r
+       PrintAndLog("     p <password> - OPTIONAL password 4bytes (8 hex characters)");\r
+       PrintAndLog("     1            - OPTIONAL write Page 1 instead of Page 0");\r

     PrintAndLog("");\r
        PrintAndLog("Examples:");\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("      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");\r
+       PrintAndLog("      lf t55xx write b 3 d 11223344 p 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("");\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("Options:");\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("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx trace");\r


@@ -78,7 +103,8 @@ int usage_t55xx_trace() {
 }\r
 int usage_t55xx_info() {\r
        PrintAndLog("Usage:  lf t55xx info [1]");\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("Options:");\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("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx info");\r


@@ -87,17 +113,21 @@ int usage_t55xx_info() {
        return 0;\r
 }\r
 int usage_t55xx_dump(){\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("Usage:  lf t55xx dump <password> [o]");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     <password>  - OPTIONAL password 4bytes (8 hex symbols)");\r
+       PrintAndLog("     o           - OPTIONAL override, force pwd read despite danger to card");\r

        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx dump");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx dump");\r

-       PrintAndLog("      lf t55xx dump feedbeef");\r
+       PrintAndLog("      lf t55xx dump feedbeef o");\r

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

-       PrintAndLog("Usage:  lf t55xx detect");\r
+       PrintAndLog("Usage:  lf t55xx detect [1]");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     [graph buffer data]  - if set, use Graphbuffer otherwise read data from tag.");\r

        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx detect");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx detect");\r


@@ -105,55 +135,98 @@ int usage_t55xx_detect(){
        PrintAndLog("");\r
        return 0;\r
 }\r
        PrintAndLog("");\r
        return 0;\r
 }\r

+int usage_t55xx_wakup(){\r
+       PrintAndLog("Usage:  lf t55xx wakeup [h] p <password>");\r
+       PrintAndLog("This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     h                     - this help");\r
+    PrintAndLog("     p <password>     - password 4bytes (8 hex symbols)");\r
+    PrintAndLog("");\r
+       PrintAndLog("Examples:");\r
+    PrintAndLog("      lf t55xx wakeup p 11223344  - send wakeup password");\r
+       return 0;\r
+}\r

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

-int CmdT55xxSetConfig(const char *Cmd){\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
 \r
        uint8_t offset = 0;\r
        bool errors = FALSE;\r
        uint8_t cmdp = 0;\r
        char modulation[5] = {0x00};\r
        char tmp = 0x00;\r

-       \r
-       while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
-       {\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

                tmp = param_getchar(Cmd, cmdp);\r
                switch(tmp)\r
                {\r
                case 'h':\r
                case 'H':\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
                case 'd':\r
                        param_getstr(Cmd, cmdp+1, modulation);\r
                        cmdp += 2;\r

-                       \r
-                       if ( strcmp(modulation, "FSK" ) == 0)\r
+\r
+                       if ( strcmp(modulation, "FSK" ) == 0) {\r

                                config.modulation = DEMOD_FSK;\r
                                config.modulation = DEMOD_FSK;\r

-                       else if ( strcmp(modulation, "ASK" ) == 0)\r
+                       } else if ( strcmp(modulation, "FSK1" ) == 0) {\r
+                               config.modulation = DEMOD_FSK1;\r
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "FSK1a" ) == 0) {\r
+                               config.modulation = DEMOD_FSK1a;\r
+                               config.inverted=0;\r
+                       } else if ( strcmp(modulation, "FSK2" ) == 0) {\r
+                               config.modulation = DEMOD_FSK2;\r
+                               config.inverted=0;\r
+                       } else if ( strcmp(modulation, "FSK2a" ) == 0) {\r
+                               config.modulation = DEMOD_FSK2a;\r
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "ASK" ) == 0) {\r

                                config.modulation = DEMOD_ASK;\r
                                config.modulation = DEMOD_ASK;\r

-                       else if ( strcmp(modulation, "NRZ" ) == 0)\r
+                       } else if ( strcmp(modulation, "NRZ" ) == 0) {\r

                                config.modulation = DEMOD_NRZ;\r
                                config.modulation = DEMOD_NRZ;\r

-                       else if ( strcmp(modulation, "PSK1" ) == 0)\r
+                       } else if ( strcmp(modulation, "PSK1" ) == 0) {\r

                                config.modulation = DEMOD_PSK1;\r
                                config.modulation = DEMOD_PSK1;\r

-                       else if ( strcmp(modulation, "PSK2" ) == 0)\r
+                       } else if ( strcmp(modulation, "PSK2" ) == 0) {\r

                                config.modulation = DEMOD_PSK2;\r
                                config.modulation = DEMOD_PSK2;\r

-                       else if ( strcmp(modulation, "BI" ) == 0)\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
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "BI" ) == 0) {\r

                                config.modulation = DEMOD_BI;\r
                                config.modulation = DEMOD_BI;\r

-                       else {\r
+                               config.inverted=0;\r
+                       } else {\r

                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                errors = TRUE;\r
                        }\r
                        break;\r
                case 'i':\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                errors = TRUE;\r
                        }\r
                        break;\r
                case 'i':\r

-                       config.inversed = param_getchar(Cmd,cmdp+1) == '1';\r
+                       config.inverted = param_getchar(Cmd,cmdp+1) == '1';\r

                        cmdp+=2;\r
                        break;\r
                case 'o':\r
                        cmdp+=2;\r
                        break;\r
                case 'o':\r

-                       errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+                       errors |= param_getdec(Cmd, cmdp+1, &offset);\r

                        if ( !errors )\r
                                config.offset = offset;\r
                        if ( !errors )\r
                                config.offset = offset;\r

-                       cmdp += 2;\r
+                       cmdp+=2;\r

                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r


@@ -163,231 +236,310 @@ int CmdT55xxSetConfig(const char *Cmd){
        }\r
 \r
        // No args\r
        }\r
 \r
        // No args\r

-       if (cmdp == 0) {\r
-               printConfiguration( config );\r
-               return 0;\r
-       }\r
-       //Validations\r
-       if (errors)\r
-               return usage_t55xx_config();\r
-       config.block0 = 0;\r
-       printConfiguration( config );\r
-       return 0;\r
-}\r
+       if (cmdp == 0) return printConfiguration( config );\r

 \r
 \r

-int CmdT55xxReadBlock(const char *Cmd)\r
-{\r
-       int block = -1;\r
-       int password = 0xFFFFFFFF; //default to blank Block 7\r
-\r
-       char cmdp = param_getchar(Cmd, 0);\r
-       if (cmdp == 'h' || cmdp == 'H')\r
-               return usage_t55xx_read();\r
+       //Validations\r
+       if (errors) return usage_t55xx_config();\r

 \r
 \r

-       int res = sscanf(Cmd, "%d %x", &block, &password);\r
+       config.block0 = 0;\r
+       return printConfiguration ( config );\r
+}\r

 \r
 \r

-       if ( res < 1 || res > 2 )\r
-               return usage_t55xx_read();\r
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){\r
+       //Password mode\r
+       if ( usepwd ) {\r
+               // try reading the config block and verify that PWD bit is set before doing this!\r
+               if ( !override ) {\r
+                       \r
+                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;\r
+                       \r
+                       if ( !tryDetectModulation() ) {\r
+                               PrintAndLog("Safety Check: Could not detect if PWD bit is set in config block. Exits.");\r
+                               return 0;\r
+                       } else {\r
+                               PrintAndLog("Safety Check: PWD bit is NOT set in config block. Reading without password...");   \r
+                               usepwd = false;\r
+                               page1 = false;\r
+                       }\r
+               } else {\r
+                       PrintAndLog("Safety Check Overriden - proceeding despite risk");\r
+               }\r
+       }\r

 \r
 \r

-       \r
-       if ((block < 0) | (block > 7)) {\r
-               PrintAndLog("Block must be between 0 and 7");\r
-               return 1;\r
-       }       \r
+       if (!AquireData(page1, block, usepwd, password) ) return 0;\r
+       if (!DecodeT55xxBlock()) return 0;\r

 \r
 \r

-       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};\r
-       c.d.asBytes[0] = 0x0; \r
+       char blk[10]={0};\r
+       sprintf(blk,"%d", block);\r
+       printT55xxBlock(blk);   \r
+       return 1;\r
+}\r

 \r
 \r

-       //Password mode\r
-       if ( res == 2 ) {\r
-               c.arg[2] = password;\r
-               c.d.asBytes[0] = 0x1; \r
+int CmdT55xxReadBlock(const char *Cmd) {\r
+       uint8_t block = REGULAR_READ_MODE_BLOCK;\r
+       uint32_t password = 0; //default to blank Block 7\r
+       bool usepwd = false;\r
+       bool override = false;\r
+       bool page1 = false;\r
+       bool errors = false;\r
+       uint8_t cmdp = 0;\r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_read();\r
+               case 'b':\r
+               case 'B':\r
+                       errors |= param_getdec(Cmd, cmdp+1, &block);\r
+                       cmdp += 2;\r
+                       break;\r
+               case 'o':\r
+               case 'O':\r
+                       override = TRUE;\r
+                       cmdp++;\r
+                       break;\r
+               case 'p':\r
+               case 'P':\r
+                       password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+                       usepwd = true;\r
+                       cmdp += 2;\r
+                       break;\r
+               case '1':\r
+                       page1 = true;\r
+                       cmdp++;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r

        }\r
        }\r

+       if (errors) return usage_t55xx_read();\r

 \r
 \r

-       SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-               PrintAndLog("command execution time out");\r
-               return 2;\r
+       if (block > 7 && block != REGULAR_READ_MODE_BLOCK       ) {\r
+               PrintAndLog("Block must be between 0 and 7");\r
+               return 0;\r

        }\r
        }\r

-       \r
-       uint8_t got[12000];\r
-       GetFromBigBuf(got,sizeof(got),0);\r
-       WaitForResponse(CMD_ACK,NULL);\r
-       setGraphBuf(got, 12000);\r
-\r
-       DecodeT55xxBlock();\r
-       printT55xxBlock("");\r
-       return 0;\r
+       PrintAndLog("Reading Page %d:", page1); \r
+       PrintAndLog("blk | hex data | binary");\r
+       return T55xxReadBlock(block, page1, usepwd, override, password);\r

 }\r
 \r
 }\r
 \r

-void DecodeT55xxBlock(){\r
+bool DecodeT55xxBlock(){\r

        \r
        \r

-       char buf[8] = {0x00};\r
+       char buf[30] = {0x00};\r

        char *cmdStr = buf;\r
        char *cmdStr = buf;\r

-\r
-       // clearing the DemodBuffer.\r
+       int ans = 0;\r
+       uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r

        DemodBufferLen = 0x00;\r
        DemodBufferLen = 0x00;\r

-       \r
-       // use the configuration\r
+\r

        switch( config.modulation ){\r
                case DEMOD_FSK:\r
        switch( config.modulation ){\r
                case DEMOD_FSK:\r

-                       sprintf(cmdStr,"0 %d", config.inversed );\r
-                       FSKrawDemod(cmdStr, FALSE);\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
+                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       break;\r
+               case DEMOD_FSK1:\r
+               case DEMOD_FSK1a:\r
+                       snprintf(cmdStr, sizeof(buf),"%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
+                       snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r
+                       ans = FSKrawDemod(cmdStr, FALSE);\r

                        break;\r
                case DEMOD_ASK:\r
                        break;\r
                case DEMOD_ASK:\r

-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
-                       ASKmanDemod(cmdStr, FALSE, FALSE);\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r
+                       ans = ASKDemod(cmdStr, FALSE, FALSE, 1);\r

                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r

-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
-                       PSKDemod(cmdStr, FALSE);\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r
+                       ans = PSKDemod(cmdStr, FALSE);\r

                        break;\r
                        break;\r

-               case DEMOD_PSK2:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
-                       PSKDemod(cmdStr, FALSE);\r
-                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
-                       break;\r
-               case DEMOD_PSK3:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
-                       PSKDemod(cmdStr, FALSE);\r
+               case DEMOD_PSK2: //inverted won't affect this\r
+               case DEMOD_PSK3: //not fully implemented\r
+                       snprintf(cmdStr, sizeof(buf),"%d 0 1", bitRate[config.bitrate] );\r
+                       ans = PSKDemod(cmdStr, FALSE);\r

                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_NRZ:\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_NRZ:\r

-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
-                       NRZrawDemod(cmdStr, FALSE);\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       ans = NRZrawDemod(cmdStr, FALSE);\r

                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r

-                       sprintf(cmdStr,"0 0 %d 1", config.inversed );\r
-                       // DEPENDS ON NEW CODE IN MARSHMELLOWS PULL REQUEST\r
-                       //ASKbiphDemod(cmdStr, FALSE);\r
+               case DEMOD_BIa:\r
+                       snprintf(cmdStr, sizeof(buf),"0 %d %d 0", bitRate[config.bitrate], config.inverted );\r
+                       ans = ASKbiphaseDemod(cmdStr, FALSE);\r

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

-               return;\r
+                       return FALSE;\r

        }\r
        }\r

+       return (bool) ans;\r

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

-       char cmdp = param_getchar(Cmd, 0);\r
-       if (cmdp == 'h' || cmdp == 'H')\r
-               return usage_t55xx_detect();\r
-       \r
-       // read block 0, Page 0. Configuration.\r
-       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};\r
-       c.d.asBytes[0] = 0x0; \r

 \r
 \r

-       //Password mode\r
-       // if ( res == 2 ) {\r
-               // c.arg[2] = password;\r
-               // c.d.asBytes[0] = 0x1; \r
-       // }\r
+       bool override = false;\r
+       //bool pwdmode = false;\r

 \r
 \r

-       SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-               PrintAndLog("command execution time out");\r
-               return FALSE;\r
+       uint32_t password = 0; //default to blank Block 7\r
+       bool usepwd = ( strlen(Cmd) > 0);       \r
+       if ( usepwd ){\r
+               password = param_get32ex(Cmd, 0, 0, 16);\r
+               if (param_getchar(Cmd, 1) =='o' )\r
+                       override = true;\r

        }\r
        }\r

+\r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_detect();\r

        \r
        \r

-       uint8_t got[12000];\r
-       GetFromBigBuf(got,sizeof(got),0);\r
-       WaitForResponse(CMD_ACK,NULL);\r
-       setGraphBuf(got, 12000);\r
-       \r
-       if ( !tryDetectModulation() ){\r
-               PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
+       if (strlen(Cmd)==0) {\r
+               password = param_get32ex(Cmd, 0, 0, 16);\r
+               if (param_getchar(Cmd, 1) =='o' ) override = true;\r

        }\r
        }\r

-       return 0;\r
+\r
+       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )\r
+               return 0;\r
+               \r
+       if ( !tryDetectModulation() )\r
+               PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
+\r
+       return 1;\r

 }\r
 \r
 // detect configuration?\r
 bool tryDetectModulation(){\r
 }\r
 \r
 // detect configuration?\r
 bool tryDetectModulation(){\r

-       \r

        uint8_t hits = 0;\r
        uint8_t hits = 0;\r

-       t55xx_conf_block_t tests[11];\r
-       \r
+       t55xx_conf_block_t tests[15];\r
+       int bitRate=0;\r
+       uint8_t fc1 = 0, fc2 = 0, clk=0;\r
+       save_restoreGB(1);\r

        if (GetFskClock("", FALSE, FALSE)){ \r
        if (GetFskClock("", FALSE, FALSE)){ \r

-               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
+               fskClocks(&fc1, &fc2, &clk, FALSE);\r
+               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){\r

                        tests[hits].modulation = DEMOD_FSK;\r
                        tests[hits].modulation = DEMOD_FSK;\r

-                       tests[hits].inversed = FALSE;\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
+                       tests[hits].bitrate = bitRate;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

                        ++hits;\r
                }\r
                        ++hits;\r
                }\r

-               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
+               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)) {\r

                        tests[hits].modulation = DEMOD_FSK;\r
                        tests[hits].modulation = DEMOD_FSK;\r

-                       tests[hits].inversed = TRUE;\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].bitrate = bitRate;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

                        ++hits;\r
                        ++hits;\r

+               }\r
+       } else {\r
+               clk = GetAskClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_ASK;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\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].inversed = FALSE;\r
-                       ++hits;\r
+                       if ( ASKDemod("0 1 0", FALSE, FALSE, 1)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_ASK;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\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].inversed = TRUE;\r
-                       ++hits;\r
+                       if ( ASKbiphaseDemod("0 0 0 0", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate) ) {\r
+                               tests[hits].modulation = DEMOD_BI;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+                       if ( ASKbiphaseDemod("0 0 1 0", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate) ) {\r
+                               tests[hits].modulation = DEMOD_BIa;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\r
                        }\r

-               \r
-               if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_NRZ;\r
-                       tests[hits].inversed = FALSE;\r
-                       ++hits;\r

                }\r
                }\r

+               //undo trim from ask\r
+               save_restoreGB(0);\r
+               clk = GetNrzClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_NRZ;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r

 \r
 \r

-               if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_NRZ;\r
-                       tests[hits].inversed = TRUE;\r
-                       ++hits;\r
+                       if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_NRZ;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\r
                        }\r

-               \r
-               if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_PSK1;\r
-                       tests[hits].inversed = FALSE;\r
-                       ++hits;\r

                }\r
                \r
                }\r
                \r

-               if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_PSK1;\r
-                       tests[hits].inversed = TRUE;\r
-                       ++hits;\r
-               }\r
-\r
-               //PSK2\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].inversed = FALSE;\r
+               //undo trim from nrz\r
+               save_restoreGB(0);\r
+               clk = GetPskClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_PSK1;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

                                ++hits;\r
                        }\r
                                ++hits;\r
                        }\r

-               }\r
-               if ( PSKDemod("0 1 1", FALSE)) {\r
-                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
-                       if (test(DEMOD_PSK2, &tests[hits].offset)){\r
-                               tests[hits].modulation = DEMOD_PSK2;\r
-                               tests[hits].inversed = TRUE;\r
+                       if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_PSK1;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

                                ++hits;\r
                        }\r
                                ++hits;\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, &bitRate)){\r
+                                       tests[hits].modulation = DEMOD_PSK2;\r
+                                       tests[hits].bitrate = bitRate;\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
+                       // 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, &bitRate)){\r
+                                       tests[hits].modulation = DEMOD_PSK3;\r
+                                       tests[hits].bitrate = bitRate;\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

-\r
-               /* DEPENDANT ON NEW CODE IN MARSHMELLOWS pull request\r
-               //biphase //offset, clock, invert, maxErr\r
-               if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
-                       tests[hits].modulation = DEMOD_BI;\r
-                       tests[hits].inversed = FALSE;\r
-                       ++hits;\r
-               }\r
-               if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
-                       tests[hits].modulation = DEMOD_BI;\r
-                       tests[hits].inversed = TRUE;\r
-                       ++hits;\r
-               }\r
-               */\r

        }               \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
        }               \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r

-               config.inversed = tests[0].inversed;\r
+               config.bitrate = tests[0].bitrate;\r
+               config.inverted = tests[0].inverted;\r

                config.offset = tests[0].offset;\r
                config.offset = tests[0].offset;\r

+               config.block0 = tests[0].block0;\r

                printConfiguration( config );\r
                return TRUE;\r
        }\r
                printConfiguration( config );\r
                return TRUE;\r
        }\r


@@ -405,208 +557,305 @@ bool tryDetectModulation(){
 bool testModulation(uint8_t mode, uint8_t modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\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
+                       if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return TRUE;\r

                        break;\r
                case DEMOD_ASK:\r
                        break;\r
                case DEMOD_ASK:\r

-                       if (modread == 8) return TRUE;\r
+                       if (modread == DEMOD_ASK) return TRUE;\r

                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r

-                       if (modread == 1) return TRUE;\r
+                       if (modread == DEMOD_PSK1) return TRUE;\r

                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r

-                       if (modread == 2) return TRUE;\r
+                       if (modread == DEMOD_PSK2) return TRUE;\r

                        break;\r
                case DEMOD_PSK3:\r
                        break;\r
                case DEMOD_PSK3:\r

-                       if (modread == 3) return TRUE;\r
+                       if (modread == DEMOD_PSK3) return TRUE;\r

                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r

-                       if (!modread) return TRUE;\r
+                       if (modread == DEMOD_NRZ) return TRUE;\r

                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r

-                       if (modread == 16) return TRUE;\r
+                       if (modread == DEMOD_BI) return TRUE;\r

                        break;\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
                default:\r
                        return FALSE;\r
        }\r
        return FALSE;\r
 }\r
 \r

-bool test(uint8_t mode, uint8_t *offset){\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
+               case DEMOD_FSK1:\r
+               case DEMOD_FSK1a:\r
+               case DEMOD_FSK2:\r
+               case DEMOD_FSK2a:\r
+                       detRate = GetFskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) \r
+                               return TRUE;\r
+                       break;\r
+               case DEMOD_ASK:\r
+               case DEMOD_BI:\r
+               case DEMOD_BIa:\r
+                       detRate = GetAskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate) \r
+                               return TRUE;\r
+                       break;\r
+               case DEMOD_PSK1:\r
+               case DEMOD_PSK2:\r
+               case DEMOD_PSK3:\r
+                       detRate = GetPskClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate)\r
+                               return TRUE;\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       detRate = GetNrzClock("",FALSE, FALSE); \r
+                       if (expected[readRate] == detRate)\r
+                               return TRUE;\r
+                       break;\r
+               default:\r
+                       return FALSE;\r
+       }\r
+       return FALSE;\r
+}\r
+\r
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate){\r

 \r
 \r

-       if ( !DemodBufferLen) \r
-               return FALSE;\r
-       if ( PackBits(0, 32, DemodBuffer) == 0x00 )\r
-               return FALSE;\r
-       for (uint8_t idx=1; idx<33; idx++){\r
-               uint8_t si = idx;\r
-               uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;           //master key\r
+       if ( DemodBufferLen < 64 ) 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;\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
                uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode\r

-               uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3+3;   //new\r
-               //uint8_t bitRate  = PackBits(si, 3, DemodBuffer); si += 3;   //new  could check bit rate\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;     //extended mode part of rate\r
+               int bitRate  = PackBits(si, 3, DemodBuffer); si += 3;     //bit rate\r
+               if (bitRate > 7) continue;\r

                uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\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 modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; \r
+               //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //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
                uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
                \r

-               bool extMode = FALSE;\r
-\r
-       //PrintAndLog("test: %X %X %X ", safer, resv, extend);\r
-       \r
-       // 2nibble must be zeroed.\r
-               if ( resv > 0x00) continue;\r
-\r

                //if extended mode\r
                //if extended mode\r

-               if ( (safer == 0x6 || safer == 0x9) && extend) extMode = TRUE;\r
+               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r

 \r
                if (!extMode){\r
                        if (nml01 || nml02 || xtRate) continue;\r
                }\r
 \r
                if (!extMode){\r
                        if (nml01 || nml02 || xtRate) continue;\r
                }\r

-\r

                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r

+               if (!testBitRate(bitRate, mode)) continue;\r
+               *fndBitRate = bitRate;\r

                *offset = idx;\r
                *offset = idx;\r

-                       return TRUE;\r
+               return TRUE;\r

        }\r
        return FALSE;\r
 }\r
 \r
        }\r
        return FALSE;\r
 }\r
 \r

-void printT55xxBlock(const char *demodStr){\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
        uint8_t bits[64] = {0x00};\r
        uint32_t blockData = 0;\r
        uint8_t bits[64] = {0x00};\r

-               \r
-       if ( !DemodBufferLen) \r
-               return;\r
-       \r
-       if ( config.offset + 32 > DemodBufferLen){\r
-               PrintAndLog("The configured offset is too big. (%d > %d)", config.offset, DemodBufferLen);\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
        }\r
                return;\r
        }\r

-       \r
-       int i = config.offset;\r
-       int pos = 32 + config.offset;\r
-    for (; i < pos; ++i)\r
-               bits[i - config.offset]=DemodBuffer[i];\r
-       \r
+\r
+       for (; i < endpos; ++i)\r
+               bits[i - config.offset] = DemodBuffer[i];\r
+\r

        blockData = PackBits(0, 32, bits);\r
        blockData = PackBits(0, 32, bits);\r

-       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
+       PrintAndLog("%s | %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
 }\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("OFFSET | DATA  | BINARY");\r

        PrintAndLog("----------------------------------------------------");\r
        int i,j = 0;\r
        PrintAndLog("----------------------------------------------------");\r
        int i,j = 0;\r

-       for (; j < 128; ++j){\r
+       for (; j < 64; ++j){\r

                \r
                for (i = 0; i < 32; ++i)\r
                        bits[i]=DemodBuffer[j+i];\r
        \r
                blockData = PackBits(0, 32, bits);\r
                \r
                for (i = 0; i < 32; ++i)\r
                        bits[i]=DemodBuffer[j+i];\r
        \r
                blockData = PackBits(0, 32, bits);\r

-               PrintAndLog("[%d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));      \r
+               \r
+               PrintAndLog("%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));   \r

        }\r
        }\r

-       \r

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

-void printConfiguration( t55xx_conf_block_t b){\r
+int printConfiguration( t55xx_conf_block_t b){\r

        PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
        PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r

-       PrintAndLog("Inverted   : %s", (b.inversed) ? "Yes" : "No" );\r
+       PrintAndLog("Bit Rate   : %s", GetBitRateStr(b.bitrate) );\r
+       PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r

        PrintAndLog("Offset     : %d", b.offset);\r
        PrintAndLog("Offset     : %d", b.offset);\r

-       PrintAndLog("Block0     : %08X", b.block0);\r
+       PrintAndLog("Block0     : 0x%08X", b.block0);\r

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

+       return 0;\r

 }\r
 \r
 }\r
 \r

-int CmdT55xxWriteBlock(const char *Cmd)\r
-{\r
-       int block = 8; //default to invalid block\r
-       int data = 0xFFFFFFFF; //default to blank Block \r
-       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
+int CmdT55xxWakeUp(const char *Cmd) {\r
+       uint32_t password = 0;\r
+       uint8_t cmdp = 0;\r
+       bool errors = false;\r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_wakup();\r
+               case 'p':\r
+               case 'P':\r
+                       password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+                       cmdp += 2;\r
+                       errors = false;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r

        }\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
+       if (errors) return usage_t55xx_wakup();\r
+\r
+       UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r
+       PrintAndLog("Wake up command sent. Try read now");\r
+       return 0;\r
+}\r
+\r
+int CmdT55xxWriteBlock(const char *Cmd) {\r
+       uint8_t block = 0xFF; //default to invalid block\r
+       uint32_t data = 0; //default to blank Block \r
+       uint32_t password = 0; //default to blank Block 7\r
+       bool usepwd = false;\r
+       bool page1 = false;     \r
+       bool gotdata = false;\r
+       bool errors = false;\r
+       uint8_t cmdp = 0;\r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_write();\r
+               case 'b':\r
+               case 'B':\r
+                       errors |= param_getdec(Cmd, cmdp+1, &block);\r
+                       cmdp += 2;\r
+                       break;\r
+               case 'd':\r
+               case 'D':\r
+                       data = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+                       gotdata = true;\r
+                       cmdp += 2;\r
+                       break;\r
+               case 'p':\r
+               case 'P':\r
+                       password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
+                       usepwd = true;\r
+                       cmdp += 2;\r
+                       break;\r
+               case '1':\r
+                       page1 = true;\r
+                       cmdp++;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r

        }\r
        }\r

+       if (errors || !gotdata) return usage_t55xx_write();\r

 \r
        if (block > 7) {\r
 \r
        if (block > 7) {\r

-               PrintAndLog("Block must be between 0 and 7");\r
-               return 1;\r
+               PrintAndLog("Block number must be between 0 and 7");\r
+               return 0;\r

        }\r
        \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        }\r
        \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r

-       c.d.asBytes[0] = 0x0; \r
+       UsbCommand resp;\r
+       c.d.asBytes[0] = (page1) ? 0x2 : 0; \r

 \r
 \r

-       PrintAndLog("Writing to T55x7");\r
-       PrintAndLog("block : %d", block);\r
-       PrintAndLog("data  : 0x%08X", data);\r
+       PrintAndLog("Writing to page: %d  block: %d  data : 0x%08X", page1, block, data);\r

 \r
        //Password mode\r
 \r
        //Password mode\r

-       if (res == 3) {\r
+       if (usepwd) {\r

                c.arg[2] = password;\r
                c.arg[2] = password;\r

-               c.d.asBytes[0] = 0x1; \r
+               c.d.asBytes[0] |= 0x1; \r

                PrintAndLog("pwd   : 0x%08X", password);\r
        }\r
                PrintAndLog("pwd   : 0x%08X", password);\r
        }\r

+       clearCommandBuffer();\r

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

+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r
+               PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");\r

        return 0;\r
        return 0;\r

+       }\r
+       return 1;\r

 }\r
 \r
 }\r
 \r

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

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

-       \r
-       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
-               return usage_t55xx_trace();\r
+       bool pwdmode = false;\r
+       uint32_t password = 0;  \r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_trace();\r

 \r
 \r

-       if ( strlen(Cmd)==0){\r
+       if (strlen(Cmd)==0)\r
+               if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )\r
+                       return 0;\r

        \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
+       if (!DecodeT55xxBlock()) return 0;\r

 \r
 \r

-               uint8_t got[12000];\r
-               GetFromBigBuf(got,sizeof(got),0);\r
-               WaitForResponse(CMD_ACK,NULL);\r
-               setGraphBuf(got, 12000);\r
-       }\r
-       \r
-       DecodeT55xxBlock();\r
-\r
-       if ( !DemodBufferLen) \r
-               return 2;\r
+       if ( !DemodBufferLen) return 0;\r

        \r
        RepaintGraphWindow();\r
        uint8_t repeat = 0;\r
        \r
        RepaintGraphWindow();\r
        uint8_t repeat = 0;\r

-       if (config.offset > 5) repeat = 32;\r
+       if (config.offset > 5) \r
+               repeat = 32;\r

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

        \r
        \r

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

-       year += 2000;\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 0;\r
+       }\r
+\r

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


@@ -615,15 +864,16 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r

-       PrintAndLog("     Year/Quarter : %d/%d",year, quarter );\r
+       PrintAndLog("     Year/Quarter : %d/%d",year, quarter);\r

        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r

-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
-       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
+       PrintAndLog("     Block 2  : 0x%08X  %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r

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

+\r

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


@@ -650,41 +900,20 @@ int CmdT55xxInfo(const char *Cmd){
                Normal mode\r
                Extended mode\r
        */\r
                Normal mode\r
                Extended mode\r
        */\r

+       bool pwdmode = false;\r
+       uint32_t password = 0;\r

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

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

        \r
        \r

-       if (strlen(Cmd)==0){\r
-               \r
-               // read block 0, Page 0. Configuration.\r
-               UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};\r
-               c.d.asBytes[0] = 0x0; \r
-\r
-               //Password mode\r
-               // if ( res == 2 ) {\r
-                       // c.arg[2] = password;\r
-                       // c.d.asBytes[0] = 0x1; \r
-               // }\r
-\r
-               SendCommand(&c);\r
-               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-                       PrintAndLog("command execution time out");\r
+       if (strlen(Cmd)==0)\r
+               if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )\r

                        return 1;\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
-       }\r
-       \r
-       DecodeT55xxBlock();\r
+       if (!DecodeT55xxBlock()) return 1;\r
+\r
+       if ( DemodBufferLen < 32) return 1;\r

 \r
 \r

-       if ( !DemodBufferLen) \r
-               return 2;\r
-       \r
-       \r

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


@@ -711,7 +940,7 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
        PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r
        PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
        PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r

-       PrintAndLog(" PSK clock freq            : %d", pskcf);\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(" 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


@@ -730,65 +959,83 @@ int CmdT55xxInfo(const char *Cmd){
 \r
 int CmdT55xxDump(const char *Cmd){\r
 \r
 \r
 int CmdT55xxDump(const char *Cmd){\r
 \r

-       char s[20] = {0x00};\r
-       uint8_t pwd[4] = {0x00};\r
+       uint32_t password = 0;\r
+       bool override = false;\r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_dump();\r

 \r
 \r

-       char cmdp = param_getchar(Cmd, 0);\r
-       if ( cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_dump();\r
-               return 0;\r
+       bool usepwd = ( strlen(Cmd) > 0);       \r
+       if ( usepwd ){\r
+               password = param_get32ex(Cmd, 0, 0, 16);\r
+               if (param_getchar(Cmd, 1) =='o' )\r
+                       override = true;\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
-                       return 1;\r
-               }\r
+       \r
+       PrintAndLog("Reading Page 0:"); \r
+       PrintAndLog("blk | hex data | binary");\r
+       for ( uint8_t i = 0; i < 8; ++i){\r
+               T55xxReadBlock(i, 0, usepwd, override, password);\r

        }\r
        }\r

+       PrintAndLog("Reading Page 1:"); \r
+       PrintAndLog("blk | hex data | binary");\r
+       for ( uint8_t   i = 0; i < 4; i++){\r
+               T55xxReadBlock(i, 1, usepwd, override, password);               \r
+       }\r
+       return 1;\r
+}\r
+\r
+int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){\r
+       // arg0 bitmodes:\r
+       // bit0 = pwdmode\r
+       // bit1 = page to read from\r
+       uint8_t arg0 = (page<<1) | pwdmode;\r
+       UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};\r

        \r
        \r

-       for ( int i = 0; i <8; ++i){\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
-               } else {\r
-                       sprintf(s,"%d", i);\r
-               }\r
-               CmdT55xxReadBlock(s);\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 0;\r

        }\r
        }\r

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

 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r
 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r

-       static char buf[40];\r
+       static char buf[25];\r
+\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


@@ -796,59 +1043,63 @@ 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[40];\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 - passwd",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 - Manchester",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
                        break;\r
                default:\r

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

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


@@ -859,67 +1110,112 @@ char * GetModelStrFromCID(uint32_t cid){
        static char buf[10];\r
        char *retStr = buf;\r
        \r
        static char buf[10];\r
        char *retStr = buf;\r
        \r

-       if (cid == 1) sprintf(retStr,"ATA5577M1");\r
-       if (cid == 2) sprintf(retStr,"ATA5577M2");      \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
        return buf;\r
 }\r
 \r
 char * GetSelectedModulationStr( uint8_t id){\r
 \r

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

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

-       \r
+\r

        switch (id){\r
                case DEMOD_FSK:\r
        switch (id){\r
                case DEMOD_FSK:\r

-                       sprintf(retStr,"FSK (%d)",id);\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
                        break;\r
                case DEMOD_ASK:         \r

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

                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r

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

                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r

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

                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r

-                       sprintf(retStr,"PSK2 (%d)",id);\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
                        break;\r
                case DEMOD_BI:\r

-                       sprintf(retStr,"BIPHASE (%d)",id);\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,"(Unknown)");\r
+                       snprintf(retStr,sizeof(buf),"(Unknown)");\r

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

+void t55x7_create_config_block( int tagtype ){\r
+       //switch?\r
+       \r
+       \r
+}\r
+\r
+/*\r

 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
        int i = start;\r
        int j = len-1;\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\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
        return tmp;\r
 }\r

+*/\r
+\r
+int CmdResetRead(const char *Cmd) {\r
+       UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};\r
+\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 0;\r
+       }\r
+\r
+       uint8_t got[BIGBUF_SIZE-1];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
+       setGraphBuf(got, sizeof(got));\r
+       return 1;\r
+}\r

 \r
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,           1, "This help"},\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
-  {"detect", CmdT55xxDetect,    0, "Try detecting the tag modulation from reading the configuration block."},\r
-  {"read",   CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
-  {"write",  CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+  {"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, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},\r
+  {"resetread",CmdResetRead,      0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},\r
+  {"write",    CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},\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
   {"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, "Shows how a datablock changes with 32 different offsets"},\r
+  {"dump",     CmdT55xxDump,      0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},\r
+  {"special", special,          0, "Show block changes with 64 different offsets"},\r
+  {"wakeup", CmdT55xxWakeUp,    0, "Send AOR wakeup command"},\r

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