chg: step two for t55xx commnads

diff --git a/armsrc/epa.c b/armsrc/epa.c
index 86f7c864d904d4dde9fe0d39e4a43ff449cce782..9012bf11a8cb9713e0d5804eee142e86448fbb95 100644 (file)
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -430,8 +430,6 @@ int EPA_Setup()
        // power up the field
        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
        
        // power up the field
        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
        

-       iso14a_set_timeout(10500);
-       

        // select the card
        return_code = iso14443a_select_card(uid, &card_select_info, NULL);
        if (return_code != 1) {
        // select the card
        return_code = iso14443a_select_card(uid, &card_select_info, NULL);
        if (return_code != 1) {

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b060bdee83b94aaa829b06b43a31ccff51b1d3e1..a48945ab707f8446c22580ea1551325c54877bf6 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -76,29 +76,11 @@ int usage_t55xx_dump(){
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 static int CmdHelp(const char *Cmd);\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
-\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
-\r
-*/\r
-\r

 int CmdReadBlk(const char *Cmd)\r
 {\r
 int CmdReadBlk(const char *Cmd)\r
 {\r

-       int invert = 0;\r
-       int clk = 0;\r

        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r

-       int errCnt;\r

        size_t bitlen;\r
        size_t bitlen;\r

-       int maxErr = 100;\r
-    //uint8_t askAmp = 0;\r

        uint32_t blockData;\r
        uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
        \r
        uint32_t blockData;\r
        uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
        \r


@@ -139,32 +121,22 @@ int CmdReadBlk(const char *Cmd)
        CmdSamples("12000");\r
 \r
        bitlen = getFromGraphBuf(bits);\r
        CmdSamples("12000");\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
 \r

+       if ( !tryDemod(bits, bitlen) )\r
+               return 3;\r
+       \r

        //move bits back to DemodBuffer\r
        setDemodBuf(bits, bitlen, 0);\r
        //move bits back to DemodBuffer\r
        setDemodBuf(bits, bitlen, 0);\r

-       printBitStream(bits,bitlen);\r
+       printBitStream(bits, bitlen);\r

        \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
+       // // 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
 \r
        blockData = PackBits(1, 32, bits);\r
 \r


@@ -176,6 +148,69 @@ int CmdReadBlk(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\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
+\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
+\r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
+*/\r
+bool tryDemod(uint8_t bits[], size_t bitlen) {\r
+       \r
+       int invert = 0;\r
+       int clk = 0;\r
+       int errCnt, size;\r
+       int maxErr = 100;\r
+       uint8_t rflen, fchigh, fclow, dummy = 0;\r
+       uint16_t fcs=0;\r
+\r
+       // ASK - manchester demod\r
+       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
+       if ( analyseDemod(errCnt, bitlen, clk, invert) ) \r
+               return true;\r
+\r
+       // FSK demod\r
+       fcs = countFC(bits, bitlen, &dummy);\r
+       if (fcs == 0){\r
+         fchigh = 10;\r
+         fclow = 8;\r
+       }else{\r
+         fchigh = (fcs >> 8) & 0xFF;\r
+         fclow = fcs & 0xFF;\r
+       }\r
+       //get bit clock length\r
+       rflen = detectFSKClk(bits, bitlen, fchigh, fclow);\r
+       rflen = (rflen == 0) ? 50 : rflen;\r
+\r
+       size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow);\r
+       if ( analyseDemod(size, bitlen, clk, invert) ) \r
+               return true;    \r
+       \r
+       // PSK demod\r
+       return false;\r
+}\r
+\r
+bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){\r
+       if (g_debugMode) \r
+               PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert);\r
+         //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);\r
+         \r
+       //throw away static - allow 1 and -1 (in case of threshold command first)\r
+       if ( errCnt == -1 || bitlen < 32 ){  \r
+               PrintAndLog("no success demod");\r
+               return false;\r
+       }\r
+       return true;\r
+}\r
+\r

 int CmdWriteBlk(const char *Cmd)\r
 {\r
        int block = 8; //default to invalid block\r
 int CmdWriteBlk(const char *Cmd)\r
 {\r
        int block = 8; //default to invalid block\r

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 8c0cdf58b8e87e534ea683b0ef37e6c099f18886..cbd6312a71ace8112f8d948160baf7e33967bfe4 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -13,9 +13,7 @@
 int CmdLFT55XX(const char *Cmd);\r
 \r
 int CmdReadBlk(const char *Cmd);\r
 int CmdLFT55XX(const char *Cmd);\r
 \r
 int CmdReadBlk(const char *Cmd);\r

-int CmdReadBlkPWD(const char *Cmd);\r

 int CmdWriteBlk(const char *Cmd);\r
 int CmdWriteBlk(const char *Cmd);\r

-int CmdWriteBLkPWD(const char *Cmd);\r

 int CmdReadTrace(const char *Cmd);\r
 int CmdInfo(const char *Cmd);\r
 int CmdIceFsk(const char *Cmd);\r
 int CmdReadTrace(const char *Cmd);\r
 int CmdInfo(const char *Cmd);\r
 int CmdIceFsk(const char *Cmd);\r


@@ -25,4 +23,6 @@ char * GetBitRateStr(uint32_t id);
 char * GetSaferStr(uint32_t id);\r
 char * GetModulationStr( uint32_t id);\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);\r
 char * GetSaferStr(uint32_t id);\r
 char * GetModulationStr( uint32_t id);\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);\r

+bool tryDemod(uint8_t bits[], uint32_t bitlen);\r
+bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert);\r

 #endif\r
 #endif\r