fix: array index out of range in mfkeys.log (thanks to @TomHarkness)

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 44f878afe63dd6fde6ad06e10ec766fffa346703..bdab01eba35bc66f1a45ac656e581d238f9c3fc7 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -8,17 +8,17 @@
 // 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"
-#include "data.h"
 
 /* low-level hardware control */
 
@@ -429,14 +429,10 @@ int CmdVersion(const char *Cmd)
 
 int CmdStatus(const char *Cmd)
 {
-       uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
-       sample_buf = speed_test_buffer;
-       #define USB_SPEED_TEST_SIZE (1000*USB_CMD_DATA_SIZE)
-
        clearCommandBuffer();
-       UsbCommand c = {CMD_STATUS, {USB_SPEED_TEST_SIZE}};
+       UsbCommand c = {CMD_STATUS};
        SendCommand(&c);
-       if (!WaitForResponseTimeout(CMD_ACK,&c,1500)) {
+       if (!WaitForResponseTimeout(CMD_ACK, &c, 1900)) {
                PrintAndLog("Status command failed. USB Speed Test timed out");
        }
        return 0;
@@ -450,7 +446,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");
        }
@@ -468,7 +464,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"},