X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/49bbc60af37da26b73c71f4ff774841fc2290b72..2839f12e8623cb48adf4d9af70212960caefc60d:/client/graph.c?ds=sidebyside diff --git a/client/graph.c b/client/graph.c index 3bea7881..17aa3ae4 100644 --- a/client/graph.c +++ b/client/graph.c @@ -143,10 +143,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - DetectASKClock(grph, size, &clock, 20); + bool st = DetectST(grph, &size, &clock); + int start = 0; + 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", clock); + PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); } return clock; } @@ -264,3 +268,16 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) } return 1; } + +// test samples are not just noise +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; + } + return isNoise; +}