ADD: midnitesnakes desfire, ultralight changes from Unstable branch.

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 541e68f3404a30c98de216c16afc70b7c7da1349..ff5a02e43160800a061bee57312b74f56bc71ce5 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -9,9 +9,11 @@
 //-----------------------------------------------------------------------------
 
 #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"

+#include "lfdemod.h"

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


@@ -20,11 +22,13 @@ int GraphTraceLen;
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;

-
-  for (i = 0; i < (int)(clock / 2); ++i)
-    GraphBuffer[GraphTraceLen++] = bit ^ 1;
+  int half = (int)(clock/2);
+  int firstbit = bit ^ 1;
+ 
+  for (i = 0; i < half; ++i)
+    GraphBuffer[GraphTraceLen++] = firstbit;

   
   

-  for (i = (int)(clock / 2); i < clock; ++i)
+  for (i = 0; i <= half; ++i)

     GraphBuffer[GraphTraceLen++] = bit;
 
   if (redraw)
     GraphBuffer[GraphTraceLen++] = bit;
 
   if (redraw)


@@ -35,8 +39,10 @@ void AppendGraph(int redraw, int clock, int bit)
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;

-  GraphTraceLen = 0;
+  memset(GraphBuffer, 0x00, GraphTraceLen);

 
 

+  GraphTraceLen = 0;
+ 

   if (redraw)
     RepaintGraphWindow();
 
   if (redraw)
     RepaintGraphWindow();
 


@@ -46,33 +52,121 @@ int ClearGraph(int redraw)
 /*
  * Detect clock rate
  */
 /*
  * Detect clock rate
  */

-int DetectClock(int peak)
+ //decommissioned - has difficulty detecting rf/32 
+/*
+int DetectClockOld(int peak)

 {
   int i;
   int clock = 0xFFFF;
   int lastpeak = 0;
 
 {
   int i;
   int clock = 0xFFFF;
   int lastpeak = 0;
 

-  /* Detect peak if we don't have one */
+  // Detect peak if we don't have one 

   if (!peak)
     for (i = 0; i < GraphTraceLen; ++i)
       if (GraphBuffer[i] > peak)
         peak = GraphBuffer[i];
 
   if (!peak)
     for (i = 0; i < GraphTraceLen; ++i)
       if (GraphBuffer[i] > peak)
         peak = GraphBuffer[i];
 

+ // peak=(int)(peak*.75);

   for (i = 1; i < GraphTraceLen; ++i)
   {
   for (i = 1; i < GraphTraceLen; ++i)
   {

-    /* If this is the beginning of a peak */
-    if (GraphBuffer[i - 1] != GraphBuffer[i] && GraphBuffer[i] == peak)
+    // If this is the beginning of a peak 
+    if (GraphBuffer[i - 1] != GraphBuffer[i] && GraphBuffer[i] >= peak)

     {
     {

-      /* Find lowest difference between peaks */
+      // Find lowest difference between peaks 

       if (lastpeak && i - lastpeak < clock)
         clock = i - lastpeak;
       lastpeak = i;
     }
   }
       if (lastpeak && i - lastpeak < clock)
         clock = i - lastpeak;
       lastpeak = i;
     }
   }

-
-  return clock;
+       
+               return clock;
+}
+*/
+/*
+NOW IN LFDEMOD.C
+
+// 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 DetectASKClock(int peak)
+       {
+  int i=0;
+  int low=0;
+  int clk[]={16,32,40,50,64,100,128,256};
+  int loopCnt = 256;
+  if (GraphTraceLen<loopCnt) loopCnt = GraphTraceLen;
+  if (!peak){
+    for (i=0;i<loopCnt;++i){
+      if(GraphBuffer[i]>peak){
+        peak = GraphBuffer[i]; 
+      }
+      if(GraphBuffer[i]<low){
+        low = GraphBuffer[i];
+      }
+    }
+    peak=(int)(peak*.75);
+    low= (int)(low*.75);
+  }
+  int ii;
+  int clkCnt;
+  int tol = 0;
+  int bestErr=1000;
+  int errCnt[]={0,0,0,0,0,0,0,0};
+  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)){
+        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){
+          }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
+            errCnt[clkCnt]++;
+          }    
+        }
+        if(errCnt[clkCnt]==0) return clk[clkCnt];
+        if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
+      }
+    } 
+  }
+  int iii=0;
+  int best=0;
+  for (iii=0; iii<6;++iii){
+    if (errCnt[iii]<errCnt[best]){
+      best = iii;
+    }
+  }
+  // PrintAndLog("DEBUG: 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];
+}
+*/
+void setGraphBuf(uint8_t *buff,int size) 
+{
+  int i=0;
+  ClearGraph(0);
+  for (; i < size; ++i){
+    GraphBuffer[i]=buff[i];
+  }
+  GraphTraceLen=size;
+  RepaintGraphWindow();
+  return;
+}
+int 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)
 {
 /* Get or auto-detect clock rate */
 int GetClock(const char *str, int peak, int verbose)
 {


@@ -85,7 +179,10 @@ int GetClock(const char *str, int peak, int verbose)
   /* Auto-detect clock */
   if (!clock)
   {
   /* Auto-detect clock */
   if (!clock)
   {

-    clock = DetectClock(peak);
+    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);
     /* Only print this message if we're not looping something */
     if (!verbose)
       PrintAndLog("Auto-detected clock rate: %d", clock);


@@ -93,3 +190,15 @@ int GetClock(const char *str, int peak, int verbose)
 
   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;    
+}
\ No newline at end of file