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

diff --git a/client/graph.c b/client/graph.c
index 3a8f0c3a..d63c4271 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -146,7 +146,7 @@ void setGraphBuf(uint8_t *buff,int size)
   int i=0;
   ClearGraph(0);
   for (; i < size; ++i){
-    GraphBuffer[i]=buff[i];
+    GraphBuffer[i]=buff[i]-128;
   }
   GraphTraceLen=size;
   RepaintGraphWindow();
@@ -155,8 +155,11 @@ void setGraphBuf(uint8_t *buff,int size)
 int getFromGraphBuf(uint8_t *buff)
 {
   uint32_t i;
-  for (i=0;i<GraphTraceLen;++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 */
@@ -184,3 +187,53 @@ int GetClock(const char *str, int peak, int verbose)
 
   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};
+    int 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;
+
+  // Auto-detect clock 
+  if (!clock)
+  {
+    uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+    int 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);
+    }
+  }
+  return clock;
+}
+*/
\ No newline at end of file