Merge branch 'graphwork2' into graphwork
[proxmark3-svn] / client / cmdlft55xx.c
index 7d9543532fbb5257721414dbebc9ee870772182f..ed8e3152c54c09ea9d8767ada680a9576848279d 100644 (file)
@@ -10,6 +10,8 @@
 #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 <ctype.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,6 +24,7 @@
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "cmdhf14a.h" //for getTagInfo\r
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "cmdhf14a.h" //for getTagInfo\r
+#include "protocols.h"\r
 \r
 #define T55x7_CONFIGURATION_BLOCK 0x00\r
 #define T55x7_PAGE0 0x00\r
 \r
 #define T55x7_CONFIGURATION_BLOCK 0x00\r
 #define T55x7_PAGE0 0x00\r
@@ -30,7 +33,7 @@
 #define REGULAR_READ_MODE_BLOCK 0xFF\r
 \r
 // Default configuration\r
 #define REGULAR_READ_MODE_BLOCK 0xFF\r
 \r
 // Default configuration\r
-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00, .Q5 = FALSE };\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };\r
 \r
 t55xx_conf_block_t Get_t55xx_Config(){\r
        return config;\r
 \r
 t55xx_conf_block_t Get_t55xx_Config(){\r
        return config;\r
@@ -76,16 +79,17 @@ int usage_t55xx_read(){
        return 0;\r
 }\r
 int usage_t55xx_write(){\r
        return 0;\r
 }\r
 int usage_t55xx_write(){\r
-       PrintAndLog("Usage:  lf t55xx wr [b <block>] [d <data>] [p <password>] [1]");\r
+       PrintAndLog("Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");\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("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("     t            - OPTIONAL test mode write - ****DANGER****");   \r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
-       PrintAndLog("      lf t55xx wr b 3 d 11223344            - write 11223344 to block 3");\r
-       PrintAndLog("      lf t55xx wr b 3 d 11223344 p 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
        PrintAndLog("");\r
        return 0;\r
 }\r
@@ -136,15 +140,29 @@ int usage_t55xx_detect(){
        PrintAndLog("");\r
        return 0;\r
 }\r
        PrintAndLog("");\r
        return 0;\r
 }\r
+int usage_t55xx_detectP1(){\r
+       PrintAndLog("Command: Detect Page 1 of a t55xx chip");\r
+       PrintAndLog("Usage:  lf t55xx p1detect [1] [p <password>]");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("     1             - if set, use Graphbuffer otherwise read data from tag.");\r
+       PrintAndLog("     p <password>  - OPTIONAL password (8 hex characters)");\r
+       PrintAndLog("");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx p1detect");\r
+       PrintAndLog("      lf t55xx p1detect 1");\r
+       PrintAndLog("      lf t55xx p1detect p 11223344");\r
+       PrintAndLog("");\r
+       return 0;\r
+}\r
 int usage_t55xx_wakup(){\r
 int usage_t55xx_wakup(){\r
-       PrintAndLog("Usage:  lf t55xx wakeup [h] <password>");\r
+       PrintAndLog("Usage:  lf t55xx wakeup [h] <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("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("     <password>  - [required] password 4bytes (8 hex symbols)");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
-               PrintAndLog("      lf t55xx wakeup 11223344  - send wakeup password");\r
+               PrintAndLog("      lf t55xx wakeup 11223344  - send wakeup password");\r
        return 0;\r
 }\r
 int usage_t55xx_bruteforce(){\r
        return 0;\r
 }\r
 int usage_t55xx_bruteforce(){\r
@@ -194,7 +212,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
        uint8_t bitRate = 0;\r
        uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
        uint8_t cmdp = 0;\r
        uint8_t bitRate = 0;\r
        uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
        uint8_t cmdp = 0;\r
-       bool errors = FALSE;\r
+       bool errors = false;\r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
        {\r
                tmp = param_getchar(Cmd, cmdp);\r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
        {\r
                tmp = param_getchar(Cmd, cmdp);\r
@@ -213,7 +231,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
                                                break;\r
                                        }\r
                                }\r
                                                break;\r
                                        }\r
                                }\r
-                               if (i==9) errors = TRUE;\r
+                               if (i==9) errors = true;\r
                        }\r
                        cmdp+=2;\r
                        break;\r
                        }\r
                        cmdp+=2;\r
                        break;\r
@@ -253,7 +271,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
                                config.inverted=0;\r
                        } else {\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                config.inverted=0;\r
                        } else {\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
-                               errors = TRUE;\r
+                               errors = true;\r
                        }\r
                        break;\r
                case 'i':\r
                        }\r
                        break;\r
                case 'i':\r
