fix bug in st detect +

adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 35cf90cad25abd63f8bc60015beb6ef058733e75..9c6c9ed8d85b7339a3be90833368760d10da598e 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1222,7 +1222,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
        bool PwdMode = arg0 & 0x1;
        uint8_t Page = (arg0 & 0x2) >> 1;
        uint32_t i = 0;
        bool PwdMode = arg0 & 0x1;
        uint8_t Page = (arg0 & 0x2) >> 1;
        uint32_t i = 0;

-       bool RegReadMode = (Block == 0xFF);
+       bool RegReadMode = (Block == 0xFF);//regular read mode

 
        //clear buffer now so it does not interfere with timing later
        BigBuf_Clear_ext(false);
 
        //clear buffer now so it does not interfere with timing later
        BigBuf_Clear_ext(false);


@@ -1257,7 +1257,9 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
                        T55xxWriteBit(Block & i);               
 
        // Turn field on to read the response
                        T55xxWriteBit(Block & i);               
 
        // Turn field on to read the response

-       TurnReadLFOn(135*8);
+       // 137*8 seems to get to the start of data pretty well... 
+       //  but we want to go past the start and let the repeating data settle in...
+       TurnReadLFOn(210*8); 

 
        // Acquisition
        // Now do the acquisition
 
        // Acquisition
        // Now do the acquisition

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 72345c9d2a75d708aa2ccd829050d00543795b93..123c20647193d5791d9af8490e79e12c195d0156 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -570,7 +570,7 @@ bool tryDetectModulation(){
                        }\r
                }\r
                clk = GetNrzClock("", false, false);\r
                        }\r
                }\r
                clk = GetNrzClock("", false, false);\r

-               if (clk>0) {\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
                        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

diff --git a/client/graph.c b/client/graph.c
index c09820674d4d01cf665df940a4c799f2a5292da0..12f5ff7119051c0aa1a48c8fb977839c66f0de76 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -150,7 +150,7 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                start = DetectASKClock(grph, size, &clock, 20);
        }
        // Only print this message if we're not looping something
                start = DetectASKClock(grph, size, &clock, 20);
        }
        // Only print this message if we're not looping something

-       if (printAns) {
+       if (printAns || g_debugMode) {

                PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;
                PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 49838f5e2be22e694015a181a0e36438c74b4561..6beef130bfd8afcda1396a018f08c0a8fd41a7e4 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -548,7 +548,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock, size_t *clockStartIdx
 
        //get high and low peak
        int peak, low;
 
        //get high and low peak
        int peak, low;

-       if (getHiLo(dest, loopCnt, &peak, &low, 85, 85) < 1) return 0;
+       if (getHiLo(dest, loopCnt, &peak, &low, 90, 90) < 1) return 0;

 
        int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low);
        size_t ii;
 
        int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low);
        size_t ii;


@@ -958,6 +958,8 @@ uint8_t     detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
 bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
 bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {

+       if (buffSize < *i+4) return false;
+

        for (; *i < buffSize - 4; *i+=1) {
                *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
                if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior
        for (; *i < buffSize - 4; *i+=1) {
                *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
                if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior