X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e629181f5a91a933bb96feaa1189481c81fa55ac..14d6c4fc3463771fca026f23904eba2858c2d422:/client/graph.c?ds=inline diff --git a/client/graph.c b/client/graph.c index 94d6054f..76210562 100644 --- a/client/graph.c +++ b/client/graph.c @@ -17,89 +17,77 @@ 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; - - for (i = 0; i < (int)(clock / 2); ++i) - GraphBuffer[GraphTraceLen++] = bit ^ 1; - - for (i = (int)(clock / 2); i < clock; ++i) - GraphBuffer[GraphTraceLen++] = 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; - 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(); + 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; - return gtl; + 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; - 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; - RepaintGraphWindow(); - return; -} -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); - } - return i; + for (uint16_t i = 0; i < size; ++i) + GraphBuffer[i] = buff[i] - 128; + + GraphTraceLen = size; + RepaintGraphWindow(); + return; } -// Get or auto-detect clock rate -int GetClock(const char *str, int peak, int verbose) +size_t getFromGraphBuf(uint8_t *buff) { - int clock; - sscanf(str, "%i", &clock); - if (!strcmp(str, "")) - clock = 0; - - // Auto-detect clock - if (!clock) - { - uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; - size_t 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); - } + if (buff == NULL ) return 0; + uint32_t i; + 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 clock; + return i; } // A simple test to see if there is any data inside Graphbuffer. @@ -134,27 +122,161 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz) { } } -int GetNRZpskClock(const char *str, int peak, int verbose) +// 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); + + 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}; + size_t size = getFromGraphBuf(grph); + if ( size == 0 ) { + if (verbose) + PrintAndLog("Failed to copy from graphbuffer"); + return 0; + } + 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; + } + 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; +} + +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 - if (!clock) - { - uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; - size_t size = getFromGraphBuf(grph); - if ( size == 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 = DetectpskNRZClock(grph,size,0); - // Only print this message if we're not looping something - if (!verbose){ - PrintAndLog("Auto-detected clock rate: %d", clock); - } + return -1; } + 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, Best Starting Position: %d", clock, start); + + SetGraphClock(clock, start); return clock; -} \ No newline at end of file +} +//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 || g_debugMode) PrintAndLog("DEBUG: No data found"); + return 0; + } + *fc1 = (ans >> 8) & 0xFF; + *fc2 = ans & 0xFF; + + 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; +}