@@ -268,17 +286,17 @@ int CmdT55xxSetConfig(const char *Cmd) {
                        break;\r
                case 'Q':\r
                case 'q':               \r
                        break;\r
                case 'Q':\r
                case 'q':               \r
-                       config.Q5 = TRUE;\r
+                       config.Q5 = true;\r
                        cmdp++;\r
                        break;\r
                case 'S':\r
                case 's':               \r
                        cmdp++;\r
                        break;\r
                case 'S':\r
                case 's':               \r
-                       config.ST = TRUE;\r
+                       config.ST = true;\r
                        cmdp++;\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
                        cmdp++;\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
-                       errors = TRUE;\r
+                       errors = true;\r
                        break;\r
                }\r
        }\r
                        break;\r
                }\r
        }\r
@@ -383,28 +401,28 @@ bool DecodeT55xxBlock(){
        switch( config.modulation ){\r
                case DEMOD_FSK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
        switch( config.modulation ){\r
                case DEMOD_FSK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
-                       ans = FSKrawDemod(cmdStr, FALSE);\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
                        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
+                       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
                        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
+                       ans = FSKrawDemod(cmdStr, false);\r
                        break;\r
                case DEMOD_ASK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_ASK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
-                       ans = ASKDemod_ext(cmdStr, FALSE, FALSE, 1, &ST);\r
+                       ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);\r
                        break;\r
                case DEMOD_PSK1:\r
                        // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_PSK1:\r
                        // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r
-                       ans = PSKDemod(cmdStr, FALSE);\r
+                       ans = PSKDemod(cmdStr, false);\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
@@ -414,22 +432,22 @@ bool DecodeT55xxBlock(){
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r
-                       ans = PSKDemod(cmdStr, FALSE);\r
+                       ans = PSKDemod(cmdStr, false);\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                case DEMOD_NRZ:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                case DEMOD_NRZ:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
-                       ans = NRZrawDemod(cmdStr, FALSE);\r
+                       ans = NRZrawDemod(cmdStr, false);\r
                        break;\r
                case DEMOD_BI:\r
                case DEMOD_BIa:\r
                        snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_BI:\r
                case DEMOD_BIa:\r
                        snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r
-                       ans = ASKbiphaseDemod(cmdStr, FALSE);\r
+                       ans = ASKbiphaseDemod(cmdStr, false);\r
                        break;\r
                default:\r
                        break;\r
                default:\r
-                       return FALSE;\r
+                       return false;\r
        }\r
        return (bool) ans;\r
 }\r
        }\r
        return (bool) ans;\r
 }\r
