X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6f36848f9ecb5f6a1131a9bf4def5b3e2e05a415..refs/pull/347/head:/client/graph.c diff --git a/client/graph.c b/client/graph.c index 995a32da..3ea47d2d 100644 --- a/client/graph.c +++ b/client/graph.c @@ -18,6 +18,9 @@ int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphTraceLen; + +int s_Buff[MAX_GRAPH_TRACE_LEN]; + /* write a manchester bit to the graph */ void AppendGraph(int redraw, int clock, int bit) { @@ -50,16 +53,19 @@ int ClearGraph(int redraw) void save_restoreGB(uint8_t saveOpt) { static int SavedGB[MAX_GRAPH_TRACE_LEN]; - static int SavedGBlen; + static int SavedGBlen=0; static bool GB_Saved = false; + static int SavedGridOffsetAdj=0; - if (saveOpt==1) { //save + if (saveOpt == GRAPH_SAVE) { //save memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer)); SavedGBlen = GraphTraceLen; GB_Saved=true; - } else if (GB_Saved){ //restore + SavedGridOffsetAdj = GridOffset; + } else if (GB_Saved) { //restore memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer)); GraphTraceLen = SavedGBlen; + GridOffset = SavedGridOffsetAdj; RepaintGraphWindow(); } return; @@ -144,13 +150,16 @@ int GetAskClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - bool st = DetectST(grph, &size, &clock); - int start = 0; + //, size_t *ststart, size_t *stend + size_t ststart = 0, stend = 0; + bool st = DetectST(grph, &size, &clock, &ststart, &stend); + int start = stend; if (st == false) { start = DetectASKClock(grph, size, &clock, 20); } + setClockGrid(clock, start); // Only print this message if we're not looping something - if (printAns) { + if (printAns || g_debugMode) { PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); } return clock; @@ -166,11 +175,12 @@ uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return 0; } - //uint8_t countPSK_FC(uint8_t *BitStream, size_t size) - - carrier = countFC(grph,size,0); + uint16_t fc = countFC(grph,size,0); + carrier = fc & 0xFF; + if (carrier != 2 && carrier != 4 && carrier != 8) return 0; + if ((fc>>8) == 10 && carrier == 8) return 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; @@ -193,7 +203,10 @@ int GetPskClock(const char str[], bool printAns, bool verbose) PrintAndLog("Failed to copy from graphbuffer"); return -1; } - clock = DetectPSKClock(grph,size,0); + size_t firstPhaseShiftLoc = 0; + uint8_t curPhase = 0, fc = 0; + clock = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc); + setClockGrid(clock, firstPhaseShiftLoc); // Only print this message if we're not looping something if (printAns){ PrintAndLog("Auto-detected clock rate: %d", clock); @@ -220,6 +233,7 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose) } size_t clkStartIdx = 0; clock = DetectNRZClock(grph, size, 0, &clkStartIdx); + setClockGrid(clock, clkStartIdx); // Only print this message if we're not looping something if (printAns){ PrintAndLog("Auto-detected clock rate: %d", clock); @@ -238,10 +252,12 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose) uint8_t fc1=0, fc2=0, rf1=0; - uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose); + int firstClockEdge = 0; + uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose, &firstClockEdge); 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); + setClockGrid(rf1, firstClockEdge); return rf1; } if (verbose){ @@ -250,7 +266,7 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose) } return 0; } -uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) +uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose, int *firstClockEdge) { uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; size_t size = getFromGraphBuf(BitStream); @@ -262,8 +278,8 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) } *fc1 = (ans >> 8) & 0xFF; *fc2 = ans & 0xFF; - - *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); + //int firstClockEdge = 0; + *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2, firstClockEdge); if (*rf1==0) { if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error"); return 0;