From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Mon, 9 Feb 2015 07:53:39 +0000 (+0100)
Subject: hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning... 
X-Git-Tag: v2.0.0-rc1~25
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0d0d0499678f7af4e81aee32ba7e8d3b44eed406

hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
---

diff --git a/client/cmddata.c b/client/cmddata.c
index 1bd3f6de..c6cb7d3f 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1874,24 +1874,31 @@ int CmdTuneSamples(const char *Cmd)
 	PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
 	PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
 	PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
-	if (peakv<2000)
+
+#define LF_UNUSABLE_V		2948		// was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
+#define LF_MARGINAL_V		14739		// was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
+#define HF_UNUSABLE_V		3167		// was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+#define HF_MARGINAL_V		7917		// was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+
+	if (peakv < LF_UNUSABLE_V)
 		PrintAndLog("# Your LF antenna is unusable.");
-	else if (peakv<10000)
+	else if (peakv < LF_MARGINAL_V)
 		PrintAndLog("# Your LF antenna is marginal.");
-	if (vHf<2000)
+	if (vHf < HF_UNUSABLE_V)
 		PrintAndLog("# Your HF antenna is unusable.");
-	else if (vHf<5000)
+	else if (vHf < HF_MARGINAL_V)
 		PrintAndLog("# Your HF antenna is marginal.");
 
-	for (int i = 0; i < 256; i++) {
-		GraphBuffer[i] = resp.d.asBytes[i] - 128;
+	if (peakv >= LF_UNUSABLE_V)	{
+		for (int i = 0; i < 256; i++) {
+			GraphBuffer[i] = resp.d.asBytes[i] - 128;
+		}
+		PrintAndLog("Displaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n");
+		PrintAndLog("\n");
+		GraphTraceLen = 256;
+		ShowGraphWindow();
 	}
 
-	PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");
-	PrintAndLog("\n");
-	GraphTraceLen = 256;
-	ShowGraphWindow();
-
 	return 0;
 }