@@ -438,13 +456,13 @@ bool DecodeT5555TraceBlock() {
        DemodBufferLen = 0x00;\r
        \r
        // According to datasheet. Always: RF/64, not inverted, Manchester\r
        DemodBufferLen = 0x00;\r
        \r
        // According to datasheet. Always: RF/64, not inverted, Manchester\r
-       return (bool) ASKDemod("64 0 1", FALSE, FALSE, 1);\r
+       return (bool) ASKDemod("64 0 1", false, false, 1);\r
 }\r
 \r
 int CmdT55xxDetect(const char *Cmd){\r
 }\r
 \r
 int CmdT55xxDetect(const char *Cmd){\r
-       bool errors = FALSE;\r
-       bool useGB = FALSE;\r
-       bool usepwd = FALSE;\r
+       bool errors = false;\r
+       bool useGB = false;\r
+       bool usepwd = false;\r
        uint32_t password = 0;\r
        uint8_t cmdp = 0;\r
 \r
        uint32_t password = 0;\r
        uint8_t cmdp = 0;\r
 \r
@@ -456,12 +474,12 @@ int CmdT55xxDetect(const char *Cmd){
                case 'p':\r
                case 'P':\r
                        password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
                case 'p':\r
                case 'P':\r
                        password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
-                       usepwd = TRUE;\r
+                       usepwd = true;\r
                        cmdp += 2;\r
                        break;\r
                case '1':\r
                        // use Graphbuffer data\r
                        cmdp += 2;\r
                        break;\r
                case '1':\r
                        // use Graphbuffer data\r
-                       useGB = TRUE;\r
+                       useGB = true;\r
                        cmdp++;\r
                        break;\r
                default:\r
                        cmdp++;\r
                        break;\r
                default:\r
@@ -488,141 +506,140 @@ bool tryDetectModulation(){
        uint8_t hits = 0;\r
        t55xx_conf_block_t tests[15];\r
        int bitRate=0;\r
        uint8_t hits = 0;\r
        t55xx_conf_block_t tests[15];\r
        int bitRate=0;\r
-       uint8_t fc1 = 0, fc2 = 0, clk=0;\r
-       if (GetFskClock("", FALSE, FALSE)){ \r
-               fskClocks(&fc1, &fc2, &clk, FALSE);\r
-               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+       uint8_t fc1 = 0, fc2 = 0, ans = 0;\r
+       int clk = 0, firstClockEdge = 0;\r
+       ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, false, &firstClockEdge);\r
+       if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {\r
+               if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\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
                        tests[hits].bitrate = bitRate;\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
                        tests[hits].bitrate = bitRate;\r
-                       tests[hits].inverted = FALSE;\r
+                       tests[hits].inverted = false;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       tests[hits].ST = FALSE;\r
+                       tests[hits].ST = false;\r
                        ++hits;\r
                }\r
                        ++hits;\r
                }\r
-               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+               if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\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
                        tests[hits].bitrate = bitRate;\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
                        tests[hits].bitrate = bitRate;\r
-                       tests[hits].inverted = TRUE;\r
+                       tests[hits].inverted = true;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       tests[hits].ST = FALSE;\r
+                       tests[hits].ST = false;\r
                        ++hits;\r
                }\r
        } else {\r
                        ++hits;\r
                }\r
        } else {\r
-               clk = GetAskClock("", FALSE, FALSE);\r
+               clk = GetAskClock("", false, false);\r
                if (clk>0) {\r
                if (clk>0) {\r
-                       tests[hits].ST = TRUE;\r
-                       if ( ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       tests[hits].ST = true;\r
+                       if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
-                       tests[hits].ST = TRUE;\r
-                       if ( ASKDemod_ext("0 1 1", FALSE, FALSE, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       tests[hits].ST = true;\r
+                       if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
-                       if ( ASKbiphaseDemod("0 0 0 2", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
+                       if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
                                tests[hits].modulation = DEMOD_BI;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_BI;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
                                ++hits;\r
                        }\r
-                       if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
+                       if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
                                tests[hits].modulation = DEMOD_BIa;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_BIa;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
                }\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, clk, &tests[hits].Q5)) {\r
+               clk = GetNrzClock("", false, false);\r
+               if (clk>8) { //clock of rf/8 is likely a false positive, so don't use it.\r
+                       if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
 \r
                                ++hits;\r
                        }\r
 \r
-                       if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
                }\r
                \r
                                ++hits;\r
                        }\r
                }\r
                \r
-               // allow undo\r
-               // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
-               save_restoreGB(1);\r
-               CmdLtrim("160");\r
-               clk = GetPskClock("", FALSE, FALSE);\r
+               clk = GetPskClock("", false, false);\r
                if (clk>0) {\r
                if (clk>0) {\r
-                       if ( PSKDemod("0 0 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       // allow undo\r
+                       save_restoreGB(1);\r
+                       // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
+                       CmdLtrim("160");\r
+                       if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
                                ++hits;\r
                        }\r
-                       if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r
                                ++hits;\r
                        }\r
                        // PSK2 - needs a call to psk1TOpsk2.\r
                                ++hits;\r
                        }\r
                        // PSK2 - needs a call to psk1TOpsk2.\r
-                       if ( PSKDemod("0 0 6", FALSE)) {\r
+                       if ( PSKDemod("0 0 6", false)) {\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK2;\r
                                        tests[hits].bitrate = bitRate;\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK2;\r
                                        tests[hits].bitrate = bitRate;\r
-                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].inverted = false;\r
                                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                                       tests[hits].ST = FALSE;\r
+                                       tests[hits].ST = false;\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                        // PSK3 - needs a call to psk1TOpsk2.\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                        // PSK3 - needs a call to psk1TOpsk2.\r
-                       if ( PSKDemod("0 0 6", FALSE)) {\r
+                       if ( PSKDemod("0 0 6", false)) {\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK3;\r
                                        tests[hits].bitrate = bitRate;\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK3;\r
                                        tests[hits].bitrate = bitRate;\r
-                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].inverted = false;\r
                                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                                       tests[hits].ST = FALSE;\r
+                                       tests[hits].ST = false;\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
+                       //undo trim samples\r
+                       save_restoreGB(0);\r
                }\r
                }\r
-               //undo trim samples\r
-               save_restoreGB(0);\r
        }       \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
        }       \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
@@ -633,7 +650,7 @@ bool tryDetectModulation(){
                config.Q5 = tests[0].Q5;\r
                config.ST = tests[0].ST;\r
                printConfiguration( config );\r
                config.Q5 = tests[0].Q5;\r
                config.ST = tests[0].ST;\r
                printConfiguration( config );\r
-               return TRUE;\r
+               return true;\r
        }\r
        \r
        if ( hits > 1) {\r
        }\r
        \r
        if ( hits > 1) {\r
@@ -643,68 +660,68 @@ bool tryDetectModulation(){
                        printConfiguration( tests[i] );\r
                }\r
        }\r
                        printConfiguration( tests[i] );\r
                }\r
        }\r
