FIX: narrowed down the detect modulation even further.

FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .

MISSING:
the detect, trace, info,  doesn't use a password for those tags with enabled password-mode.

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index c205788440835c8857a8c0838d08d8f038ce7a1a..aeb53cb101c3d1e1030a42e4deb7d3446521a41d 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1028,7 +1028,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
  * To compensate antenna falling times shorten the write times
  * and enlarge the gap ones.
  */
-#define START_GAP 30*8 // 10 - 50fc 250
+#define START_GAP 50*8 // 10 - 50fc 250
 #define WRITE_GAP 20*8 //  8 - 30fc
 #define WRITE_0   24*8 // 16 - 31fc 24fc 192
 #define WRITE_1   54*8 // 48 - 63fc 54fc 432 for T55x7; 448 for E5550
@@ -1198,7 +1198,7 @@ void TurnReadLFOn(){
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
        // Give it a bit of time for the resonant antenna to settle.
        //SpinDelay(30);
-       SpinDelayUs(9*150);
+       SpinDelayUs(8*150);
 }
 
 /*-------------- Cloning routines -----------*/

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 93d8f99ca419c8b109839b005bc4635df9219314..bd4026381f8e237150dba41dce19261840ed05a1 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -25,21 +25,24 @@
 #include "../common/iso14443crc.h"\r
 #include "cmdhf14a.h"\r
 \r
