fix: 32bit tick timer based on TC0 and TC1 (#653)

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 33dc78aeb523c5731ec297e9432159336d774580..f994e938778cae8dffa590432240a053173e78d0 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -8,17 +8,17 @@
 // Hardware commands
 //-----------------------------------------------------------------------------
 
 // Hardware commands
 //-----------------------------------------------------------------------------
 

+#include "cmdhw.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "ui.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 "cmdparser.h"

-#include "cmdhw.h"

 #include "cmdmain.h"
 #include "cmddata.h"
 #include "cmdmain.h"
 #include "cmddata.h"

-#include "data.h"

 
 /* low-level hardware control */
 
 
 /* low-level hardware control */
 


@@ -408,34 +408,23 @@ int CmdVersion(const char *Cmd)
 
        clearCommandBuffer();
        UsbCommand c = {CMD_VERSION};
 
        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("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)
 {
        }
        return 0;
 }
 
 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);
        clearCommandBuffer();
        UsbCommand c = {CMD_STATUS};
        SendCommand(&c);

-       if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
+       if (!WaitForResponseTimeout(CMD_ACK, &c, 1900)) {

                PrintAndLog("Status command failed. USB Speed Test timed out");
        }
        return 0;
                PrintAndLog("Status command failed. USB Speed Test timed out");
        }
        return 0;


@@ -449,7 +438,7 @@ int CmdPing(const char *Cmd)
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {

-               PrintAndLog("Ping successfull");
+               PrintAndLog("Ping successful");

        }else{
                PrintAndLog("Ping failed");
        }
        }else{
                PrintAndLog("Ping failed");
        }


@@ -467,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"},
        {"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"},
        {"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"},