-       return FALSE;\r
+       return false;\r
 }\r
 \r
 bool testModulation(uint8_t mode, uint8_t modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
 }\r
 \r
 bool testModulation(uint8_t mode, uint8_t modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
-                       if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) 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 == DEMOD_ASK) return TRUE;\r
+                       if (modread == DEMOD_ASK) return true;\r
                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r
-                       if (modread == DEMOD_PSK1) return TRUE;\r
+                       if (modread == DEMOD_PSK1) return true;\r
                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r
-                       if (modread == DEMOD_PSK2) return TRUE;\r
+                       if (modread == DEMOD_PSK2) return true;\r
                        break;\r
                case DEMOD_PSK3:\r
                        break;\r
                case DEMOD_PSK3:\r
-                       if (modread == DEMOD_PSK3) return TRUE;\r
+                       if (modread == DEMOD_PSK3) return true;\r
                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r
-                       if (modread == DEMOD_NRZ) return TRUE;\r
+                       if (modread == DEMOD_NRZ) return true;\r
                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r
-                       if (modread == DEMOD_BI) return TRUE;\r
+                       if (modread == DEMOD_BI) return true;\r
                        break;\r
                case DEMOD_BIa:\r
                        break;\r
                case DEMOD_BIa:\r
-                       if (modread == DEMOD_BIa) return TRUE;\r
+                       if (modread == DEMOD_BIa) return true;\r
                        break;          \r
                default:\r
                        break;          \r
                default:\r
-                       return FALSE;\r
+                       return false;\r
        }\r
        }\r
-       return FALSE;\r
+       return false;\r
 }\r
 \r
 bool testQ5Modulation(uint8_t  mode, uint8_t   modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
 }\r
 \r
 bool testQ5Modulation(uint8_t  mode, uint8_t   modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
-                       if (modread >= 4 && modread <= 5) return TRUE;\r
+                       if (modread >= 4 && modread <= 5) return true;\r
                        break;\r
                case DEMOD_ASK:\r
                        break;\r
                case DEMOD_ASK:\r
-                       if (modread == 0) return TRUE;\r
+                       if (modread == 0) return true;\r
                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r
-                       if (modread == 1) return TRUE;\r
+                       if (modread == 1) return true;\r
                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r
-                       if (modread == 2) return TRUE;\r
+                       if (modread == 2) return true;\r
                        break;\r
                case DEMOD_PSK3:\r
                        break;\r
                case DEMOD_PSK3:\r
-                       if (modread == 3) return TRUE;\r
+                       if (modread == 3) return true;\r
                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r
-                       if (modread == 7) return TRUE;\r
+                       if (modread == 7) return true;\r
                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r
-                       if (modread == 6) return TRUE;\r
+                       if (modread == 6) return true;\r
                        break;\r
                default:\r
                        break;\r
                default:\r
-                       return FALSE;\r
+                       return false;\r
        }\r
        }\r
