X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d889dacc9d6a45b41deca907042d97221a06e9a5..c3caf0409cbc89f3cdda533c0860bfc813f8817b:/client/graph.c diff --git a/client/graph.c b/client/graph.c index 319cde39..995a32da 100644 --- a/client/graph.c +++ b/client/graph.c @@ -14,6 +14,7 @@ #include "ui.h" #include "graph.h" #include "lfdemod.h" +#include "cmddata.h" //for g_debugmode int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphTraceLen; @@ -217,7 +218,8 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - clock = DetectNRZClock(grph, size, 0); + size_t clkStartIdx = 0; + clock = DetectNRZClock(grph, size, 0, &clkStartIdx); // Only print this message if we're not looping something if (printAns){ PrintAndLog("Auto-detected clock rate: %d", clock); @@ -255,7 +257,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) if (size==0) return 0; uint16_t ans = countFC(BitStream, size, 1); if (ans==0) { - if (verbose) PrintAndLog("DEBUG: No data found"); + if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found"); return 0; } *fc1 = (ans >> 8) & 0xFF; @@ -263,8 +265,18 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); if (*rf1==0) { - if (verbose) PrintAndLog("DEBUG: Clock detect error"); + if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error"); return 0; } return 1; } +bool graphJustNoise(int *BitStream, int size) +{ + static const uint8_t THRESHOLD = 15; //might not be high enough for noisy environments + //test samples are not just noise + bool justNoise1 = 1; + for(int idx=0; idx < size && justNoise1 ;idx++){ + justNoise1 = BitStream[idx] < THRESHOLD; + } + return justNoise1; +}