X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cb8220ee769ac07bdf7656161a3961cf6515223a..refs/pull/248/head:/client/graph.c?ds=inline

diff --git a/client/graph.c b/client/graph.c
index 06279848..995a32da 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -14,6 +14,7 @@
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"
+#include "cmddata.h" //for g_debugmode
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
@@ -143,9 +144,13 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
 			PrintAndLog("Failed to copy from graphbuffer");
 		return -1;
 	}
-	int start = 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){
+	if (printAns) {
 		PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
 	}
 	return clock;
@@ -213,7 +218,8 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose)
 			PrintAndLog("Failed to copy from graphbuffer");
 		return -1;
 	}
-	clock = DetectNRZClock(grph, size, 0);
+	size_t clkStartIdx = 0;
+	clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
 	// Only print this message if we're not looping something
 	if (printAns){
 		PrintAndLog("Auto-detected clock rate: %d", clock);
@@ -251,7 +257,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;
@@ -259,8 +265,18 @@ 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;
 }
+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;
+}