-       return FALSE;\r
+       return false;\r
 }\r
 \r
 int convertQ5bitRate(uint8_t bitRateRead) {\r
 }\r
 \r
 int convertQ5bitRate(uint8_t bitRateRead) {\r
@@ -718,7 +735,7 @@ int convertQ5bitRate(uint8_t bitRateRead) {
 \r
 bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t    clk){\r
 \r
 \r
 bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t    clk){\r
 \r
-       if ( DemodBufferLen < 64 ) return FALSE;\r
+       if ( DemodBufferLen < 64 ) return false;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
@@ -751,9 +768,9 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){
                if (*fndBitRate < 0) continue;\r
                *offset = idx;\r
 \r
                if (*fndBitRate < 0) continue;\r
                *offset = idx;\r
 \r
-               return TRUE;\r
+               return true;\r
        }\r
        }\r
-       return FALSE;\r
+       return false;\r
 }\r
 \r
 bool testBitRate(uint8_t readRate, uint8_t clk){\r
 }\r
 \r
 bool testBitRate(uint8_t readRate, uint8_t clk){\r
@@ -766,7 +783,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk){
 \r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r
 \r
 \r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r
 \r
-       if ( DemodBufferLen < 64 ) return FALSE;\r
+       if ( DemodBufferLen < 64 ) return false;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
@@ -778,9 +795,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
                // moved test to here, since this gets most faults first.\r
                if ( resv > 0x00) continue;\r
 \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
+               int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of 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; \r
                //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr\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; \r
                //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr\r
@@ -788,24 +803,27 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
                //uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
                \r
                //if 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
+               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;\r
+\r
+               if (!extMode) {\r
+                       if (bitRate > 7) continue;\r
+                       if (!testBitRate(bitRate, clk)) continue;\r
+               } else { //extended mode bitrate = same function to calc bitrate as em4x05\r
+                       if (EM4x05_GET_BITRATE(bitRate) != clk) continue;\r
 \r
 \r
-               if (!extMode){\r
-                       if (xtRate) continue;  //nml01 || nml02 ||  caused issues on noralys tags\r
                }\r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r
                }\r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r
-               if (!testBitRate(bitRate, clk)) continue;\r
                *fndBitRate = bitRate;\r
                *offset = idx;\r
                *fndBitRate = bitRate;\r
                *offset = idx;\r
-               *Q5 = FALSE;\r
-               return TRUE;\r
+               *Q5 = false;\r
+               return true;\r
        }\r
        if (testQ5(mode, offset, fndBitRate, clk)) {\r
        }\r
        if (testQ5(mode, offset, fndBitRate, clk)) {\r
-               *Q5 = TRUE;\r
-               return TRUE;\r
+               *Q5 = true;\r
+               return true;\r
        }\r
        }\r
