Merge pull request #54 from Proxmark/lf_recorder

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 9079e07388fbb8ffa08c236383bb1dae8d651e12..95050f558c169078e96a4d7aaad1a91e7419869b 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>

+#include <stdbool.h>

 #include <string.h>
 #include "ui.h"
 #include "graph.h"
 #include <string.h>
 #include "ui.h"
 #include "graph.h"


@@ -20,53 +21,63 @@ int GraphTraceLen;
 /* write a bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {
 /* 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
 int ClearGraph(int redraw)
 {
 }
 
 // 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 NOW IN LFDEMOD.C
 
 void setGraphBuf(uint8_t *buff, size_t size)
 {
 }
 
 // DETECT CLOCK NOW IN LFDEMOD.C
 
 void setGraphBuf(uint8_t *buff, size_t size)
 {

-       int i=0;
-       ClearGraph(0);
-       for (; i < size; ++i){
+       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]-128;
                GraphBuffer[i]=buff[i]-128;

-       }
-       GraphTraceLen=size;
-       RepaintGraphWindow();
-       return;
+  }
+  GraphTraceLen=size;
+  RepaintGraphWindow();
+  return;

 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
 }
 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;
+       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)
 {
 // Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {


@@ -80,16 +91,51 @@ int GetClock(const char *str, int peak, int verbose)
        {
                uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
                size_t size = getFromGraphBuf(grph);
        {
                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 = DetectASKClock(grph,size,0);
                // Only print this message if we're not looping something
                if (!verbose){
                        PrintAndLog("Auto-detected clock rate: %d", clock);
                }
        }
                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;
 }
 

+// A simple test to see if there is any data inside Graphbuffer. 
+bool HasGraphData(){
+
+       if ( GraphTraceLen <= 0) {
+               PrintAndLog("No data available, try reading something first");
+               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);
+       }
+}
+

 int GetNRZpskClock(const char *str, int peak, int verbose)
 {
        int clock;
 int GetNRZpskClock(const char *str, int peak, int verbose)
 {
        int clock;


@@ -102,6 +148,10 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
        {
                uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
                size_t size = getFromGraphBuf(grph);
        {
                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 = DetectpskNRZClock(grph,size,0);
                // Only print this message if we're not looping something
                if (!verbose){
                clock = DetectpskNRZClock(grph,size,0);
                // Only print this message if we're not looping something
                if (!verbose){