X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7fe9b0b742d7dae9c5af1d292d11840b5c3cbfae..b37235637f040dc1186c4a0a1bbf36e4c3788df7:/client/graph.c diff --git a/client/graph.c b/client/graph.c index 4a966676..95050f55 100644 --- a/client/graph.c +++ b/client/graph.c @@ -1,7 +1,19 @@ +//----------------------------------------------------------------------------- +// Copyright (C) 2010 iZsh +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// Graph utilities +//----------------------------------------------------------------------------- + #include +#include #include #include "ui.h" #include "graph.h" +#include "lfdemod.h" int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphTraceLen; @@ -13,7 +25,7 @@ void AppendGraph(int redraw, int clock, int bit) for (i = 0; i < (int)(clock / 2); ++i) GraphBuffer[GraphTraceLen++] = bit ^ 1; - + for (i = (int)(clock / 2); i < clock; ++i) GraphBuffer[GraphTraceLen++] = bit; @@ -21,10 +33,12 @@ void AppendGraph(int redraw, int clock, int bit) 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) @@ -33,53 +47,116 @@ int ClearGraph(int redraw) return gtl; } -/* - * Detect clock rate - */ -int DetectClock(int peak) +// DETECT CLOCK NOW IN LFDEMOD.C + +void setGraphBuf(uint8_t *buff, size_t size) { - int i; - int clock = 0xFFFF; - int lastpeak = 0; - - /* Detect peak if we don't have one */ - if (!peak) - for (i = 0; i < GraphTraceLen; ++i) - if (GraphBuffer[i] > peak) - peak = GraphBuffer[i]; - - for (i = 1; i < GraphTraceLen; ++i) - { - /* If this is the beginning of a peak */ - if (GraphBuffer[i - 1] != GraphBuffer[i] && GraphBuffer[i] == peak) - { - /* Find lowest difference between peaks */ - if (lastpeak && i - lastpeak < clock) - clock = i - lastpeak; - lastpeak = i; - } + if ( buff == NULL ) return; + + uint16_t i = 0; + if ( size > MAX_GRAPH_TRACE_LEN ) + size = MAX_GRAPH_TRACE_LEN; + ClearGraph(0); + for (; i < size; ++i){ + GraphBuffer[i]=buff[i]-128; } - - return clock; + 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; } -/* Get or auto-detect clock rate */ + +// Get or auto-detect clock rate int GetClock(const char *str, int peak, int verbose) { - int clock; - - sscanf(str, "%i", &clock); - if (!strcmp(str, "")) - clock = 0; - - /* Auto-detect clock */ - if (!clock) - { - clock = DetectClock(peak); - /* Only print this message if we're not looping something */ - if (!verbose) - PrintAndLog("Auto-detected clock rate: %d", clock); - } + 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); + } + } + return clock; +} + +// A simple test to see if there is any data inside Graphbuffer. +bool HasGraphData(){ + + if ( GraphTraceLen <= 0) { + PrintAndLog("No data available, try reading something first"); + return false; + } + return true; +} + +// Detect high and lows in Grapbuffer. +// Only loops the first 256 values. +void DetectHighLowInGraph(int *high, int *low, bool addFuzz) { + + uint8_t loopMax = 255; + if ( loopMax > GraphTraceLen) + loopMax = GraphTraceLen; + + for (uint8_t i = 0; i < loopMax; ++i) { + if (GraphBuffer[i] > *high) + *high = GraphBuffer[i]; + else if (GraphBuffer[i] < *low) + *low = GraphBuffer[i]; + } + + //12% fuzz in case highs and lows aren't clipped + if (addFuzz) { + *high = (int)(*high * .88); + *low = (int)(*low * .88); + } +} + +int GetNRZpskClock(const char *str, int peak, int verbose) +{ + int clock; + sscanf(str, "%i", &clock); + if (!strcmp(str, "")) + 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 ) { + 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 clock; }