X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cb8220ee769ac07bdf7656161a3961cf6515223a..966c111e8c8e45e624465502d0ee405ebda9a39c:/client/graph.c diff --git a/client/graph.c b/client/graph.c index 06279848..76210562 100644 --- a/client/graph.c +++ b/client/graph.c @@ -20,30 +20,27 @@ int GraphTraceLen; /* write a manchester bit to the graph */ void AppendGraph(int redraw, int clock, int bit) { - int i; - //set first half the clock bit (all 1's or 0's for a 0 or 1 bit) - for (i = 0; i < (int)(clock / 2); ++i) - GraphBuffer[GraphTraceLen++] = bit ; - //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit) - for (i = (int)(clock / 2); i < clock; ++i) - GraphBuffer[GraphTraceLen++] = bit ^ 1; + int i; + //set first half the clock bit (all 1's or 0's for a 0 or 1 bit) + for (i = 0; i < (int)(clock / 2); ++i) + GraphBuffer[GraphTraceLen++] = bit ; + //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit) + for (i = (int)(clock / 2); i < clock; ++i) + GraphBuffer[GraphTraceLen++] = bit ^ 1; - if (redraw) - RepaintGraphWindow(); + if (redraw) + RepaintGraphWindow(); } // clear out our graph window int ClearGraph(int redraw) { - int gtl = GraphTraceLen; - memset(GraphBuffer, 0x00, GraphTraceLen); - - GraphTraceLen = 0; - - if (redraw) - RepaintGraphWindow(); - - return gtl; + int gtl = GraphTraceLen; + memset(GraphBuffer, 0x00, GraphTraceLen); + GraphTraceLen = 0; + if (redraw) + RepaintGraphWindow(); + return gtl; } // option '1' to save GraphBuffer any other to restore void save_restoreGB(uint8_t saveOpt) @@ -65,19 +62,19 @@ void save_restoreGB(uint8_t saveOpt) } // DETECT CLOCK NOW IN LFDEMOD.C - void setGraphBuf(uint8_t *buff, size_t size) { if ( buff == NULL ) return; - uint16_t i = 0; + ClearGraph(0); + if ( size > MAX_GRAPH_TRACE_LEN ) size = MAX_GRAPH_TRACE_LEN; - ClearGraph(0); - for (; i < size; ++i){ - GraphBuffer[i]=buff[i]-128; - } - GraphTraceLen=size; + + for (uint16_t i = 0; i < size; ++i) + GraphBuffer[i] = buff[i] - 128; + + GraphTraceLen = size; RepaintGraphWindow(); return; } @@ -85,10 +82,10 @@ size_t getFromGraphBuf(uint8_t *buff) { if (buff == NULL ) return 0; uint32_t i; - for (i=0;i127) GraphBuffer[i]=127; //trim - if (GraphBuffer[i]<-127) GraphBuffer[i]=-127; //trim - buff[i]=(uint8_t)(GraphBuffer[i]+128); + for (i=0; i < GraphTraceLen; ++i){ + if (GraphBuffer[i] > 127) GraphBuffer[i] = 127; //trim + if (GraphBuffer[i] < -127) GraphBuffer[i] = -127; //trim + buff[i] = (uint8_t)(GraphBuffer[i]+128); } return i; } @@ -133,8 +130,8 @@ int GetAskClock(const char str[], bool printAns, bool verbose) if (!strcmp(str, "")) clock = 0; - if (clock != 0) - return clock; + if (clock != 0) return clock; + // Auto-detect clock uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; size_t size = getFromGraphBuf(grph); @@ -143,31 +140,32 @@ int GetAskClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - int start = DetectASKClock(grph, size, &clock, 20); - // Only print this message if we're not looping something - if (printAns){ + bool st = DetectST(grph, &size, &clock); + int start = 0; + if (st == false) + start = DetectASKClock(grph, size, &clock, 20); + + if (printAns) PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); - } + SetGraphClock(clock, start); return clock; } uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose) { - uint8_t carrier=0; - uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t carrier = 0; + uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0}; size_t size = getFromGraphBuf(grph); if ( size == 0 ) { if (verbose) PrintAndLog("Failed to copy from graphbuffer"); return 0; } - //uint8_t countPSK_FC(uint8_t *BitStream, size_t size) - - carrier = countFC(grph,size,0); + carrier = countFC(grph, size, 0); // Only print this message if we're not looping something - if (printAns){ + if (printAns) PrintAndLog("Auto-detected PSK carrier rate: %d", carrier); - } + return carrier; } @@ -178,21 +176,21 @@ int GetPskClock(const char str[], bool printAns, bool verbose) if (!strcmp(str, "")) clock = 0; - if (clock!=0) - return clock; + if (clock != 0) return clock; // Auto-detect clock - uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0}; size_t size = getFromGraphBuf(grph); if ( size == 0 ) { - if (verbose) - PrintAndLog("Failed to copy from graphbuffer"); + 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; } @@ -203,21 +201,23 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose) if (!strcmp(str, "")) clock = 0; - if (clock!=0) + if (clock != 0) return clock; // Auto-detect clock - uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0}; size_t size = getFromGraphBuf(grph); if ( size == 0 ) { if (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); - } + if (printAns) + PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); + + SetGraphClock(clock, start); return clock; } //by marshmellow @@ -246,21 +246,37 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose) } uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) { - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0}; size_t size = getFromGraphBuf(BitStream); - if (size==0) return 0; + if (size == 0) return 0; uint16_t ans = countFC(BitStream, size, 1); - if (ans==0) { - if (verbose) PrintAndLog("DEBUG: No data found"); + if (ans == 0) { + if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found"); return 0; } *fc1 = (ans >> 8) & 0xFF; *fc2 = ans & 0xFF; - *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); - if (*rf1==0) { - if (verbose) PrintAndLog("DEBUG: Clock detect error"); + 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; } + if (verbose || g_debugMode) + 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; } + +// 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; +}