-       return FALSE;\r
+       return false;\r
 }\r
 \r
 void printT55xxBlock(const char *blockNum){\r
 }\r
 \r
 void printT55xxBlock(const char *blockNum){\r
@@ -852,7 +870,7 @@ int special(const char *Cmd) {
 int printConfiguration( t55xx_conf_block_t b){\r
        PrintAndLog("Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");\r
        PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
 int printConfiguration( t55xx_conf_block_t b){\r
        PrintAndLog("Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");\r
        PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
-       PrintAndLog("Bit Rate   : %s", GetBitRateStr(b.bitrate) );\r
+       PrintAndLog("Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );\r
        PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r
        PrintAndLog("Offset     : %d", b.offset);\r
        PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );\r
        PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r
        PrintAndLog("Offset     : %d", b.offset);\r
        PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );\r
@@ -863,26 +881,11 @@ int printConfiguration( t55xx_conf_block_t b){
 \r
 int CmdT55xxWakeUp(const char *Cmd) {\r
        uint32_t password = 0;\r
 \r
 int CmdT55xxWakeUp(const char *Cmd) {\r
        uint32_t password = 0;\r
-       uint8_t cmdp = 0;\r
-       bool errors = true;\r
-       while(param_getchar(Cmd, cmdp) != 0x00) {\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, 0xFFFFFFFF, 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
-       if (errors) return usage_t55xx_wakup();\r
+       if ( strlen(Cmd) <= 0 ) return usage_t55xx_wakup();\r
+       char cmdp = param_getchar(Cmd, 0);\r
+       if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wakup();\r
+\r
+       password = param_get32ex(Cmd, 0, 0, 16);\r
 \r
        UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};\r
        clearCommandBuffer();\r
 \r
        UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};\r
        clearCommandBuffer();\r
@@ -898,6 +901,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
        bool usepwd = false;\r
        bool page1 = false;     \r
        bool gotdata = false;\r
        bool usepwd = false;\r
        bool page1 = false;     \r
        bool gotdata = false;\r
+       bool testMode = false;\r
        bool errors = false;\r
        uint8_t cmdp = 0;\r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
        bool errors = false;\r
        uint8_t cmdp = 0;\r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
@@ -922,6 +926,11 @@ int CmdT55xxWriteBlock(const char *Cmd) {
                        usepwd = true;\r
                        cmdp += 2;\r
                        break;\r
                        usepwd = true;\r
                        cmdp += 2;\r
                        break;\r
+               case 't':\r
+               case 'T':\r
+                       testMode = true;\r
+                       cmdp++;\r
+                       break;\r
                case '1':\r
                        page1 = true;\r
                        cmdp++;\r
                case '1':\r
                        page1 = true;\r
                        cmdp++;\r
@@ -942,6 +951,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        UsbCommand resp;\r
        c.d.asBytes[0] = (page1) ? 0x2 : 0; \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        UsbCommand resp;\r
        c.d.asBytes[0] = (page1) ? 0x2 : 0; \r
+       c.d.asBytes[0] |= (testMode) ? 0x4 : 0; \r
 \r
        char pwdStr[16] = {0};\r
        snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);\r
 \r
        char pwdStr[16] = {0};\r
        snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);\r
@@ -1166,7 +1176,7 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Safer key                 : %s", GetSaferStr(safer));\r
        PrintAndLog(" reserved                  : %d", resv);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Safer key                 : %s", GetSaferStr(safer));\r
        PrintAndLog(" reserved                  : %d", resv);\r
-       PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
+       PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr, extend));\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
        PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r
        PrintAndLog(" PSK clock frequency       : %d", pskcf);\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
        PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r
        PrintAndLog(" PSK clock frequency       : %d", pskcf);\r
@@ -1193,7 +1203,7 @@ int CmdT55xxDump(const char *Cmd){
        bool override = false;\r
        if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_dump();\r
 \r
        bool override = false;\r
        if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_dump();\r
 \r
-       bool usepwd = ( strlen(Cmd) > 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
        if ( usepwd ){\r
                password = param_get32ex(Cmd, 0, 0, 16);\r
                if (param_getchar(Cmd, 1) =='o' )\r
@@ -1224,28 +1234,28 @@ int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
                PrintAndLog("command execution time out");\r
                return 0;\r
        }\r
                PrintAndLog("command execution time out");\r
                return 0;\r
        }\r
-\r
-       uint8_t got[12000];\r
-       GetFromBigBuf(got,sizeof(got),0);\r
-       WaitForResponse(CMD_ACK,NULL);\r
-       setGraphBuf(got, sizeof(got));\r
+       getSamples(12000,true);\r
        return 1;\r
 }\r
 \r
        return 1;\r
 }\r
 \r
-char * GetBitRateStr(uint32_t id) {\r
+char * GetBitRateStr(uint32_t id, bool xmode) {\r
        static char buf[25];\r
 \r
        char *retStr = buf;\r
        static char buf[25];\r
 \r
        char *retStr = buf;\r
-       switch (id) {\r
-               case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;\r
-               case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;\r
-               case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;\r
-               case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;\r
-               case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;\r
-               case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;\r
-               case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;\r
-               case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;\r
-               default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;\r
+       if (xmode) { //xmode bitrate calc is same as em4x05 calc\r
+               snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));\r
+       } else {\r
+               switch (id) {\r
+                       case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;\r
+                       case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;\r
+                       case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;\r
+                       case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;\r
+                       case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;\r
+                       case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;\r
+                       case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;\r
+                       case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;\r
+                       default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;\r
+               }               \r
        }\r
        return buf;\r
 }\r
        }\r
        return buf;\r
 }\r
@@ -1471,7 +1481,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
 \r
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
 \r
-                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r
+                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {\r
                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r
                                return 0;\r
                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r
                                return 0;\r
@@ -1516,7 +1526,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
                        return 0;\r
                }\r
 \r
                        return 0;\r
                }\r
 \r
