X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8d0a3e87d7d2350f4a05698a42f57625e460e5d6..18b90cce48df64bf528fe358308383bf8b5fba15:/client/graph.c diff --git a/client/graph.c b/client/graph.c index d0f6fe74..c22b7a3d 100644 --- a/client/graph.c +++ b/client/graph.c @@ -17,39 +17,56 @@ int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphTraceLen; - -/* write a bit to the graph */ +/* write a manchester bit to the graph */ void AppendGraph(int redraw, int clock, int bit) { int i; - int half = (int)(clock/2); - int firstbit = bit ^ 1; - - for (i = 0; i < half; ++i) - GraphBuffer[GraphTraceLen++] = firstbit; - - for (i = 0; i <= half; ++i) - GraphBuffer[GraphTraceLen++] = bit; + //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(); } -/* clear out our graph window */ +// clear out our graph window int ClearGraph(int redraw) { 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) +{ + static int SavedGB[MAX_GRAPH_TRACE_LEN]; + static int SavedGBlen; + static bool GB_Saved = false; -void SetGraphBuf(uint8_t *buff, int size) + if (saveOpt==1) { //save + memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer)); + SavedGBlen = GraphTraceLen; + GB_Saved=true; + } else if (GB_Saved){ //restore + memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer)); + GraphTraceLen = SavedGBlen; + RepaintGraphWindow(); + } + return; +} + +// DETECT CLOCK NOW IN LFDEMOD.C + +void setGraphBuf(uint8_t *buff, size_t size) { if ( buff == NULL ) return; @@ -58,58 +75,23 @@ void SetGraphBuf(uint8_t *buff, int size) size = MAX_GRAPH_TRACE_LEN; ClearGraph(0); for (; i < size; ++i){ - GraphBuffer[i] = buff[i]; + GraphBuffer[i]=buff[i]-128; } - GraphTraceLen = size; + GraphTraceLen=size; RepaintGraphWindow(); return; } - -// Copies grahpbuff to buff. -// while triming values to the range -127 -- 127. -int GetFromGraphBuf(uint8_t *buff) +size_t getFromGraphBuf(uint8_t *buff) { - if ( buff == NULL ) return -1; - uint32_t i = 0; - - for (; i < GraphTraceLen; ++i){ - - // trim upper and lower values. - if (GraphBuffer[i] > 127) - GraphBuffer[i] = 127; - else if (GraphBuffer[i] < -127) - GraphBuffer[i] = -127; - - buff[i] = (uint8_t)(GraphBuffer[i] + 128); + 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); } return i; } -/* Get or auto-detect clock rate */ -int GetClock(const char *str, int verbose) -{ - int clock; - - sscanf(str, "%i", &clock); - if (!strcmp(str, "")) - clock = 0; - - /* Auto-detect clock */ - if (!clock) { - - uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0x00}; - int size = GetFromGraphBuf(grph); - if ( size < 0 ) { - PrintAndLog("Failed to copy from graphbuffer"); - return -1; - } - clock = DetectASKClock(grph, size, 0); - - /* Only print this message if we're not looping something */ - if (verbose) - PrintAndLog("Auto-detected clock rate: %d", clock); - } - return clock; -} // A simple test to see if there is any data inside Graphbuffer. bool HasGraphData(){ @@ -141,4 +123,148 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz) { *high = (int)(*high * .88); *low = (int)(*low * .88); } -} \ No newline at end of file +} + +// Get or auto-detect ask clock rate +int GetAskClock(const char str[], bool printAns, bool verbose) +{ + int clock; + sscanf(str, "%i", &clock); + if (!strcmp(str, "")) + clock = 0; + + if (clock != 0) + return clock; + // Auto-detect clock + 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; + } + 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, Best Starting Position: %d", 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}; + 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); + // Only print this message if we're not looping something + if (printAns){ + PrintAndLog("Auto-detected PSK carrier rate: %d", carrier); + } + return carrier; +} + +int GetPskClock(const char str[], bool printAns, bool verbose) +{ + int clock; + sscanf(str, "%i", &clock); + if (!strcmp(str, "")) + clock = 0; + + if (clock!=0) + return clock; + // Auto-detect clock + 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 = DetectPSKClock(grph,size,0); + // Only print this message if we're not looping something + if (printAns){ + PrintAndLog("Auto-detected clock rate: %d", clock); + } + return clock; +} + +uint8_t GetNrzClock(const char str[], bool printAns, bool verbose) +{ + int clock; + sscanf(str, "%i", &clock); + if (!strcmp(str, "")) + clock = 0; + + if (clock!=0) + return clock; + // Auto-detect clock + 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); + // Only print this message if we're not looping something + if (printAns){ + PrintAndLog("Auto-detected clock rate: %d", clock); + } + return clock; +} +//by marshmellow +//attempt to detect the field clock and bit clock for FSK +uint8_t GetFskClock(const char str[], bool printAns, bool verbose) +{ + int clock; + sscanf(str, "%i", &clock); + if (!strcmp(str, "")) + clock = 0; + if (clock != 0) return (uint8_t)clock; + + + uint8_t fc1=0, fc2=0, rf1=0; + uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose); + if (ans == 0) return 0; + if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){ + if (printAns) PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1); + return rf1; + } + if (verbose){ + PrintAndLog("DEBUG: unknown fsk field clock detected"); + PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1); + } + return 0; +} +uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) +{ + uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + size_t size = getFromGraphBuf(BitStream); + if (size==0) return 0; + uint16_t ans = countFC(BitStream, size, 1); + if (ans==0) { + if (verbose) 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"); + return 0; + } + return 1; +}