Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 009974371b3ed892dbaf2e96c176793b8d69faee..11dbc4d595294abaf178fa918b4411e58ac7243f 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -56,51 +56,24 @@ void setGraphBuf(uint8_t *buff, size_t size)
        uint16_t i = 0;  
        if ( size > MAX_GRAPH_TRACE_LEN )
                size = MAX_GRAPH_TRACE_LEN;
-  ClearGraph(0);
-  for (; i < size; ++i){
+       ClearGraph(0);
+       for (; i < size; ++i){
                GraphBuffer[i]=buff[i]-128;
-  }
-  GraphTraceLen=size;
-  RepaintGraphWindow();
-  return;
+       }
+       GraphTraceLen=size;
+       RepaintGraphWindow();
+       return;
 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
        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;
-}
-
-
-// Get or auto-detect clock rate
-int GetClock(const char *str, int peak, int verbose)
-{
-       int clock;
-       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);
-               if ( size == 0 ) {
-                       PrintAndLog("Failed to copy from graphbuffer");
-                       return -1;
-               }
-               clock = DetectASKClock(grph,size,0,20);
-               // Only print this message if we're not looping something
-               if (!verbose){
-                       PrintAndLog("Auto-detected clock rate: %d", clock);
-               }
+       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 clock;
+       return i;
 }
 
 // A simple test to see if there is any data inside Graphbuffer. 
@@ -135,52 +108,116 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz) {
        }
 }
 
-int GetPskClock(const char *str, int peak, int verbose)
+// Get or auto-detect ask clock rate
+int GetAskClock(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
-       if (!clock)
-       {
-               uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
-               size_t size = getFromGraphBuf(grph);
-               if ( size == 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 -1;
-               }
-               clock = DetectPSKClock(grph,size,0);
-               // Only print this message if we're not looping something
-               if (!verbose){
-                       PrintAndLog("Auto-detected clock rate: %d", clock);
-               }
+               return -1;
+       }
+       DetectASKClock(grph, size, &clock, 20);
+       // Only print this message if we're not looping something
+       if (printAns){
+               PrintAndLog("Auto-detected clock rate: %d", clock);
        }
        return clock;
 }
 
-int GetNrzClock(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;
        sscanf(str, "%i", &clock);
        if (!strcmp(str, ""))
                clock = 0;
 
+       if (clock!=0) 
+               return clock;
        // Auto-detect clock
-       if (!clock)
-       {
-               uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
-               size_t size = getFromGraphBuf(grph);
-               if ( size == 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 -1;
-               }
-               clock = DetectNRZClock(grph,size,0);
-               // Only print this message if we're not looping something
-               if (!verbose){
-                       PrintAndLog("Auto-detected clock rate: %d", clock);
-               }
+               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 BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(BitStream);
+       if (size==0) return 0;
+       uint8_t dummy = 0;
+       uint16_t ans = countFC(BitStream, size, &dummy); 
+       if (ans==0) {
+               if (verbose) PrintAndLog("DEBUG: No data found");
+               return 0;
+       }
+       uint8_t fc1, fc2;
+       fc1 = (ans >> 8) & 0xFF;
+       fc2 = ans & 0xFF;
+
+       uint8_t rf1 = detectFSKClk(BitStream, size, fc1, fc2);
+       if (rf1==0) {
+               if (verbose) PrintAndLog("DEBUG: Clock detect error");
+               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;
+}