X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d976c9ddb2b57ff690cbdca033f5423983f60635..30e37e973d9d6855eaae9fdebaecbaba91d85b4e:/client/cmdhw.c?ds=inline

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 23b6ce21..8f7243ad 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -18,6 +18,7 @@
 #include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"
+#include "data.h"
 
 /* low-level hardware control */
 
@@ -428,11 +429,19 @@ int CmdVersion(const char *Cmd)
 
 int CmdStatus(const char *Cmd)
 {
+	uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
+	sample_buf = speed_test_buffer;
+
+	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 +449,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 +467,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"},