]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/graph.c
FIX: @marshmellow42 's ST detection fix.
[proxmark3-svn] / client / graph.c
index ae318ddf4334d3890ed41ad245d2655b7d104c3c..4c132420b98df9f99519476c8f5c67e10e8342c8 100644 (file)
@@ -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);
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;
 }
@@ -177,21 +182,18 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
        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 ) {
-               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
-       if (printAns){
-               PrintAndLog("Auto-detected clock rate: %d", clock);
-       }
+       if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock);
+
        return clock;
 }
 
@@ -250,7 +252,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
        if (size==0) return 0;
        uint16_t ans = countFC(BitStream, size, 1); 
        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;
@@ -258,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) {
-               if (verbose) PrintAndLog("DEBUG: Clock detect error");
+               if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
                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;
+}
Impressum, Datenschutz