From 9833360b251571f82749c352f49d712c9c8322ad Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 3 Mar 2017 11:36:07 +0100 Subject: [PATCH] chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex. --- client/graph.c | 30 +++++++++--------- common/lfdemod.c | 81 ++++++++++++++++++++++++++++++------------------ common/lfdemod.h | 6 +++- 3 files changed, 72 insertions(+), 45 deletions(-) diff --git a/client/graph.c b/client/graph.c index 91fecff8..ab6ee7cb 100644 --- a/client/graph.c +++ b/client/graph.c @@ -62,7 +62,6 @@ void save_restoreGB(uint8_t saveOpt) } // DETECT CLOCK NOW IN LFDEMOD.C - void setGraphBuf(uint8_t *buff, size_t size) { if ( buff == NULL ) return; @@ -123,11 +122,6 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz) { } } -void SetGraphClock( int clock, int startidx){ - PlotClock = clock; - PlockClockStartIndex = startidx; -} - // Get or auto-detect ask clock rate int GetAskClock(const char str[], bool printAns, bool verbose) { @@ -151,7 +145,6 @@ int GetAskClock(const char str[], bool printAns, bool verbose) if (st == false) start = DetectASKClock(grph, size, &clock, 20); - // Only print this message if we're not looping something if (printAns) PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); SetGraphClock(clock, start); @@ -191,9 +184,13 @@ int GetPskClock(const char str[], bool printAns, bool verbose) if (verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - clock = DetectPSKClock(grph, size, 0); - // Only print this message if we're not looping something - if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock); + int start = 0; + clock = DetectPSKClock_ext(grph, size, 0, &start); + + if (printAns) + PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); + + SetGraphClock(clock, start); return clock; } @@ -214,11 +211,13 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - clock = DetectNRZClock(grph, size, 0); + int start = 0; + clock = DetectNRZClock_ext(grph, size, 0, &start); // Only print this message if we're not looping something if (printAns) - PrintAndLog("Auto-detected clock rate: %d", clock); + PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); + SetGraphClock(clock, start); return clock; } //by marshmellow @@ -258,11 +257,15 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) *fc1 = (ans >> 8) & 0xFF; *fc2 = ans & 0xFF; - *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); + int start = 0; + *rf1 = detectFSKClk_ext(BitStream, size, *fc1, *fc2, &start); if (*rf1 == 0) { if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error"); return 0; } + + PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d | Best Starting Position: %d", *fc1, *fc2, *rf1, start); + SetGraphClock(*rf1, start); return 1; } @@ -271,7 +274,6 @@ bool graphJustNoise(int *BitStream, int size) { //might not be high enough for noisy environments #define THRESHOLD 15; - bool isNoise = TRUE; for(int i=0; i < size && isNoise; i++){ isNoise = BitStream[i] < THRESHOLD; diff --git a/common/lfdemod.c b/common/lfdemod.c index fddc624a..e9b31fab 100644 --- a/common/lfdemod.c +++ b/common/lfdemod.c @@ -11,23 +11,30 @@ //un_comment to allow debug print calls when used not on device void dummy(char *fmt, ...){} - +void dummy_sgc (int clock, int startidx) {} #ifndef ON_DEVICE # include "ui.h" # include "cmdparser.h" # include "cmddata.h" # define prnt PrintAndLog +# define sgc SetGraphClock #else - uint8_t g_debugMode=0; + uint8_t g_debugMode=0; # define prnt dummy +# define sgc dummy #endif +void SetGraphClock( int clock, int startidx){ + PlotClock = clock; + PlockClockStartIndex = startidx; +} + //test samples are not just noise uint8_t justNoise(uint8_t *bits, size_t size) { #define THRESHOLD 123 uint8_t val = 1; - for(size_t idx=0; idx < size && val ;idx++) + for(size_t idx = 0; idx < size && val; idx++) val = bits[idx] < THRESHOLD; return val; } @@ -318,12 +325,13 @@ int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr { if (*size==0) return -1; int start = DetectASKClock(BinStream, *size, clk, maxErr); //clock default - if (*clk==0 || start < 0) return -3; if (*invert != 1) *invert = 0; if (amp==1) askAmp(BinStream, *size); if (g_debugMode==2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp); + sgc(*clk, start); + uint8_t initLoopMax = 255; if (initLoopMax > *size) initLoopMax = *size; // Detect high and lows @@ -906,13 +914,14 @@ uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, uint8_t high, uint8_t lo // by marshmellow // to help detect clocks on heavily clipped samples // based on count of low to low -int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low) +int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low, int *clock) { - uint8_t fndClk[] = {8,16,32,40,50,64,128}; + uint8_t clocks[] = {8,16,32,40,50,64,128}; size_t startwave; size_t i = 100; size_t minClk = 255; - // get to first full low to prime loop and skip incomplete first pulse + int shortestWaveIdx = 0; + // get to first full low to prime loop and skip incomplete first pulse while ((dest[i] < high) && (i < size)) ++i; while ((dest[i] > low) && (i < size)) @@ -929,14 +938,17 @@ int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low) while ((dest[i] > low) && (i < size)) ++i; //get minimum measured distance - if (i-startwave < minClk && i < size) + if (i-startwave < minClk && i < size) { minClk = i - startwave; + shortestWaveIdx = startwave; + } } // set clock if (g_debugMode==2) prnt("DEBUG ASK: detectstrongASKclk smallest wave: %d",minClk); for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) { - if (minClk >= fndClk[clkCnt]-(fndClk[clkCnt]/8) && minClk <= fndClk[clkCnt]+1) - return fndClk[clkCnt]; + if (minClk >= clocks[clkCnt]-(clocks[clkCnt]/8) && minClk <= clocks[clkCnt]+1) + *clock = clocks[clkCnt]; + return shortestWaveIdx; } return 0; } @@ -966,15 +978,10 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr) //test for large clean peaks if (!clockFnd){ if (DetectCleanAskWave(dest, size, peak, low)==1){ - int ans = DetectStrongAskClock(dest, size, peak, low); - if (g_debugMode==2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %d",ans); - for (i=clkEnd-1; i>0; i--){ - if (clk[i] == ans) { - *clock = ans; - //clockFnd = i; - return 0; // for strong waves i don't use the 'best start position' yet... - //break; //clock found but continue to find best startpos [not yet] - } + int ans = DetectStrongAskClock(dest, size, peak, low, clock); + if (g_debugMode==2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", clock ,ans); + if (ans > 0){ + return ans; // return shortest wave start pos } } } @@ -1052,11 +1059,15 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr) return bestStart[best]; } +int DetectPSKClock(uint8_t dest[], size_t size, int clock) { + int firstPhaseShift = 0; + return DetectPSKClock_ext(dest, size, clock, &firstPhaseShift); +} + //by marshmellow //detect psk clock by reading each phase shift // a phase shift is determined by measuring the sample length of each wave -int DetectPSKClock(uint8_t dest[], size_t size, int clock) -{ +int DetectPSKClock_ext(uint8_t dest[], size_t size, int clock, int *firstPhaseShift) { uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock uint16_t loopCnt = 4096; //don't need to loop through entire array... @@ -1064,11 +1075,10 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock) size_t i=1; for (; i < 8; ++i) if (clk[i] == clock) return clock; - + if (size < 160+20) return 0; - // size must be larger than 20 here, and 160 later on. - if (size < loopCnt) loopCnt = size-20; + if (size < loopCnt) loopCnt = size-20; size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0; uint8_t clkCnt, fc=0, fullWaveLen=0, tol=1; @@ -1098,6 +1108,7 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock) } } } + *firstPhaseShift = firstFullWave; if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen); //test each valid clock from greatest to smallest to see which lines up @@ -1180,11 +1191,14 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low){ return lowestTransition; } +int DetectNRZClock(uint8_t dest[], size_t size, int clock) { + int bestStart = 0; + return DetectNRZClock_ext(dest, size, clock, &bestStart); +} + //by marshmellow //detect nrz clock by reading #peaks vs no peaks(or errors) -//iceman: shouldn't param clock be reference? like DetectASKClock -int DetectNRZClock(uint8_t dest[], size_t size, int clock) -{ +int DetectNRZClock_ext(uint8_t dest[], size_t size, int clock, int *clockStartIdx) { size_t i = 0; uint8_t clk[] = {8,16,32,40,50,64,100,128,255}; size_t loopCnt = 4096; //don't need to loop through entire array... @@ -1234,6 +1248,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock) uint8_t ignoreWindow = 4; bool lastPeakHigh = 0; int lastBit = 0; + int bestStart[] = {0,0,0,0,0,0,0,0,0}; peakcnt = 0; //test each valid clock from smallest to greatest to see which lines up for(clkCnt=0; clkCnt < 8; ++clkCnt){ @@ -1281,6 +1296,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock) } } if (peakcnt > peaksdet[clkCnt]) { + bestStart[clkCnt]=ii; peaksdet[clkCnt] = peakcnt; } } @@ -1298,7 +1314,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock) } if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, maxPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], maxPeak, clk[best], lowestTransition); } - + *clockStartIdx = bestStart[best]; return clk[best]; } @@ -1387,10 +1403,14 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert){ return 0; } +uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow) { + int firstClockEdge = 0; + return detectFSKClk_ext(BitStream, size, fcHigh, fcLow, &firstClockEdge); +} + //by marshmellow //detects the bit clock for FSK given the high and low Field Clocks -uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow) -{ +uint8_t detectFSKClk_ext(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) { uint8_t clk[] = {8,16,32,40,50,64,100,128,0}; uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; @@ -1446,6 +1466,7 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc rfLens[rfLensFnd++] = rfCounter; } } else { + *firstClockEdge = i; firstBitFnd++; } rfCounter=0; diff --git a/common/lfdemod.h b/common/lfdemod.h index 16d10d4d..8737ad79 100644 --- a/common/lfdemod.h +++ b/common/lfdemod.h @@ -19,6 +19,7 @@ #include // for //generic +void SetGraphClock( int clock, int startidx); uint8_t justNoise(uint8_t *bits, size_t size); size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType); int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType); @@ -30,9 +31,12 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj); int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr); uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, uint8_t high, uint8_t low); uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow); +uint8_t detectFSKClk_ext(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge); int DetectNRZClock(uint8_t dest[], size_t size, int clock); +int DetectNRZClock_ext(uint8_t dest[], size_t size, int clock, int *clockStartIdx); int DetectPSKClock(uint8_t dest[], size_t size, int clock); -int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low); +int DetectPSKClock_ext(uint8_t dest[], size_t size, int clock, int *firstPhaseShift); +int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low, int *clock); bool DetectST(uint8_t buffer[], size_t *size, int *foundclock); bool DetectST_ext(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststart, size_t *stend); int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow); -- 2.39.2