X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/643fb10b2df5248f830f0a9e3d8ae43b24e1c2b2..7666f4608e8ade0ada08777d1cc33469c5d9471d:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index ae318ddf..d216a8f2 100644
--- 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;
+}