CHG: syntax sugar

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 089119d9482fb163490962ab7489142b308f3161..17aa3ae49fff071d2bca76c0a53d7c8a53729d82 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -56,9 +56,10 @@ void save_restoreGB(uint8_t saveOpt)
                memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
                SavedGBlen = GraphTraceLen;
                GB_Saved=true;
-       } else if (GB_Saved){
+       } 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);
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;
 }
@@ -263,3 +268,16 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
        }
        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;
+}