add: timeouts for "lf read"

chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index f3daacc6bd09172c2393981e533e7d707c929115..fabede413db7e891cd01f37562c70cb39ec34b02 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -72,8 +72,6 @@ void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1,
        DoAcquisition_config(false);
 }
 
-
-
 /* blank r/w tag data stream
 ...0000000000000000 01111111
 1010101010101010101010101010101010101010101010101010101010101010
@@ -885,12 +883,13 @@ void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMod
 // Read one card block in page 0
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 {
-    uint8_t *dest = BigBuf_get_addr();
-    //uint16_t bufferlength = BigBuf_max_traceLen();
-       uint16_t bufferlength = T55xx_SAMPLES_SIZE;
     uint32_t i = 0;
-       // Clear destination buffer before sending the command  0x80 = average.
-       memset(dest, 0x80, bufferlength);          
+    uint8_t *dest = BigBuf_get_addr();
+    uint16_t bufferlength = BigBuf_max_traceLen();
+       if ( bufferlength > T55xx_SAMPLES_SIZE )
+               bufferlength = T55xx_SAMPLES_SIZE;
+
+       memset(dest, 0x80, bufferlength);
        
        // Set up FPGA, 125kHz
        // Wait for config.. (192+8190xPOW)x8 == 67ms
@@ -920,7 +919,6 @@ void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
     for(;;) {
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
             AT91C_BASE_SSC->SSC_THR = 0x43;
-                       //AT91C_BASE_SSC->SSC_THR = 0xff;
                        LED_D_ON();
         }
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -938,12 +936,13 @@ void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 
 // Read card traceability data (page 1)
 void T55xxReadTrace(void){
-    uint8_t *dest = BigBuf_get_addr();
-    //uint16_t bufferlength = BigBuf_max_traceLen();
-       uint16_t bufferlength = T55xx_SAMPLES_SIZE;
+
        uint32_t i = 0;
+    uint8_t *dest = BigBuf_get_addr();
+    uint16_t bufferlength = BigBuf_max_traceLen();
+       if ( bufferlength > T55xx_SAMPLES_SIZE )
+               bufferlength = T55xx_SAMPLES_SIZE;
 
-       // Clear destination buffer before sending the command 0x80 = average
        memset(dest, 0x80, bufferlength);  
   
        LFSetupFPGAForADC(0, true);
@@ -978,7 +977,7 @@ void T55xxReadTrace(void){
 }
 
 void TurnReadLFOn(){
-       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+       //FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        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);

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 136b05334a5e0446a6be3e7cf15decea79d15ecb..8dd944cb06859e213d92f17180f1a8fbf1924e44 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -489,7 +489,12 @@ int CmdLFRead(const char *Cmd)
        //And ship it to device
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
        SendCommand(&c);
-       WaitForResponse(CMD_ACK,NULL);
+       //WaitForResponse(CMD_ACK,NULL);        
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+               PrintAndLog("command execution time out");
+               return 1;
+       }
+
        return 0;
 }
 

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index a48945ab707f8446c22580ea1551325c54877bf6..4a1bdaa07ce6fbfb0c4d8e82733dbbaab70ff58a 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -25,17 +25,17 @@
 #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
-int usage_t55xx_rd(){\r
-       PrintAndLog("Usage:  lf t55xx rd <block> <password>");\r
+int usage_t55xx_read(){\r
+       PrintAndLog("Usage:  lf t55xx read <block> <password>");\r
     PrintAndLog("     <block>, block number to read. Between 0-7");\r
     PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");\r
     PrintAndLog("");\r
-    PrintAndLog("    sample: lf t55xx rd 0           = try reading data from block 0");\r
-       PrintAndLog("          : lf t55xx rd 0 feedbeef  = try reading data from block 0 using password");\r
+    PrintAndLog("    sample: lf t55xx read 0           = try reading data from block 0");\r
+       PrintAndLog("          : lf t55xx read 0 feedbeef  = try reading data from block 0 using password");\r
        PrintAndLog("");\r
        return 0;\r
 }\r
-int usage_t55xx_wr(){\r
+int usage_t55xx_write(){\r
        PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");\r
     PrintAndLog("     <block>, block number to read. Between 0-7");\r
        PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r
@@ -78,23 +78,23 @@ static int CmdHelp(const char *Cmd);
 \r
 int CmdReadBlk(const char *Cmd)\r
 {\r
+       int i = 0;\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
-       size_t bitlen;\r
-       uint32_t blockData;\r
+       size_t bitlen = 0;\r
+       uint32_t blockData = 0;\r
        uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
        \r
-       \r
        char cmdp = param_getchar(Cmd, 0);\r
        if (cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_rd();\r
+               usage_t55xx_read();\r
                return 0;\r
        }\r
 \r
        int res = sscanf(Cmd, "%d %x", &block, &password);\r
 \r
        if ( res < 1 || res > 2 ){\r
-               usage_t55xx_rd();\r
+               usage_t55xx_read();\r
                return 1;\r
        }\r
        \r
@@ -113,31 +113,40 @@ int CmdReadBlk(const char *Cmd)
        }\r
 \r
        SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
                PrintAndLog("command execution time out");\r
                return 2;\r
        }\r
        \r
-       CmdSamples("12000");\r
+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
 \r
+       setGraphBuf(got, 12000);\r
+       \r
        bitlen = getFromGraphBuf(bits);\r
 \r
-       if ( !tryDemod(bits, bitlen) )\r
-               return 3;\r
+       int ans = 0;\r
+       ans = CmdFSKrawdemod("");\r
+       ans = CmdFSKrawdemod("1"); //invert?\r
+       ans = Cmdaskmandemod("");\r
+       ans = Cmdaskrawdemod("");\r
+       ans = CmdNRZrawDemod("");\r
+       ans = CmdPSK1rawDemod("");\r
+       ans = CmdPSK2rawDemod("");\r
+       \r
+       // if ( !tryDemod(bits, bitlen) )\r
+               // return 3;\r
+       \r
+       // //move bits back to DemodBuffer\r
+       // setDemodBuf(bits, bitlen, 0);\r
+       // printBitStream(bits, bitlen);\r
+       if ( !DemodBufferLen) \r
+               return 0;\r
        \r
-       //move bits back to DemodBuffer\r
-       setDemodBuf(bits, bitlen, 0);\r
-       printBitStream(bits, bitlen);\r
+    for (;i<DemodBufferLen;++i)\r
+               bits[i]=DemodBuffer[i];\r
        \r
-       // // bits has the manchester encoded data.\r
-       // errCnt = manrawdecode(bits, &bitlen);        \r
-       // if ( errCnt == -1 || bitlen < 32 ){  \r
-               // PrintAndLog("no data found");\r
-               // if (g_debugMode) \r
-                       // PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
-               // return 4;\r
-       // }\r
-\r
        blockData = PackBits(1, 32, bits);\r
 \r
        if ( block < 0)\r
@@ -219,14 +228,14 @@ int CmdWriteBlk(const char *Cmd)
        \r
        char cmdp = param_getchar(Cmd, 0);\r
        if (cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_wr();\r
+               usage_t55xx_write();\r
                return 0;\r
        }\r
   \r
        int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
        \r
        if ( res < 2 || res > 3) {\r
-               usage_t55xx_wr();\r
+               usage_t55xx_write();\r
                return 1;\r
        }\r
 \r
@@ -238,26 +247,23 @@ int CmdWriteBlk(const char *Cmd)
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        c.d.asBytes[0] = 0x0; \r
 \r
-       if (res == 2) {\r
-               PrintAndLog("Writing block %d  data %08X", block, data);\r
-       } else {\r
-               //Password mode\r
+       PrintAndLog("Writing to T55x7");\r
+       PrintAndLog("block : %d", block);\r
+       PrintAndLog("data  : 0x%08X", data);\r
+\r
+       //Password mode\r
+       if (res == 3) {\r
                c.arg[2] = password;\r
                c.d.asBytes[0] = 0x1; \r
-               PrintAndLog("Writing block %d  data %08X  password %08X", block, data, password);\r
+               PrintAndLog("pwd   : 0x%08X", password);\r
        }\r
-       \r
        SendCommand(&c);\r
        return 0;\r
 }\r
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
-       int invert = 0;\r
-       int clk = 0;\r
-       int errCnt;\r
        size_t bitlen;\r
-       int maxErr = 100;\r
        uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
 \r
        char cmdp = param_getchar(Cmd, 0);\r
@@ -271,37 +277,16 @@ int CmdReadTrace(const char *Cmd)
        \r
                UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
                SendCommand(&c);\r
-               WaitForResponse(CMD_ACK, NULL);\r
-\r
-               CmdSamples("12000");\r
+               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+                       PrintAndLog("command execution time out");\r
+                       return 1;\r
+               }\r
+               //darn\r
+               //CmdSamples("12000");\r
        }\r
        \r
        bitlen = getFromGraphBuf(bits);\r
 \r
-       //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
-       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
-       \r
-       //throw away static - allow 1 and -1 (in case of threshold command first)\r
-       if ( errCnt == -1 || bitlen < 16 ){  \r
-               PrintAndLog("no data found");\r
-               if (g_debugMode) \r
-                       PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
-               return 3;\r
-       }\r
-       if (g_debugMode) \r
-               PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
-\r
-       //move bits back to DemodBuffer\r
-       setDemodBuf(bits, bitlen, 0);\r
-       \r
-       // bits has the manchester encoded data.\r
-       errCnt = manrawdecode(bits, &bitlen);   \r
-       if ( errCnt == -1 || bitlen < 16 ){  \r
-               PrintAndLog("no data found");\r
-               if (g_debugMode) \r
-                       PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
-               return 4;\r
-       }\r
 \r
        RepaintGraphWindow();\r
 \r
@@ -596,12 +581,11 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,        1, "This help"},\r
-  {"rd",     CmdReadBlk,     0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
-  {"wr",     CmdWriteBlk,    0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+  {"read",   CmdReadBlk,     0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+  {"write",  CmdWriteBlk,    0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
   {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
   {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
   {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
-  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r

diff --git a/client/util.c b/client/util.c
index 6b47eab9eba29eddd541cd115809beb00a32f66d..c55d3f66acafbb07f895a94d76fbb46f48b6c421 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -237,7 +237,7 @@ uint8_t param_get8(const char *line, int paramnum)
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
        uint8_t val =  param_get8ex(line, paramnum, 255, 10);
-       printf("read %i", (int8_t ) val);
+       printf("read %i\n", (int8_t ) val);
        if( (int8_t) val == -1) return 1;
        (*destination) = val;
        return 0;