-               if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {\r
+               if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i)) {\r
                        PrintAndLog("Aquireing data from device failed. Quitting");\r
                        free(keyBlock);\r
                        return 0;\r
                        PrintAndLog("Aquireing data from device failed. Quitting");\r
                        free(keyBlock);\r
                        return 0;\r
@@ -1538,11 +1548,160 @@ int CmdT55xxBruteForce(const char *Cmd) {
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r
+// note length of data returned is different for different chips.  \r
+//   some return all page 1 (64 bits) and others return just that block (32 bits) \r
+//   unfortunately the 64 bits makes this more likely to get a false positive...\r
+bool tryDetectP1(bool getData) {\r
+       uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};\r
+       size_t startIdx = 0;\r
+       uint8_t fc1 = 0, fc2 = 0, ans = 0;\r
+       int clk = 0, firstClockEdge = 0;\r
+       bool st = true;\r
+\r
+       if ( getData ) {\r
+               if ( !AquireData(T55x7_PAGE1, 1, false, 0) )\r
+                       return false;\r
+       }\r
+\r
+       // try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)\r
+       ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, false, &firstClockEdge);\r
+       if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {\r
+               if ( FSKrawDemod("0 0", false) && \r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               if ( FSKrawDemod("0 1", false) && \r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               return false;\r
+       }\r
+\r
+       // try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)\r
+       clk = GetPskClock("", false, false);\r
+       if (clk>0) {\r
+               // allow undo\r
+               // save_restoreGB(1);\r
+               // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
+               //CmdLtrim("160");\r
+               if ( PSKDemod("0 0 6", false) &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       //save_restoreGB(0);\r
+                       return true;\r
+               }\r
+               if ( PSKDemod("0 1 6", false) &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       //save_restoreGB(0);\r
+                       return true;\r
+               }\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 6", false)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                                 (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                               //save_restoreGB(0);\r
+                               return true;\r
+                       }\r
+               } // inverse waves does not affect PSK2 demod\r
+               //undo trim samples\r
+               //save_restoreGB(0); \r
+               // no other modulation clocks = 2 or 4 so quit searching\r
+               if (fc1 != 8) return false;\r
+       }\r
+\r
+       // try ask clock detect.  it could be another type even if successful.\r
+       clk = GetAskClock("", false, false);\r
+       if (clk>0) {\r
+               if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               st = true;\r
+               if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               if ( ASKbiphaseDemod("0 0 0 2", false) &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               if ( ASKbiphaseDemod("0 0 1 2", false) &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+       }\r
+\r
+       // try NRZ clock detect.  it could be another type even if successful.\r
+       clk = GetNrzClock("", false, false); //has the most false positives :(\r
+       if (clk>0) {\r
+               if ( NRZrawDemod("0 0 1", false)  &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+               if ( NRZrawDemod("0 1 1", false)  &&\r
+                         preambleSearchEx(DemodBuffer,preamble,sizeof(preamble),&DemodBufferLen,&startIdx,false) && \r
+                         (DemodBufferLen == 32 || DemodBufferLen == 64) ) {\r
+                       return true;\r
+               }\r
+       }\r
+       return false;\r
+}\r
+//  does this need to be a callable command?\r
+int CmdT55xxDetectPage1(const char *Cmd){\r
+       bool errors = false;\r
+       bool useGB = false;\r
+       bool usepwd = false;\r
+       uint32_t password = 0;\r
+       uint8_t cmdp = 0;\r
+\r
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_t55xx_detectP1();\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
+                       // use Graphbuffer data\r
+                       useGB = true;\r
+                       cmdp++;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r
+       }\r
+       if (errors) return usage_t55xx_detectP1();\r
+\r
+       if ( !useGB ) {\r
+               if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )\r
+                       return false;\r
+       }\r
+       bool success = tryDetectP1(false);\r
+       if (success) PrintAndLog("T55xx chip found!");\r
+       return success;\r
+}\r
+\r
 static command_t CommandTable[] = {\r
   {"help",      CmdHelp,           1, "This help"},\r
        {"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},\r
   {"config",    CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r
   {"detect",    CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},\r
 static command_t CommandTable[] = {\r
   {"help",      CmdHelp,           1, "This help"},\r
        {"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},\r
   {"config",    CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},\r
   {"detect",    CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},\r
+  {"p1detect",  CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},\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
   {"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
Impressum, Datenschutz