+#define CONFIGURATION_BLOCK 0x00\r
+#define TRACE_BLOCK 0x01\r
+\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
 int usage_t55xx_config(){\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|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("Options:");\r
+       PrintAndLog("       h                                  This help");\r
+       PrintAndLog("       d <FSK|ASK|PSK1|PSK2|PSK3|NRZ|BI>  Set demodulation");\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 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
@@ -97,7 +100,8 @@ int usage_t55xx_dump(){
        return 0;\r
 }\r
 int usage_t55xx_detect(){\r
-       PrintAndLog("Usage:  lf t55xx detect");\r
+       PrintAndLog("Usage:  lf t55xx detect [1]");\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
@@ -108,7 +112,7 @@ int usage_t55xx_detect(){
 \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
@@ -138,6 +142,8 @@ int CmdT55xxSetConfig(const char *Cmd){
                                config.modulation = DEMOD_PSK1;\r
                        else if ( strcmp(modulation, "PSK2" ) == 0)\r
                                config.modulation = DEMOD_PSK2;\r
+                       else if ( strcmp(modulation, "PSK3" ) == 0)\r
+                               config.modulation = DEMOD_PSK3;                 \r
                        else if ( strcmp(modulation, "BI" ) == 0)\r
                                config.modulation = DEMOD_BI;\r
                        else {\r
@@ -146,7 +152,7 @@ int CmdT55xxSetConfig(const char *Cmd){
                        }\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
@@ -170,13 +176,13 @@ int CmdT55xxSetConfig(const char *Cmd){
        //Validations\r
        if (errors)\r
                return usage_t55xx_config();\r
+       \r
        config.block0 = 0;\r
        printConfiguration( config );\r
        return 0;\r
 }\r
 \r
-int CmdT55xxReadBlock(const char *Cmd)\r
-{\r
+int CmdT55xxReadBlock(const char *Cmd) {\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
 \r
@@ -225,41 +231,38 @@ void DecodeT55xxBlock(){
        char buf[8] = {0x00};\r
        char *cmdStr = buf;\r
 \r
-       // clearing the DemodBuffer.\r
        DemodBufferLen = 0x00;\r
        \r
-       // use the configuration\r
        switch( config.modulation ){\r
                case DEMOD_FSK:\r
-                       sprintf(cmdStr,"0 %d", config.inversed );\r
+                       sprintf(cmdStr,"0 %d", config.inverted );\r
                        FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_ASK:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        ASKmanDemod(cmdStr, FALSE, FALSE);\r
                        break;\r
                case DEMOD_PSK1:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        PSKDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_PSK2:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        PSKDemod(cmdStr, FALSE);\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_PSK3:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        PSKDemod(cmdStr, FALSE);\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_NRZ:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        NRZrawDemod(cmdStr, FALSE);\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
+                       sprintf(cmdStr,"0 0 %d 1", config.inverted );\r
+                       ASKbiphaseDemod(cmdStr, FALSE);\r
                        break;\r
                default:\r
                return;\r
@@ -267,127 +270,146 @@ void DecodeT55xxBlock(){
 }\r
 \r
 int CmdT55xxDetect(const char *Cmd){\r
+\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
-       //Password mode\r
-       // if ( res == 2 ) {\r
-               // c.arg[2] = password;\r
-               // c.d.asBytes[0] = 0x1; \r
-       // }\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+               return usage_t55xx_detect();\r
 \r
-       SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-               PrintAndLog("command execution time out");\r
-               return FALSE;\r
-       }\r
+       if ( strlen(Cmd)==0)\r
+               AquireData(CONFIGURATION_BLOCK);\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
+       if ( !tryDetectModulation() )\r
                PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
-       }\r
+\r
        return 0;\r
 }\r
 \r
-// detect configuration?\r
 bool tryDetectModulation(){\r
        \r
        uint8_t hits = 0;\r
-       t55xx_conf_block_t tests[11];\r
+       t55xx_conf_block_t tests[15];\r
        \r
        if (GetFskClock("", FALSE, FALSE)){ \r
                if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
                        tests[hits].modulation = DEMOD_FSK;\r
-                       tests[hits].inversed = FALSE;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                }\r
                if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_FSK;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                        }\r
     } else {\r
                if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inversed = FALSE;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                        }\r
 \r
                if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test(DEMOD_ASK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\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
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
 \r
                if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_NRZ;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\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
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                }\r
                \r
                if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_PSK1;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                }\r
 \r
-               //PSK2\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
                if ( PSKDemod("0 0 1", FALSE)) {\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        if (test(DEMOD_PSK2, &tests[hits].offset)){\r
                                tests[hits].modulation = DEMOD_PSK2;\r
-                               tests[hits].inversed = FALSE;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
                                ++hits;\r
                        }\r
                }\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
                if ( PSKDemod("0 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
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
                                ++hits;\r
                        }\r
                }\r
 \r
-               /* DEPENDANT ON NEW CODE IN MARSHMELLOWS pull request\r
-               //biphase //offset, clock, invert, maxErr\r
+               // PSK3 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK3;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
+                               ++hits;\r
+                       }\r
+               }\r
+               // PSK3 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 1 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK3;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+               }\r
+               \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
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
                if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
                        tests[hits].modulation = DEMOD_BI;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
-               */\r
        }               \r
+\r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
-               config.inversed = tests[0].inversed;\r
+               config.inverted = tests[0].inverted;\r
                config.offset = tests[0].offset;\r
+               \r
+               DecodeT55xxBlock();\r
+               if (DemodBufferLen > config.offset + 32) \r
+                       config.block0 = PackBits(config.offset, 32, DemodBuffer);\r
                printConfiguration( config );\r
                return TRUE;\r
        }\r
@@ -433,14 +455,20 @@ bool testModulation(uint8_t mode, uint8_t modread){
 \r
 bool test(uint8_t mode, uint8_t *offset){\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
+       if ( !DemodBufferLen) return FALSE;\r
+       \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
+\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+3;   //new\r
                //uint8_t bitRate  = PackBits(si, 3, DemodBuffer); si += 3;   //new  could check bit rate\r
                uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\r
@@ -449,15 +477,8 @@ bool test(uint8_t mode, uint8_t *offset){
                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
-               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 ( (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
@@ -465,29 +486,29 @@ bool test(uint8_t mode, uint8_t *offset){
 \r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r
+               \r
                *offset = idx;\r
-                       return TRUE;\r
+               return TRUE;\r
        }\r
        return FALSE;\r
 }\r
 \r
 void printT55xxBlock(const char *demodStr){\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
-               \r
-       if ( !DemodBufferLen) \r
-               return;\r
+\r
+       if ( !DemodBufferLen) return;\r
        \r
-       if ( config.offset + 32 > DemodBufferLen){\r
-               PrintAndLog("The configured offset is too big. (%d > %d)", config.offset, DemodBufferLen);\r
+       if ( endpos > DemodBufferLen){\r
+               PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);\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
+    for (; i < endpos; ++i)\r
+               bits[i - config.offset] = DemodBuffer[i];\r
        \r
        blockData = PackBits(0, 32, bits);\r
        PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
@@ -500,13 +521,18 @@ int special(const char *Cmd) {
        PrintAndLog("[OFFSET] [DATA] [BINARY]");\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
-               PrintAndLog("[%d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));      \r
+\r
+               //char indicate[4] = {0x00};\r
+               // if ( (blockData >> 24) == 0xE0 )\r
+                       // sprintf(indicate,"<--");\r
+               //PrintAndLog("[%02d] 0x%08X  %s %s",j , blockData, sprint_bin(bits,32), indicate);     \r
+               PrintAndLog("[%02d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));    \r
        }\r
        \r
        return 0;\r
@@ -514,9 +540,9 @@ int special(const char *Cmd) {
 \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("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r
        PrintAndLog("Offset     : %d", b.offset);\r
-       PrintAndLog("Block0     : %08X", b.block0);\r
+       PrintAndLog("Block0     : 0x%08X", b.block0);\r
        PrintAndLog("");\r
 }\r
 \r
@@ -569,28 +595,17 @@ int CmdT55xxReadTrace(const char *Cmd)
                return usage_t55xx_trace();\r
 \r
        if ( strlen(Cmd)==0){\r
-       \r
-               UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
-               SendCommand(&c);\r
-               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-                       PrintAndLog("command execution time out");\r
-                       return 1;\r
-               }\r
-\r
-               uint8_t got[12000];\r
-               GetFromBigBuf(got,sizeof(got),0);\r
-               WaitForResponse(CMD_ACK,NULL);\r
-               setGraphBuf(got, 12000);\r
+               AquireData( TRACE_BLOCK );\r
        }\r
        \r
        DecodeT55xxBlock();\r
 \r
-       if ( !DemodBufferLen) \r
-               return 2;\r
+       if (!DemodBufferLen) return 1;\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
        uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
        uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
@@ -624,6 +639,9 @@ int CmdT55xxReadTrace(const char *Cmd)
        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("-------------------------------------------------------------");\r
+       \r
+       if ( acl != 0xE0 ) \r
+               PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r
@@ -652,38 +670,15 @@ int CmdT55xxInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
-       if (cmdp == 'h' || cmdp == 'H')\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
                return usage_t55xx_info();\r
        \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
-               uint8_t got[12000];\r
-               GetFromBigBuf(got,sizeof(got),0);\r
-               WaitForResponse(CMD_ACK,NULL);\r
-               setGraphBuf(got, 12000);\r
-       }\r
+       if (strlen(Cmd)==0)\r
+               AquireData( CONFIGURATION_BLOCK );\r
        \r
        DecodeT55xxBlock();\r
 \r
-       if ( !DemodBufferLen) \r
-               return 2;\r
-       \r
+       if (!DemodBufferLen) return 1;\r
        \r
        uint8_t si = config.offset;\r
        uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r
@@ -711,7 +706,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(" 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
@@ -724,7 +719,6 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog(" Raw Data - Page 0");\r
        PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
-       \r
        return 0;\r
 }\r
 \r
@@ -759,6 +753,39 @@ int CmdT55xxDump(const char *Cmd){
        return 0;\r
 }\r
 \r
+int AquireData( uint8_t block ){\r
+\r
+       UsbCommand c;\r
+       \r
+       if ( block == CONFIGURATION_BLOCK ) \r
+               c.cmd = CMD_T55XX_READ_BLOCK;\r
+       else if (block == TRACE_BLOCK )\r
+               c.cmd = CMD_T55XX_READ_TRACE;\r
+               \r
+       c.arg[0] = 0x00;\r
+       c.arg[1] = 0x00;\r
+       c.arg[2] = 0x00;\r
+       c.d.asBytes[0] = 0x0; \r
+\r
+       //Password mode\r
+       // if ( res == 2 ) {\r
+               // c.arg[2] = password;\r
+               // c.d.asBytes[0] = 0x1; \r
+       // }\r
+\r
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 1;\r
+       }\r
+\r
+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
+       setGraphBuf(got, 12000);\r
+       return 0;\r
+}\r
+\r
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
@@ -871,22 +898,25 @@ char * GetSelectedModulationStr( uint8_t id){
        \r
        switch (id){\r
                case DEMOD_FSK:\r
-                       sprintf(retStr,"FSK (%d)",id);\r
+                       sprintf(retStr,"FSK");\r
                        break;\r
                case DEMOD_ASK:         \r
-                       sprintf(retStr,"ASK (%d)",id);\r
+                       sprintf(retStr,"ASK");\r
                        break;\r
                case DEMOD_NRZ:\r
-                       sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
+                       sprintf(retStr,"DIRECT/NRZ");\r
                        break;\r
                case DEMOD_PSK1:\r
-                       sprintf(retStr,"PSK1 (%d)",id);\r
+                       sprintf(retStr,"PSK1");\r
                        break;\r
                case DEMOD_PSK2:\r
-                       sprintf(retStr,"PSK2 (%d)",id);\r
+                       sprintf(retStr,"PSK2");\r
                        break;\r
+               case DEMOD_PSK3:\r
+                       sprintf(retStr,"PSK3");\r
+                       break;                  \r
                case DEMOD_BI:\r
-                       sprintf(retStr,"BIPHASE (%d)",id);\r
+                       sprintf(retStr,"BIPHASE");\r
                        break;\r
                default:\r
                        sprintf(retStr,"(Unknown)");\r
@@ -899,27 +929,27 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
        \r
        int i = start;\r
        int j = len-1;\r
-       if (len > 32) {\r
-               return 0;\r
-       }\r
+\r
+       if (len > 32) return 0;\r
+\r
        uint32_t tmp = 0;\r
-       for (; j >= 0; --j, ++i){\r
+       for (; j >= 0; --j, ++i)\r
                tmp     |= bits[i] << j;\r
-       }\r
+       \r
        return tmp;\r
 }\r
 \r
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,           1, "This help"},\r
-  {"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
+  {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset)"},\r
+  {"detect", CmdT55xxDetect,    0, "[1] Try detecting the tag modulation from reading the configuration block."},\r
   {"read",   CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
   {"write",  CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
   {"trace",  CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},\r
   {"info",   CmdT55xxInfo,      0, "[1] Show T55xx configuration data (page 0/ blk 0)"},\r
   {"dump",   CmdT55xxDump,      0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
-  {"special", special,           0, "Shows how a datablock changes with 32 different offsets"},\r
+  {"special", special,          0, "Show block changes with 64 different offsets"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 004154ff26e802a0158c5b8e55cdef64725f723c..5a9af6a7f6cd5df19472d4db56263ad3204aef46 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -20,7 +20,7 @@ typedef struct {
                DEMOD_ASK  = 0x08,\r
                DEMOD_BI   = 0x16,\r
        }  modulation;\r
-       bool inversed;\r
+       bool inverted;\r
        uint8_t offset;\r
        uint32_t block0;\r
 } t55xx_conf_block_t;\r
@@ -46,4 +46,5 @@ void DecodeT55xxBlock();
 bool tryDetectModulation();\r
 bool test(uint8_t mode, uint8_t *offset);\r
 int special(const char *Cmd);\r
+int AquireData( uint8_t block );\r
 #endif\r