X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d976c9ddb2b57ff690cbdca033f5423983f60635..6d31653c440538916811b957769a89f24eb39d63:/client/cmdhw.c?ds=sidebyside

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 23b6ce21..f994e938 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -8,14 +8,15 @@
 // Hardware commands
 //-----------------------------------------------------------------------------
 
+#include "cmdhw.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "ui.h"
-#include "proxmark3.h"
+#include "comms.h"
 #include "cmdparser.h"
-#include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"
 
@@ -407,32 +408,29 @@ int CmdVersion(const char *Cmd)
 
 	clearCommandBuffer();
 	UsbCommand c = {CMD_VERSION};
-	static UsbCommand resp = {0, {0, 0, 0}};
+	UsbCommand resp = {0, {0, 0, 0}};
 
-	if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
-		SendCommand(&c);
-		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-			PrintAndLog("Prox/RFID mark3 RFID instrument");
-			PrintAndLog((char*)resp.d.asBytes);
-			lookupChipID(resp.arg[0], resp.arg[1]);
-		}
-	} else {
-		PrintAndLog("[[[ Cached information ]]]\n");
+	SendCommand(&c);
+	if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
 		PrintAndLog("Prox/RFID mark3 RFID instrument");
 		PrintAndLog((char*)resp.d.asBytes);
 		lookupChipID(resp.arg[0], resp.arg[1]);
-		PrintAndLog("");
 	}
 	return 0;
 }
 
 int CmdStatus(const char *Cmd)
 {
+	clearCommandBuffer();
 	UsbCommand c = {CMD_STATUS};
 	SendCommand(&c);
+	if (!WaitForResponseTimeout(CMD_ACK, &c, 1900)) {
+		PrintAndLog("Status command failed. USB Speed Test timed out");
+	}
 	return 0;
 }
 
+
 int CmdPing(const char *Cmd)
 {
 	clearCommandBuffer();
@@ -440,7 +438,7 @@ int CmdPing(const char *Cmd)
 	UsbCommand c = {CMD_PING};
 	SendCommand(&c);
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-		PrintAndLog("Ping successfull");
+		PrintAndLog("Ping successful");
 	}else{
 		PrintAndLog("Ping failed");
 	}
@@ -458,7 +456,7 @@ static command_t CommandTable[] =
 	{"reset",         CmdReset,       0, "Reset the Proxmark3"},
 	{"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
 	{"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-	{"tune",          CmdTune,        0, "Measure antenna tuning"},
+	{"tune",          CmdTune,        0, "['l'|'h'] -- Measure antenna tuning (option 'l' or 'h' to limit to LF or HF)"},
 	{"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
 	{"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
 	{"ping",          CmdPing,        0, "Test if the pm3 is responsive"},