minor code cleanup

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 4a966676539f2c541cc7a1dd03be1ce6cb929075..9079e07388fbb8ffa08c236383bb1dae8d651e12 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -1,7 +1,18 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// 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 <stdio.h>
 #include <string.h>
 #include "ui.h"
 #include "graph.h"
+#include "lfdemod.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
@@ -9,77 +20,93 @@ 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;
+       GraphTraceLen = 0;
 
-  if (redraw)
-    RepaintGraphWindow();
+       if (redraw)
+               RepaintGraphWindow();
 
-  return gtl;
+       return gtl;
 }
 
-/*
- * Detect clock rate
- */
-int DetectClock(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];
-
-  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;
+void setGraphBuf(uint8_t *buff, size_t size)
+{
+       int i=0;
+       ClearGraph(0);
+       for (; i < size; ++i){
+               GraphBuffer[i]=buff[i]-128;
+       }
+       GraphTraceLen=size;
+       RepaintGraphWindow();
+       return;
 }
-
-/* Get or auto-detect clock rate */
+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;
+}
+// Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
-  int clock;
+       int clock;
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, ""))
+               clock = 0;
 
-  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 = DetectASKClock(grph,size,0);
+               // Only print this message if we're not looping something
+               if (!verbose){
+                       PrintAndLog("Auto-detected clock rate: %d", clock);
+               }
+       }
 
-  /* 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 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);
+               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;
 }