CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3...

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 190dfe8f731dc9fbcd1a299261312e02c409b569..4c132420b98df9f99519476c8f5c67e10e8342c8 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -17,7 +17,6 @@
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;

-

 /* write a manchester bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {
 /* write a manchester bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {


@@ -46,6 +45,24 @@ 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 NOW IN LFDEMOD.C
 
 
 // DETECT CLOCK NOW IN LFDEMOD.C
 


@@ -126,10 +143,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }

-       DetectASKClock(grph, size, &clock, 20);
+       bool st = DetectST(grph, &size, &clock);
+       int start = 0;
+       if (st == false) {
+               start = DetectASKClock(grph, size, &clock, 20);
+       }

        // Only print this message if we're not looping something
        if (printAns){
        // Only print this message if we're not looping something
        if (printAns){

-               PrintAndLog("Auto-detected clock rate: %d", clock);
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);

        }
        return clock;
 }
        }
        return clock;
 }


@@ -146,7 +167,7 @@ uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)
        }
        //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
 
        }
        //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
 

-       carrier = countPSK_FC(grph,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);
        // Only print this message if we're not looping something
        if (printAns){
                PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);


@@ -161,21 +182,18 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
        if (!strcmp(str, "")) 
                clock = 0;
 
        if (!strcmp(str, "")) 
                clock = 0;
 

-       if (clock!=0) 
-               return clock;
+       if (clock!=0) return clock;

        // Auto-detect clock
        uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
        size_t size = getFromGraphBuf(grph);
        if ( size == 0 ) {
        // 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");
+               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
                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);
-       }
+       if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock);
+

        return clock;
 }
 
        return clock;
 }
 


@@ -232,10 +250,9 @@ 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;
        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); 
+       uint16_t ans = countFC(BitStream, size, 1); 

        if (ans==0) {
        if (ans==0) {

-               if (verbose) PrintAndLog("DEBUG: No data found");
+               if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");

                return 0;
        }
        *fc1 = (ans >> 8) & 0xFF;
                return 0;
        }
        *fc1 = (ans >> 8) & 0xFF;


@@ -243,8 +260,21 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
 
        *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
        if (*rf1==0) {
 
        *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
        if (*rf1==0) {

-               if (verbose) PrintAndLog("DEBUG: Clock detect error");
+               if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");

                return 0;
        }
        return 1;
 }
                return 0;
        }
        return 1;
 }

+
+// test samples are not just noise
+bool graphJustNoise(int *BitStream, int size)
+{
+       //might not be high enough for noisy environments
+       #define THRESHOLD 15; 
+
+       bool isNoise = TRUE;
+       for(int i=0; i < size && isNoise; i++){
+               isNoise = BitStream[i] < THRESHOLD;
+       }
+       return isNoise;
+}