Add @Iceman1001 s cotag read

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index ae318ddf4334d3890ed41ad245d2655b7d104c3c..d216a8f20abdd5b557d0058675dd2c114de3d837 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -53,12 +53,13 @@ void save_restoreGB(uint8_t saveOpt)
        static bool GB_Saved = false;
 
        if (saveOpt==1) { //save
-               memcpy(SavedGB,GraphBuffer, sizeof(GraphBuffer));
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
                SavedGBlen = GraphTraceLen;
                GB_Saved=true;
-       } else if (GB_Saved){
-               memcpy(GraphBuffer,SavedGB, sizeof(GraphBuffer));
+       } else if (GB_Saved){ //restore
+               memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
                GraphTraceLen = SavedGBlen;
+               RepaintGraphWindow();
        }
        return;
 }
@@ -142,10 +143,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        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){
-               PrintAndLog("Auto-detected clock rate: %d", clock);
+       if (printAns) {
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;
 }
@@ -263,3 +268,13 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
        }
        return 1;
 }
+bool graphJustNoise(int *BitStream, int size)
+{
+       static const uint8_t THRESHOLD = 15; //might not be high enough for noisy environments
+       //test samples are not just noise
+       bool justNoise1 = 1;
+       for(int idx=0; idx < size && justNoise1 ;idx++){
+               justNoise1 = BitStream[idx] < THRESHOLD;
+       }
+       return justNoise1;
+}