MFU info adjustments

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index a0e85ffd40c8fb367bcc7bb6a443818ae0bfda23..062798482821c0873df2db766e39e8413f22dd84 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"


@@ -16,26 +17,27 @@
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;

-
-/* write a bit to the graph */
+/* write a manchester bit to the graph */

 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;

-
+  //set first half the clock bit (all 1's or 0's for a 0 or 1 bit) 

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

-    GraphBuffer[GraphTraceLen++] = bit ^ 1;
-  
+    GraphBuffer[GraphTraceLen++] = bit ;
+  //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)

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

-    GraphBuffer[GraphTraceLen++] = bit;
+    GraphBuffer[GraphTraceLen++] = bit ^ 1;

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

-/* clear out our graph window */
+// clear out our graph window

 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;

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

   GraphTraceLen = 0;
 
   if (redraw)
   GraphTraceLen = 0;
 
   if (redraw)


@@ -43,147 +45,222 @@ int ClearGraph(int redraw)
 
   return gtl;
 }
 
   return gtl;
 }

+// option '1' to save GraphBuffer any other to restore
+void save_restoreGB(uint8_t saveOpt)
+{
+       static int SavedGB[MAX_GRAPH_TRACE_LEN];
+       static int SavedGBlen;
+       static bool GB_Saved = false;
+
+       if (saveOpt==1) { //save
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
+               SavedGBlen = GraphTraceLen;
+               GB_Saved=true;
+       } else if (GB_Saved){ //restore
+               memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
+               GraphTraceLen = SavedGBlen;
+               RepaintGraphWindow();
+       }
+       return;
+}

 
 

-/*
- * Detect clock rate
- */
- //decommissioned - has difficulty detecting rf/32 
-/*
-int DetectClockOld(int peak)
+// DETECT CLOCK NOW IN LFDEMOD.C
+
+void setGraphBuf(uint8_t *buff, size_t 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];
-
- // 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;
+       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;
+       }
+       GraphTraceLen=size;
+       RepaintGraphWindow();
+       return;

 }
 }

-*/
-/*
-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)
+size_t getFromGraphBuf(uint8_t *buff)

 {
 {

-  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];
+       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;
+}
+
+// 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);
+       }

 }
 }

-*/
-void setGraphBuf(uint8_t *buff,int size) 
+
+// Get or auto-detect ask clock rate
+int GetAskClock(const char str[], bool printAns, bool verbose)

 {
 {

-  int i=0;
-  ClearGraph(0);
-  for (; i < size; ++i){
-    GraphBuffer[i]=buff[i];
-  }
-  GraphTraceLen=size;
-  RepaintGraphWindow();
-  return;
+       int clock;
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, ""))
+               clock = 0;
+
+       if (clock != 0) 
+               return clock;
+       // Auto-detect clock
+       uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(grph);
+       if (size == 0) {
+               if (verbose)
+                       PrintAndLog("Failed to copy from graphbuffer");
+               return -1;
+       }
+       int start = DetectASKClock(grph, size, &clock, 20);
+       // Only print this message if we're not looping something
+       if (printAns){
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
+       }
+       return clock;

 }
 }

-int getFromGraphBuf(uint8_t *buff)
+
+uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)

 {
 {

-  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;
+       uint8_t carrier=0;
+       uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(grph);
+       if ( size == 0 ) {
+               if (verbose) 
+                       PrintAndLog("Failed to copy from graphbuffer");
+               return 0;
+       }
+       //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
+
+       carrier = countFC(grph,size,0);
+       // Only print this message if we're not looping something
+       if (printAns){
+               PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);
+       }
+       return carrier;

 }
 }

-/* Get or auto-detect clock rate */
-int GetClock(const char *str, int peak, int verbose)
+
+int GetPskClock(const char str[], bool printAns, bool verbose)
+{
+       int clock;
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, "")) 
+               clock = 0;
+
+       if (clock!=0) 
+               return clock;
+       // Auto-detect clock
+       uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(grph);
+       if ( size == 0 ) {
+               if (verbose) 
+                       PrintAndLog("Failed to copy from graphbuffer");
+               return -1;
+       }
+       clock = DetectPSKClock(grph,size,0);
+       // Only print this message if we're not looping something
+       if (printAns){
+               PrintAndLog("Auto-detected clock rate: %d", clock);
+       }
+       return clock;
+}
+
+uint8_t GetNrzClock(const char str[], bool printAns, bool 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};
-    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);
-      //PrintAndLog("clock2: %d",clock2);
-    }
-  }
-
-  return clock;
+       int clock;
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, ""))
+               clock = 0;
+
+       if (clock!=0) 
+               return clock;
+       // Auto-detect clock
+       uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(grph);
+       if ( size == 0 ) {
+               if (verbose) 
+                       PrintAndLog("Failed to copy from graphbuffer");
+               return -1;
+       }
+       clock = DetectNRZClock(grph, size, 0);
+       // Only print this message if we're not looping something
+       if (printAns){
+               PrintAndLog("Auto-detected clock rate: %d", clock);
+       }
+       return clock;
+}
+//by marshmellow
+//attempt to detect the field clock and bit clock for FSK
+uint8_t GetFskClock(const char str[], bool printAns, bool verbose)
+{
+       int clock;
+       sscanf(str, "%i", &clock);
+       if (!strcmp(str, ""))
+               clock = 0;
+       if (clock != 0) return (uint8_t)clock;
+
+
+       uint8_t fc1=0, fc2=0, rf1=0;
+       uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose);
+       if (ans == 0) return 0;
+       if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
+               if (printAns) PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+               return rf1;
+       }
+       if (verbose){
+               PrintAndLog("DEBUG: unknown fsk field clock detected");
+               PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+       }
+       return 0;
+}
+uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
+{
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(BitStream);
+       if (size==0) return 0;
+       uint16_t ans = countFC(BitStream, size, 1); 
+       if (ans==0) {
+               if (verbose) PrintAndLog("DEBUG: No data found");
+               return 0;
+       }
+       *fc1 = (ans >> 8) & 0xFF;
+       *fc2 = ans & 0xFF;
+
+       *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
+       if (*rf1==0) {
+               if (verbose) PrintAndLog("DEBUG: Clock detect error");
+               return 0;
+       }
+       return 1;

 }
 }