CHG: Adding clarity to the command helptext.

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 5f25241cafe1f91a80e1cc2a41c8936511901d52..66a35bbe8cee14f16f872d60660e6d014af80f24 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -18,6 +18,7 @@
 #include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"

+#include "data.h"

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


@@ -309,60 +310,66 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
 
 int CmdDetectReader(const char *Cmd)
 {
 
 int CmdDetectReader(const char *Cmd)
 {

-  UsbCommand c={CMD_LISTEN_READER_FIELD};
-  // 'l' means LF - 125/134 kHz
-  if(*Cmd == 'l') {
-    c.arg[0] = 1;
-  } else if (*Cmd == 'h') {
-    c.arg[0] = 2;
-  } else if (*Cmd != '\0') {
-    PrintAndLog("use 'detectreader' or 'detectreader l' or 'detectreader h'");
-    return 0;
-  }
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_LISTEN_READER_FIELD};
+       // 'l' means LF - 125/134 kHz
+       if(*Cmd == 'l') {
+               c.arg[0] = 1;
+       } else if (*Cmd == 'h') {
+               c.arg[0] = 2;
+       } else if (*Cmd != '\0') {
+               PrintAndLog("use 'detectreader' or 'detectreader l' or 'detectreader h'");
+               return 0;
+       }
+       clearCommandBuffer();   
+       SendCommand(&c);
+       return 0;

 }
 
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd)
 {
 }
 
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd)
 {

-  UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int CmdLCD(const char *Cmd)
 {
 }
 
 int CmdLCD(const char *Cmd)
 {

-  int i, j;
+       int i, j;

 
 

-  UsbCommand c={CMD_LCD};
-  sscanf(Cmd, "%x %d", &i, &j);
-  while (j--) {
-    c.arg[0] = i & 0x1ff;
-    SendCommand(&c);
-  }
-  return 0;
+       UsbCommand c = {CMD_LCD};
+       sscanf(Cmd, "%x %d", &i, &j);
+       while (j--) {
+               c.arg[0] = i & 0x1ff;
+               clearCommandBuffer();
+               SendCommand(&c);
+       }
+       return 0;

 }
 
 int CmdLCDReset(const char *Cmd)
 {
 }
 
 int CmdLCDReset(const char *Cmd)
 {

-  UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int CmdReadmem(const char *Cmd)
 {
 }
 
 int CmdReadmem(const char *Cmd)
 {

-  UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int CmdReset(const char *Cmd)
 {
 }
 
 int CmdReset(const char *Cmd)
 {

-  UsbCommand c = {CMD_HARDWARE_RESET};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_HARDWARE_RESET};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -371,30 +378,29 @@ int CmdReset(const char *Cmd)
  */
 int CmdSetDivisor(const char *Cmd)
 {
  */
 int CmdSetDivisor(const char *Cmd)
 {

-  UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
-  if (c.arg[0] < 19 || c.arg[0] > 255) {
-    PrintAndLog("divisor must be between 19 and 255");
-  } else {
-    SendCommand(&c);
-    PrintAndLog("Divisor set, expected freq=%dHz", 12000000 / (c.arg[0]+1));
-  }
-  return 0;
+       UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
+       
+       if (c.arg[0] < 19 || c.arg[0] > 255) {
+               PrintAndLog("divisor must be between 19 and 255");
+               return 1;
+       } 
+       
+       clearCommandBuffer();
+       SendCommand(&c);
+       PrintAndLog("Divisor set, expected freq=%dHz", 12000000 / (c.arg[0]+1));
+       return 0;

 }
 
 int CmdSetMux(const char *Cmd)
 {
 }
 
 int CmdSetMux(const char *Cmd)
 {

-  UsbCommand c={CMD_SET_ADC_MUX};
-  if (strcmp(Cmd, "lopkd") == 0) {
-    c.arg[0] = 0;
-  } else if (strcmp(Cmd, "loraw") == 0) {
-    c.arg[0] = 1;
-  } else if (strcmp(Cmd, "hipkd") == 0) {
-    c.arg[0] = 2;
-  } else if (strcmp(Cmd, "hiraw") == 0) {
-    c.arg[0] = 3;
-  }
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_SET_ADC_MUX};
+       if (strcmp(Cmd, "lopkd") == 0)          c.arg[0] = 0;
+       else if (strcmp(Cmd, "loraw") == 0)     c.arg[0] = 1;
+       else if (strcmp(Cmd, "hipkd") == 0)     c.arg[0] = 2;
+       else if (strcmp(Cmd, "hiraw") == 0)     c.arg[0] = 3;
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 int CmdTune(const char *Cmd)
 }
 
 int CmdTune(const char *Cmd)


@@ -404,18 +410,17 @@ int CmdTune(const char *Cmd)
 
 int CmdVersion(const char *Cmd)
 {
 
 int CmdVersion(const char *Cmd)
 {

-

        clearCommandBuffer();
        clearCommandBuffer();

-  UsbCommand c = {CMD_VERSION};
+       UsbCommand c = {CMD_VERSION};

        static UsbCommand resp = {0, {0, 0, 0}};
 
        if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
        static 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]);
-       }
+               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");
                PrintAndLog("Prox/RFID mark3 RFID instrument");
        } else {
                PrintAndLog("[[[ Cached information ]]]\n");
                PrintAndLog("Prox/RFID mark3 RFID instrument");


@@ -428,8 +433,13 @@ int CmdVersion(const char *Cmd)
 
 int CmdStatus(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);
        UsbCommand c = {CMD_STATUS};
        SendCommand(&c);

+       if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
+               PrintAndLog("Status command failed. USB Speed Test timed out");

        return 0;
 }
 
        return 0;
 }
 


@@ -439,40 +449,39 @@ int CmdPing(const char *Cmd)
        UsbCommand resp;
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
        UsbCommand resp;
        UsbCommand c = {CMD_PING};
        SendCommand(&c);

-       if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))

                PrintAndLog("Ping successfull");
                PrintAndLog("Ping successfull");

-       }else{
-               PrintAndLog("Ping failed");
-       }
-  return 0;
+       else
+               PrintAndLog("Ping failed");     
+       return 0;

 }
 
 static command_t CommandTable[] = 
 {
 }
 
 static command_t CommandTable[] = 
 {

-  {"help",          CmdHelp,        1, "This help"},
-  {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-  {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
-  {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-  {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
-  {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-  {"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"},
-  {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
+       {"help",          CmdHelp,        1, "This help"},
+       {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+       {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+       {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
+       {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+       {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
+       {"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"},
+       {"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"},
        {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
        {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},

-  {NULL, NULL, 0, NULL}
+       {NULL, NULL, 0, NULL}

 };
 
 };
 

-int CmdHW(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+int CmdHW(const char *Cmd) {
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0;

 }
 
 int CmdHelp(const char *Cmd)
 {
 }
 
 int CmdHelp(const char *Cmd)
 {

-  CmdsHelp(CommandTable);
-  return 0;
+       CmdsHelp(CommandTable);
+       return 0;

 }
 }