X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a1557c4c2f3905fd760dbac16cba5be890948634..b4fb11ba92dd67c249e1f99f4470a10c6db5e00b:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index 0f998fe1..f508fe88 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -56,49 +56,51 @@ void setGraphBuf(uint8_t *buff, size_t size)
 	uint16_t i = 0;  
 	if ( size > MAX_GRAPH_TRACE_LEN )
 		size = MAX_GRAPH_TRACE_LEN;
-  ClearGraph(0);
-  for (; i < size; ++i){
+	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)
 {
-	if ( buff == NULL ) return -1;
-	
-  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;
+	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 i;
 }
+
+
 // 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;
+	int clock;
+	sscanf(str, "%i", &clock);
+	if (!strcmp(str, ""))
+		clock = 0;
 
 	// Auto-detect clock
-  if (!clock)
-  {
-    uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+	if (!clock)
+	{
+		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
-		if ( size < 0 ) {
+		if ( size == 0 ) {
 			PrintAndLog("Failed to copy from graphbuffer");
 			return -1;
 		}
-    clock = DetectASKClock(grph,size,0);
+		DetectASKClock(grph,size,&clock,20);
 		// Only print this message if we're not looping something
-    if (!verbose){
-      PrintAndLog("Auto-detected clock rate: %d", clock);
-    }
-  return clock;
+		if (!verbose){
+			PrintAndLog("Auto-detected clock rate: %d", clock);
+		}
+	}
+	return clock;
 }
 
 // A simple test to see if there is any data inside Graphbuffer. 
@@ -133,7 +135,7 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz) {
 	}
 }
 
-int GetNRZpskClock(const char *str, int peak, int verbose)
+int GetPskClock(const char *str, int peak, int verbose)
 {
 	int clock;
 	sscanf(str, "%i", &clock);
@@ -145,11 +147,40 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 	{
 		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
-		clock = DetectpskNRZClock(grph,size,0);
+		if ( size == 0 ) {
+			PrintAndLog("Failed to copy from graphbuffer");
+			return -1;
+		}
+		clock = DetectPSKClock(grph,size,0);
 		// Only print this message if we're not looping something
 		if (!verbose){
 			PrintAndLog("Auto-detected clock rate: %d", clock);
 		}
 	}
 	return clock;
-}
\ No newline at end of file
+}
+
+int GetNrzClock(const char *str, int peak, int verbose)
+{
+	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 = DetectNRZClock(grph,size,0);
+		// Only print this message if we're not looping something
+		if (!verbose){
+			PrintAndLog("Auto-detected clock rate: %d", clock);
+		}
+	}
+	return clock;
+}