]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdlft55xx.c
FIX: lf t55xx config now handles offsets.
[proxmark3-svn] / client / cmdlft55xx.c
index 4165f71223e897c2a044ca275343a22ffe0da5a3..b33c165a283186588c17e3f0732a79630e14ca29 100644 (file)
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "../common/crc.h"\r
+#include "../common/iso14443crc.h"\r
 \r
-#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)\r
-#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend..  8block * 4 bytes * 8bits = \r
-\r
-//  0 = FSK\r
-//  1 = ASK\r
-//  2 = PSK\r
-//  4 = NZR (direct)\r
-typedef struct {\r
-       uint8_t modulation;\r
-       bool inversed;\r
-       uint32_t block0;\r
-} t55xx_conf_block_t;\r
-\r
-// Default configuration: FSK, not inversed.\r
-t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};\r
+// Default configuration\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00};\r
 \r
 int usage_t55xx_config(){\r
-       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");\r
+       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
        PrintAndLog("Options:        ");\r
        PrintAndLog("       h                        This help");\r
        PrintAndLog("       d <FSK|ASK|PSK|NZ|BI>    Set demodulation FSK / ASK / PSK / NZ / Biphase");\r
        PrintAndLog("       i [1]                    Inverse data signal, defaults to normal");\r
+       PrintAndLog("       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("      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("");\r
        return 0;\r
 }\r
@@ -119,62 +109,63 @@ static int CmdHelp(const char *Cmd);
 \r
 int CmdT55xxSetConfig(const char *Cmd){\r
 \r
-       int len;\r
-       bool inverse;\r
+       uint8_t offset = 0;\r
        bool errors = FALSE;\r
        uint8_t cmdp = 0;\r
        char modulation[4] = {0x00};\r
+       char tmp = 0x00;\r
        \r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
        {\r
-               switch(param_getchar(Cmd, cmdp))\r
+               tmp = param_getchar(Cmd, cmdp);\r
+               switch(tmp)\r
                {\r
                case 'h':\r
                case 'H':\r
                        return usage_t55xx_config();\r
                case 'd':\r
-                       len = param_getstr(Cmd, cmdp+1, modulation);\r
-                       cmdp+= len+1;\r
-                       //FSK|ASK|PSK|NZ|BI\r
-                       if ( strcmp(modulation, "FSK" ) == 0)\r
-                               len = 1;\r
-                       else if ( strcmp(modulation, "ASK" ) == 0)\r
-                               len = 2;\r
-                       else if ( strcmp(modulation, "PSK" ) == 0)\r
-                               len = 3;\r
-                       else if ( strcmp(modulation, "NZ" ) == 0)\r
-                               len = 4;\r
-                       else if ( strcmp(modulation, "BI" ) == 0)\r
-                               len = 5;\r
+                       param_getstr(Cmd, cmdp+1, modulation);\r
+                       cmdp += 2;\r
+                       \r
+                       if ( strcmp(modulation, "FSK" ) == 0)       config.modulation = DEMOD_FSK;\r
+                       else if ( strcmp(modulation, "ASK" ) == 0)  config.modulation = DEMOD_ASK;\r
+                       else if ( strcmp(modulation, "PSK" ) == 0)  config.modulation = DEMOD_PSK;\r
+                       else if ( strcmp(modulation, "NZ" ) == 0)       config.modulation = DEMOD_NZR;\r
+                       else if ( strcmp(modulation, "BI" ) == 0)       config.modulation = DEMOD_BI;\r
                        else {\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                errors = TRUE;\r
                        }\r
                        break;\r
                case 'i':\r
-                       inverse = param_getchar(Cmd,cmdp+1) == '1';\r
+                       config.inversed = param_getchar(Cmd,cmdp+1) == '1';\r
                        cmdp+=2;\r
                        break;\r
+               case 'o':\r
+                       errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+                       if ( !errors )\r
+                               config.offset = offset;\r
+                       cmdp += 2;\r
+                       break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
                        errors = TRUE;\r
                        break;\r
                }\r
+               \r
+               PrintAndLog(" %c  %d  [%d]", param_getchar(Cmd, cmdp) , errors, cmdp);\r
        }\r
        // No args\r
        if (cmdp == 0) {\r
-               PrintAndLog("Modulation: %d", config.modulation);\r
-               PrintAndLog("Invert    : %d", config.inversed);\r
-               PrintAndLog("Block0    : %08X", config.block0);\r
+               printConfiguration( config );\r
                return 0;\r
        }\r
        //Validations\r
        if (errors)\r
                return usage_t55xx_config();\r
  \r
-       config.modulation = len;\r
-       config.inversed = inverse;\r
        config.block0 = 0;\r
+       printConfiguration( config );\r
        return 0;\r
 }\r
 \r
@@ -189,10 +180,9 @@ int CmdT55xxReadBlock(const char *Cmd)
 \r
        int res = sscanf(Cmd, "%d %x", &block, &password);\r
 \r
-       if ( res < 1 || res > 2 ){\r
-               usage_t55xx_read();\r
-               return 1;\r
-       }\r
+       if ( res < 1 || res > 2 )\r
+               return usage_t55xx_read();\r
+\r
        \r
        if ((block < 0) | (block > 7)) {\r
                PrintAndLog("Block must be between 0 and 7");\r
@@ -220,9 +210,7 @@ int CmdT55xxReadBlock(const char *Cmd)
        setGraphBuf(got, 12000);\r
 \r
        DecodeT55xxBlock();\r
-       PrintAndLog("FIRE");\r
        printT55xxBlock("");\r
-\r
        return 0;\r
 }\r
 \r
@@ -231,6 +219,9 @@ void DecodeT55xxBlock(){
        char buf[6] = {0x00};\r
        char *cmdStr = buf;\r
 \r
+       // clearing the DemodBuffer.\r
+       DemodBufferLen = 0x00;\r
+       \r
        // use the configuration\r
        switch( config.modulation ){\r
                case 1:\r
@@ -240,7 +231,6 @@ void DecodeT55xxBlock(){
                case 2:\r
                        sprintf(cmdStr,"0 %d 1", config.inversed );\r
                        ASKmanDemod(cmdStr, FALSE, FALSE);\r
-                       PrintAndLog("ice");\r
                        break;\r
                case 3:\r
                        sprintf(cmdStr,"0 %d 1", config.inversed );\r
@@ -284,7 +274,9 @@ int CmdT55xxDetect(const char *Cmd){
        WaitForResponse(CMD_ACK,NULL);\r
        setGraphBuf(got, 12000);\r
        \r
-       tryDetectModulation();\r
+       if ( !tryDetectModulation() ){\r
+               PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
+       }\r
        return 0;\r
 }\r
 \r
@@ -292,62 +284,79 @@ int CmdT55xxDetect(const char *Cmd){
 bool tryDetectModulation(){\r
        \r
        uint8_t hits = 0;\r
+       t55xx_conf_block_t tests[10];\r
        \r
-       //IF true, the wave is almost certainly FSK\r
        if (GetFskClock("", FALSE, FALSE)){ \r
-\r
                if ( FSKrawDemod("0 0", FALSE) && test()){\r
-                       printT55xxBlock("FSK");\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
                if ( FSKrawDemod("0 1", FALSE) && test()) {\r
-                       printT55xxBlock("FSK inv");\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
-               }\r
+                       }\r
     } else {\r
                if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
-                       printT55xxBlock("ASK/MAN");\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
-               }\r
+                       }\r
 \r
                if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) {\r
-                       printT55xxBlock("ASK/MAN Inv");\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
-               }\r
+                       }\r
                \r
                if ( NRZrawDemod("0 0 1", FALSE)  && test()) {\r
-                       printT55xxBlock("NZR");\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
 \r
                if ( NRZrawDemod("0 1 1", FALSE)  && test()) {\r
-                       printT55xxBlock("NZR inv");\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
-               }\r
+                       }\r
                \r
-               if ( PSKDemod("0 0 1", FALSE)  && test()) {\r
-                       printT55xxBlock("PSK");\r
+               if ( PSKDemod("0 0 1", FALSE) && test()) {\r
+                       tests[hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
                \r
                if ( PSKDemod("0 1 1", FALSE) && test()) {\r
-                       printT55xxBlock("PSK inv");\r
+                       tests[hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
                }\r
                //PSK2?\r
                // if (!BiphaseRawDecode("0",FALSE)  && test()) {\r
-                       // printT55xx("BIPHASE");\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = FALSE;\r
                //}\r
                // if (!BiphaseRawDecode("1",FALSE) && test()) {\r
-                       // printT55xx("BIPHASE inv");\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = TRUE;\r
                // }\r
        }               \r
-       if ( hits == 1) \r
+       if ( hits == 1) {\r
+               config.modulation = tests[0].modulation;\r
+               config.inversed = tests[0].inversed;\r
+               printConfiguration( config );\r
                return TRUE;\r
+       }\r
        \r
-       if ( hits > 1)\r
+       if ( hits > 1) {\r
                PrintAndLog("Found [%d] possible matches for modulation.",hits);\r
-\r
+               for(int i=0; i<hits; ++i){\r
+                       PrintAndLog("--[%d]---------------", i+1);\r
+                       printConfiguration( tests[i] );\r
+               }\r
+       }\r
        return FALSE;\r
 }\r
 \r
@@ -356,7 +365,11 @@ bool test(){
        if ( !DemodBufferLen) \r
                return false;\r
        \r
-       uint8_t si = 1;\r
+       if ( PackBits(0, 32, DemodBuffer) == 0x00 )\r
+               return FALSE;\r
+       \r
+       uint8_t si = 0;\r
+       \r
        uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;       \r
        uint8_t resv     = PackBits(si, 7, DemodBuffer); si += 7+3;\r
        uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;\r
@@ -377,33 +390,52 @@ bool test(){
 void printT55xxBlock(const char *demodStr){\r
        \r
        uint32_t blockData = 0;\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+       uint8_t bits[64] = {0x00};\r
                \r
        if ( !DemodBufferLen) \r
                return;\r
        \r
-       int i =0;\r
-    for (;i<DemodBufferLen;++i)\r
-               bits[i]=DemodBuffer[i];\r
+       if ( config.offset > DemodBufferLen){\r
+               PrintAndLog("The configured offset is to big. (%d > %d)", config.offset, DemodBufferLen);\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
-       blockData = PackBits(1, 32, bits);\r
-       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits+1,32), demodStr);\r
+       blockData = PackBits(0, 32, bits);\r
+       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
 }\r
 \r
-/*\r
-FSK1 / FSK1a\r
-size = fskdemod(dest, size, 32, 0, 8, 10);  // fsk1 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 8, 10);  // fsk1a RF/32 \r
+int special(const char *Cmd) {\r
+       uint32_t blockData = 0;\r
+       uint8_t bits[32] = {0x00};\r
 \r
-FSK2 / FSK2a\r
-size = fskdemod(dest, size, 32, 0, 10, 8);  // fsk2 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 10, 8);  // fsk2a RF/32 \r
-size = fskdemod(dest, size, 50, 1, 10, 8);  // fsk2a RF/50 \r
-size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64 \r
+       PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+       PrintAndLog("----------------------------------------------------");\r
+       int i,j = 0;\r
+       for (; j < 128; ++j){\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
+       \r
+       return 0;\r
+}\r
+\r
+void printConfiguration( t55xx_conf_block_t b){\r
+       PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
+       PrintAndLog("Inverted   : %s", (b.inversed) ? "Yes" : "No" );\r
+       PrintAndLog("Offset     : %d", b.offset);\r
+       PrintAndLog("Block0     : %08X", b.block0);\r
+       PrintAndLog("");\r
+}\r
 \r
-PSK1\r
-errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
-*/\r
 int CmdT55xxWriteBlock(const char *Cmd)\r
 {\r
        int block = 8; //default to invalid block\r
@@ -447,14 +479,10 @@ int CmdT55xxWriteBlock(const char *Cmd)
 \r
 int CmdT55xxReadTrace(const char *Cmd)\r
 {\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-\r
        char cmdp = param_getchar(Cmd, 0);\r
        \r
-       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_trace();\r
-               return 0;\r
-       }\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+               return usage_t55xx_trace();\r
 \r
        if ( strlen(Cmd)==0){\r
        \r
@@ -464,29 +492,35 @@ int CmdT55xxReadTrace(const char *Cmd)
                        PrintAndLog("command execution time out");\r
                        return 1;\r
                }\r
-               //darn\r
-               //CmdSamples("12000");\r
+\r
+               uint8_t got[12000];\r
+               GetFromBigBuf(got,sizeof(got),0);\r
+               WaitForResponse(CMD_ACK,NULL);\r
+               setGraphBuf(got, 12000);\r
        }\r
        \r
-       size_t bitlen = getFromGraphBuf(bits);\r
-       if ( bitlen == 0 )\r
+       DecodeT55xxBlock();\r
+\r
+       if ( !DemodBufferLen) \r
                return 2;\r
        \r
        RepaintGraphWindow();\r
 \r
-       uint8_t si = 5;\r
-       uint32_t bl0     = PackBits(si, 32, bits);\r
-       uint32_t bl1     = PackBits(si+32, 32, bits);\r
+       uint8_t si = config.offset;\r
+       uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
+       uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
+       \r
+       uint32_t acl     = PackBits(si,  8, DemodBuffer); si += 8;\r
+       uint32_t mfc     = PackBits(si, 8, DemodBuffer); si += 8;\r
+       uint32_t cid     = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
+       uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
+       uint32_t lotid    = PackBits(si, 12, DemodBuffer); si += 12;\r
+       uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
        \r
-       uint32_t acl     = PackBits(si,  8, bits); si += 8;\r
-       uint32_t mfc     = PackBits(si, 8, bits); si += 8;\r
-       uint32_t cid     = PackBits(si, 5, bits); si += 5;\r
-       uint32_t icr     = PackBits(si, 3, bits); si += 3;\r
-       uint32_t year    = PackBits(si, 4, bits); si += 4;\r
-       uint32_t quarter = PackBits(si, 2, bits); si += 2;\r
-       uint32_t lotid    = PackBits(si, 12, bits); si += 12;\r
-       uint32_t wafer   = PackBits(si, 5, bits); si += 5;\r
-       uint32_t dw      = PackBits(si, 15, bits); \r
+       year += 2000;\r
        \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
@@ -496,14 +530,14 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog(" CID                                     : 0x%02X (%d)", cid, cid);\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
-       PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );\r
+       PrintAndLog("     Year/Quarter : %d/%d",year, quarter );\r
        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bits+5,32) );\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bits+37,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r
@@ -533,33 +567,56 @@ int CmdT55xxInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
-       if (cmdp == 'h' || cmdp == 'H') {\r
+       if (cmdp == 'h' || cmdp == 'H')\r
                return usage_t55xx_info();\r
-       } else {\r
-               CmdT55xxReadBlock("0");\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
+                       return 1;\r
+               }\r
 \r
-       // config\r
-       \r
-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
-\r
-       uint8_t si = 1;\r
-       uint32_t bl0      = PackBits(si, 32, bits);\r
-       \r
-       uint32_t safer    = PackBits(si, 4, bits); si += 4;     \r
-       uint32_t resv     = PackBits(si, 7, bits); si += 7;\r
-       uint32_t dbr      = PackBits(si, 3, bits); si += 3;\r
-       uint32_t extend   = PackBits(si, 1, bits); si += 1;\r
-       uint32_t datamod  = PackBits(si, 5, bits); si += 5;\r
-       uint32_t pskcf    = PackBits(si, 2, bits); si += 2;\r
-       uint32_t aor      = PackBits(si, 1, bits); si += 1;     \r
-       uint32_t otp      = PackBits(si, 1, bits); si += 1;     \r
-       uint32_t maxblk   = PackBits(si, 3, bits); si += 3;\r
-       uint32_t pwd      = PackBits(si, 1, bits); si += 1;     \r
-       uint32_t sst      = PackBits(si, 1, bits); si += 1;     \r
-       uint32_t fw       = PackBits(si, 1, bits); si += 1;\r
-       uint32_t inv      = PackBits(si, 1, bits); si += 1;     \r
-       uint32_t por      = PackBits(si, 1, bits); si += 1;\r
+               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
+       \r
+       \r
+       uint8_t si = config.offset;\r
+       uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r
+       \r
+       uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;      \r
+       uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;\r
+       uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;\r
+       uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;\r
+       uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;\r
+       uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;\r
+       uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;      \r
+       uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;\r
                \r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r
@@ -580,7 +637,7 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 0");\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bits+5,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
        \r
        return 0;\r
@@ -712,6 +769,34 @@ char * GetModulationStr( uint32_t id){
        return buf;\r
 }\r
 \r
+char * GetSelectedModulationStr( uint8_t id){\r
+\r
+       static char buf[16];\r
+       char *retStr = buf;\r
+       \r
+       switch (id){\r
+               case DEMOD_FSK:\r
+                       sprintf(retStr,"FSK (%d)",id);\r
+                       break;\r
+               case DEMOD_ASK:         \r
+                       sprintf(retStr,"ASK (%d)",id);\r
+                       break;\r
+               case DEMOD_NZR:\r
+                       sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
+                       break;\r
+               case DEMOD_PSK:\r
+                       sprintf(retStr,"PSK (%d)",id);\r
+                       break;\r
+               case DEMOD_BI:\r
+                       sprintf(retStr,"BIPHASE (%d)",id);\r
+                       break;\r
+               default:\r
+                       sprintf(retStr,"(Unknown)");\r
+                       break;\r
+               }\r
+       return buf;\r
+}\r
+\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
        int i = start;\r
@@ -736,6 +821,7 @@ static command_t CommandTable[] =
   {"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
   {NULL, NULL, 0, NULL}\r
 };\r
 \r
Impressum, Datenschutz