FIX: downloaded a fresh clone from my fork, and took away the build-errors.

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index bb8159951b2eb8c4637b5a0664f3fbb33d690ed3..d0f6fe74fce36b1f1e6a2fd1a9ae73f14c82f6ef 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include "ui.h"
 #include "graph.h"
 #include <string.h>
 #include "ui.h"
 #include "graph.h"

+#include "lfdemod.h"

 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;


@@ -48,135 +49,69 @@ int ClearGraph(int redraw)
   return gtl;
 }
 
   return gtl;
 }
 

-/*
- * Detect clock rate
- */
- //decommissioned - has difficulty detecting rf/32 and only works if data is manchester encoded
-/*
-int DetectClock2(int peak)
+void SetGraphBuf(uint8_t *buff, int size) 

 {
 {

-  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;
-    }
-  }
+       if ( buff == NULL ) return;

        
        

-               return clock;
-}
-*/
-
-// 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 DetectClock(int peak)
-       {
-  int i=0;
-  int low=0;
-  int clk[]={16,32,40,50,64,100,128,256};
-  if (!peak){
-    for (i=0;i<GraphTraceLen;++i){
-      if(GraphBuffer[i]>peak){
-        peak = GraphBuffer[i]; 
-      }
-      if(GraphBuffer[i]<low){
-        low = GraphBuffer[i];
-      }
-    }
-    peak=(int)(peak*.75);
-    low= (int)(low*.75);
-  }
-  //int numbits;
-  int ii;
-  int loopCnt = 256;
-  if (GraphTraceLen<loopCnt) loopCnt = GraphTraceLen;
-  int clkCnt;
-  int tol = 0;
-  int bestErr=1000;
-  int errCnt[]={0,0,0,0,0,0,0,0};
- // int good;
-  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)){
-        //numbits=0;
-        //good=1;
-        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){
-            //numbits++;
-          }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
-            //numbits=0;
-            //good=0;
-            errCnt[clkCnt]++;
-            //break;
-          }    
-        }
-        if(errCnt[clkCnt]==0) return clk[clkCnt];
-        if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
-      }
-    } 
-    errCnt[clkCnt]=bestErr;
-  }
-  int iii=0;
-  int best=0;
-  for (iii=0; iii<6;++iii){
-    if (errCnt[iii]<errCnt[best]){
-      best = iii;
-    }
-  }
-  PrintAndLog("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];
+       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];
+       }
+       GraphTraceLen = size;
+       RepaintGraphWindow();
+       return;

 }
 }

-               

 
 

+// Copies grahpbuff to buff. 
+// while triming values to the range -127 -- 127.
+int GetFromGraphBuf(uint8_t *buff)
+{
+       if ( buff == NULL ) return -1;
+       uint32_t i = 0;
+       
+       for (; i < GraphTraceLen; ++i){
+       
+               // trim upper and lower values.
+               if (GraphBuffer[i] > 127) 
+                       GraphBuffer[i] = 127;
+               else if (GraphBuffer[i] < -127)
+                       GraphBuffer[i] = -127;
+                       
+               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 GetClock(const char *str, int verbose)

 {
 {

-  int clock;
-
-  sscanf(str, "%i", &clock);
-  if (!strcmp(str, ""))
-    clock = 0;
-
-  /* Auto-detect clock */
-  if (!clock)
-  {
-    clock = DetectClock(peak);
-    //clock2 = DetectClock2(peak);
-    /* Only print this message if we're not looping something */
-    if (!verbose)
-      PrintAndLog("Auto-detected clock rate: %d", clock);
-  }
-
-  return clock;
+       int clock;
+
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, ""))
+               clock = 0;
+
+       /* Auto-detect clock */
+       if (!clock) {
+
+               uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0x00};
+               int 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);
+               }
+       return clock;

 }
 
 }
 

-
-/* A simple test to see if there is any data inside Graphbuffer. 
-*/
+// A simple test to see if there is any data inside Graphbuffer. 

 bool HasGraphData(){
 
        if ( GraphTraceLen <= 0) {
 bool HasGraphData(){
 
        if ( GraphTraceLen <= 0) {


@@ -184,4 +119,26 @@ bool HasGraphData(){
                return false;
        }
        return true;    
                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);
+       }

 }
\ No newline at end of file
 }
\ No newline at end of file