X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ba1a299ce67e4699e77fefe6a8ef825e30118961..c856ceae8acabef3a35a0c70fb4a671d6c5ca292:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index f41568e4..6362c8fe 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -20,203 +20,81 @@ int GraphTraceLen;
 /* write a bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {
-	int i;
+  int i;
 
-	for (i = 0; i < (int)(clock / 2); ++i)
-		GraphBuffer[GraphTraceLen++] = bit ^ 1;
+  for (i = 0; i < (int)(clock / 2); ++i)
+    GraphBuffer[GraphTraceLen++] = bit ^ 1;
 
-	for (i = (int)(clock / 2); i < clock; ++i)
-		GraphBuffer[GraphTraceLen++] = bit;
+  for (i = (int)(clock / 2); i < clock; ++i)
+    GraphBuffer[GraphTraceLen++] = bit;
 
-	if (redraw)
-		RepaintGraphWindow();
+  if (redraw)
+    RepaintGraphWindow();
 }
 
-/* clear out our graph window */
+// clear out our graph window
 int ClearGraph(int redraw)
 {
-	int gtl = GraphTraceLen;
-	GraphTraceLen = 0;
+  int gtl = GraphTraceLen;
+  memset(GraphBuffer, 0x00, GraphTraceLen);
 
-	if (redraw)
-		RepaintGraphWindow();
+  GraphTraceLen = 0;
 
-	return gtl;
+  if (redraw)
+    RepaintGraphWindow();
+
+  return gtl;
 }
 
-/*
- * Detect clock rate
- */
- //decommissioned - has difficulty detecting rf/32
-/*
-int DetectClockOld(int peak)
-{
-	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];
-
- // peak=(int)(peak*.75);
-	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;
-		}
-	}
+// DETECT CLOCK NOW IN LFDEMOD.C
 
-	return clock;
-}
-*/
-/*
-NOW IN LFDEMOD.C
-
-// by marshmellow
-// not perfect especially with lower clocks or VERY good antennas (heavy wave clipping)
-// maybe somehow adjust peak trimming value based on samples to fix?
-int DetectASKClock(int peak)
-{
-	int i=0;
-	int low=0;
-	int clk[]={16,32,40,50,64,100,128,256};
-	int loopCnt = 256;
-	if (GraphTraceLen<loopCnt) loopCnt = GraphTraceLen;
-	if (!peak){
-		for (i=0;i<loopCnt;++i){
-			if(GraphBuffer[i]>peak){
-				peak = GraphBuffer[i];
-			}
-			if(GraphBuffer[i]<low){
-				low = GraphBuffer[i];
-			}
-		}
-		peak=(int)(peak*.75);
-		low= (int)(low*.75);
-	}
-	int ii;
-	int clkCnt;
-	int tol = 0;
-	int bestErr=1000;
-	int errCnt[]={0,0,0,0,0,0,0,0};
-	for(clkCnt=0; clkCnt<6;++clkCnt){
-		if (clk[clkCnt]==32){
-			tol=1;
-		}else{
-			tol=0;
-		}
-		bestErr=1000;
-		for (ii=0; ii<loopCnt; ++ii){
-			if ((GraphBuffer[ii]>=peak) || (GraphBuffer[ii]<=low)){
-				 errCnt[clkCnt]=0;
-				for (i=0; i<((int)(GraphTraceLen/clk[clkCnt])-1); ++i){
-					if (GraphBuffer[ii+(i*clk[clkCnt])]>=peak || GraphBuffer[ii+(i*clk[clkCnt])]<=low){
-					}else if(GraphBuffer[ii+(i*clk[clkCnt])-tol]>=peak || GraphBuffer[ii+(i*clk[clkCnt])-tol]<=low){
-					}else if(GraphBuffer[ii+(i*clk[clkCnt])+tol]>=peak || GraphBuffer[ii+(i*clk[clkCnt])+tol]<=low){
-					}else{  //error no peak detected
-						errCnt[clkCnt]++;
-					}
-				}
-				if(errCnt[clkCnt]==0) return clk[clkCnt];
-				if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
-			}
-		}
-	}
-	int iii=0;
-	int best=0;
-	for (iii=0; iii<6;++iii){
-		if (errCnt[iii]<errCnt[best]){
-			best = iii;
-		}
-	}
-	// PrintAndLog("DEBUG: clkCnt: %d, ii: %d, i: %d peak: %d, low: %d, errcnt: %d, errCnt64: %d",clkCnt,ii,i,peak,low,errCnt[best],errCnt[4]);
-	return clk[best];
-}
-*/
 void setGraphBuf(uint8_t *buff, size_t size)
 {
-	int i=0;
-	ClearGraph(0);
-	for (; i < size; ++i){
+  int i=0;
+  ClearGraph(0);
+  for (; i < size; ++i){
 		GraphBuffer[i]=buff[i]-128;
-	}
-	GraphTraceLen=size;
-	RepaintGraphWindow();
-	return;
+  }
+  GraphTraceLen=size;
+  RepaintGraphWindow();
+  return;
 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
-	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 i;
+  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 i;
 }
-/* Get or auto-detect clock rate */
+// Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
-	int clock;
-//  int clock2;
-	sscanf(str, "%i", &clock);
-	if (!strcmp(str, ""))
-		clock = 0;
+  int clock;
+  sscanf(str, "%i", &clock);
+  if (!strcmp(str, ""))
+    clock = 0;
 
-	/* Auto-detect clock */
-	if (!clock)
-	{
-		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+	// Auto-detect clock
+  if (!clock)
+  {
+    uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
-		clock = DetectASKClock(grph,size,0);
-		//clock2 = DetectClock2(peak);
-		/* Only print this message if we're not looping something */
-		if (!verbose){
-			PrintAndLog("Auto-detected clock rate: %d", clock);
-			//PrintAndLog("clock2: %d",clock2);
-		}
-	}
+    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;
+  return clock;
 }
-int GetNRZpskClock(const char *str, int peak, int verbose)
-{
- // return GetClock(str,peak,verbose);
-	int clock;
-	//  int clock2;
-	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);
-		clock = DetectpskNRZClock(grph,size,0);
-		//clock2 = DetectClock2(peak);
-		/* Only print this message if we're not looping something */
-		if (!verbose){
-			PrintAndLog("Auto-detected clock rate: %d", clock);
-			//PrintAndLog("clock2: %d",clock2);
-		}
-	}
-	return clock;
-}
-// Get or auto-detect clock rate
-/*
 int GetNRZpskClock(const char *str, int peak, int verbose)
 {
 	int clock;
-//  int clock2;
 	sscanf(str, "%i", &clock);
 	if (!strcmp(str, ""))
 		clock = 0;
@@ -225,15 +103,12 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 	if (!clock)
 	{
 		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
-		int size = getFromGraphBuf(grph);
-		clock = DetectASKClock(grph,size,0);
-		//clock2 = DetectClock2(peak);
+		size_t size = getFromGraphBuf(grph);
+		clock = DetectpskNRZClock(grph,size,0);
 		// Only print this message if we're not looping something
 		if (!verbose){
 			PrintAndLog("Auto-detected clock rate: %d", clock);
-			//PrintAndLog("clock2: %d",clock2);
 		}
 	}
 	return clock;
 }
-*/