ADD: midnitesnakes desfire, ultralight changes from Unstable branch.

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index bb8159951b2eb8c4637b5a0664f3fbb33d690ed3..ff5a02e43160800a061bee57312b74f56bc71ce5 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;


@@ -51,9 +52,9 @@ int ClearGraph(int redraw)
 /*
  * Detect clock rate
  */
 /*
  * Detect clock rate
  */

- //decommissioned - has difficulty detecting rf/32 and only works if data is manchester encoded
+ //decommissioned - has difficulty detecting rf/32 

 /*
 /*

-int DetectClock2(int peak)
+int DetectClockOld(int peak)

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


@@ -65,6 +66,7 @@ int DetectClock2(int peak)
       if (GraphBuffer[i] > peak)
         peak = GraphBuffer[i];
 
       if (GraphBuffer[i] > peak)
         peak = GraphBuffer[i];
 

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

   for (i = 1; i < GraphTraceLen; ++i)
   {
     // If this is the beginning of a peak 
   for (i = 1; i < GraphTraceLen; ++i)
   {
     // If this is the beginning of a peak 


@@ -80,17 +82,21 @@ int DetectClock2(int peak)
                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?
 
 // 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 DetectASKClock(int peak)

        {
   int i=0;
   int low=0;
   int clk[]={16,32,40,50,64,100,128,256};
        {
   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){
   if (!peak){

-    for (i=0;i<GraphTraceLen;++i){
+    for (i=0;i<loopCnt;++i){

       if(GraphBuffer[i]>peak){
         peak = GraphBuffer[i]; 
       }
       if(GraphBuffer[i]>peak){
         peak = GraphBuffer[i]; 
       }


@@ -101,15 +107,11 @@ int DetectClock(int peak)
     peak=(int)(peak*.75);
     low= (int)(low*.75);
   }
     peak=(int)(peak*.75);
     low= (int)(low*.75);
   }

-  //int numbits;

   int ii;
   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 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;
   for(clkCnt=0; clkCnt<6;++clkCnt){
     if (clk[clkCnt]==32){
       tol=1;


@@ -119,26 +121,19 @@ int DetectClock(int peak)
     bestErr=1000;
     for (ii=0; ii<loopCnt; ++ii){
       if ((GraphBuffer[ii]>=peak) || (GraphBuffer[ii]<=low)){
     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){
         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
           }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]++;
             errCnt[clkCnt]++;

-            //break;

           }    
         }
         if(errCnt[clkCnt]==0) return clk[clkCnt];
         if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
       }
     } 
           }    
         }
         if(errCnt[clkCnt]==0) return clk[clkCnt];
         if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
       }
     } 

-    errCnt[clkCnt]=bestErr;

   }
   int iii=0;
   int best=0;
   }
   int iii=0;
   int best=0;


@@ -147,11 +142,31 @@ int DetectClock(int peak)
       best = iii;
     }
   }
       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]);
+  // 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];
 }
   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)
 {


@@ -164,7 +179,9 @@ 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)
     //clock2 = DetectClock2(peak);
     /* Only print this message if we're not looping something */
     if (!verbose)