X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c6be64da095246620420500857f1f34994b769a8..0452ec6c906c2389c761c1dd6b0a4b5f67defe32:/client/graph.c?ds=inline

diff --git a/client/graph.c b/client/graph.c
index 8974f4c3..d0f6fe74 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include "ui.h"
 #include "graph.h"
+#include "lfdemod.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
@@ -21,11 +22,13 @@ int GraphTraceLen;
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
-
-  for (i = 0; i < (int)(clock / 2); ++i)
-    GraphBuffer[GraphTraceLen++] = bit ^ 1;
+  int half = (int)(clock/2);
+  int firstbit = bit ^ 1;
+ 
+  for (i = 0; i < half; ++i)
+    GraphBuffer[GraphTraceLen++] = firstbit;
   
-  for (i = (int)(clock / 2); i < clock; ++i)
+  for (i = 0; i <= half; ++i)
     GraphBuffer[GraphTraceLen++] = bit;
 
   if (redraw)
@@ -36,68 +39,79 @@ void AppendGraph(int redraw, int clock, int bit)
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;
-  GraphTraceLen = 0;
+  memset(GraphBuffer, 0x00, GraphTraceLen);
 
+  GraphTraceLen = 0;
+ 
   if (redraw)
     RepaintGraphWindow();
 
   return gtl;
 }
 
-/*
- * Detect clock rate
- */
-int DetectClock(int peak)
+void SetGraphBuf(uint8_t *buff, int 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;
-    }
-  }
-
-  return clock;
+	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];
+	}
+	GraphTraceLen = size;
+	RepaintGraphWindow();
+	return;
 }
 
+// Copies grahpbuff to buff. 
+// while triming values to the range -127 -- 127.
+int 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);
+	}
+	return i;
+}
 /* Get or auto-detect clock rate */
-int GetClock(const char *str, int peak, int verbose)
+int GetClock(const char *str, 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);
-  }
-
-  return clock;
+	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. 
-*/
+// A simple test to see if there is any data inside Graphbuffer. 
 bool HasGraphData(){
 
 	if ( GraphTraceLen <= 0) {
@@ -105,4 +119,26 @@ bool HasGraphData(){
 		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);
+	}
 }
\ No newline at end of file