Documentation to apps.h, documentation/renaming to iclass

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index f41568e4f57c887b3c3a6bc304aecb5ebd8d89bb..9079e07388fbb8ffa08c236383bb1dae8d651e12 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -32,7 +32,7 @@ void AppendGraph(int redraw, int clock, int bit)
                RepaintGraphWindow();
 }
 
-/* clear out our graph window */
+// clear out our graph window
 int ClearGraph(int redraw)
 {
        int gtl = GraphTraceLen;
@@ -44,103 +44,8 @@ int ClearGraph(int redraw)
        return gtl;
 }
 
-/*
- * Detect clock rate
- */
- //decommissioned - has difficulty detecting rf/32
-/*
-int DetectClockOld(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];
+// DETECT CLOCK NOW IN LFDEMOD.C
 
- // peak=(int)(peak*.75);
-       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;
-               }
-       }
-
-       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, size_t size)
 {
        int i=0;
@@ -162,61 +67,32 @@ size_t getFromGraphBuf(uint8_t *buff)
        }
        return i;
 }
-/* Get or auto-detect clock rate */
+// Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
        int clock;
-//  int clock2;
        sscanf(str, "%i", &clock);
        if (!strcmp(str, ""))
                clock = 0;
 
-       /* Auto-detect clock */
+       // Auto-detect clock
        if (!clock)
        {
                uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
                size_t size = getFromGraphBuf(grph);
                clock = DetectASKClock(grph,size,0);
-               //clock2 = DetectClock2(peak);
-               /* Only print this message if we're not looping something */
+               // Only print this message if we're not looping something
                if (!verbose){
                        PrintAndLog("Auto-detected clock rate: %d", clock);
-                       //PrintAndLog("clock2: %d",clock2);
                }
        }
 
        return clock;
 }
-int GetNRZpskClock(const char *str, int peak, int verbose)
-{
- // return GetClock(str,peak,verbose);
-       int clock;
-       //  int clock2;
-       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 = DetectpskNRZClock(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);
-                       //PrintAndLog("clock2: %d",clock2);
-               }
-       }
-       return clock;
-}
-// Get or auto-detect clock rate
-/*
 int GetNRZpskClock(const char *str, int peak, int verbose)
 {
        int clock;
-//  int clock2;
        sscanf(str, "%i", &clock);
        if (!strcmp(str, ""))
                clock = 0;
@@ -225,15 +101,12 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
        if (!clock)
        {
                uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
-               int size = getFromGraphBuf(grph);
-               clock = DetectASKClock(grph,size,0);
-               //clock2 = DetectClock2(peak);
+               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);
-                       //PrintAndLog("clock2: %d",clock2);
                }
        }
        return clock;
 }
-*/