From bf85d22f963d607b8d5eb019af3056df628f0048 Mon Sep 17 00:00:00 2001 From: marshmellow42 Date: Tue, 4 Apr 2017 17:22:21 -0400 Subject: [PATCH] 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. --- armsrc/lfops.c | 6 ++++-- client/cmdlft55xx.c | 2 +- client/graph.c | 2 +- common/lfdemod.c | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/armsrc/lfops.c b/armsrc/lfops.c index 35cf90ca..9c6c9ed8 100644 --- 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 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); @@ -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 - 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 diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 72345c9d..123c2064 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -570,7 +570,7 @@ bool tryDetectModulation(){ } } clk = GetNrzClock("", false, false); - if (clk>0) { + if (clk>8) { //clock of rf/8 is likely a false positive, so don't use it. if ( NRZrawDemod("0 0 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) { tests[hits].modulation = DEMOD_NRZ; tests[hits].bitrate = bitRate; diff --git a/client/graph.c b/client/graph.c index c0982067..12f5ff71 100644 --- 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 - if (printAns) { + if (printAns || g_debugMode) { 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 49838f5e..6beef130 100644 --- 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; - 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; @@ -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) { + 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 -- 2.39.5