CHG: added the verbose flag, to make the output in "hf search" lesser.

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 15cb3f9875ba23afb1c5908c0530feb300190795..1ddf219a953d22be3725570e15cfbeecf8da7f62 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -25,12 +25,14 @@
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdscript.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdscript.h"

-
+#include "cmdcrc.h"
+#include "cmdanalyse.h"

 
 unsigned int current_command = CMD_UNKNOWN;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 
 unsigned int current_command = CMD_UNKNOWN;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);

+static int CmdRev(const char *Cmd);

 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50
 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50


@@ -42,15 +44,17 @@ static int cmd_tail;//Starts as 0
 
 static command_t CommandTable[] = 
 {
 
 static command_t CommandTable[] = 
 {

-  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of a particular command."},
-  {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},
-  {"hf",       CmdHF,          1, "{ High Frequency commands... }"},
-  {"hw",    CmdHW,    1, "{ Hardware commands... }"},
-  {"lf",       CmdLF,          1, "{ Low Frequency commands... }"},
-  {"script", CmdScript,   1,"{ Scripting commands }"},
-  {"quit",  CmdQuit,  1, "Exit program"},
-  {"exit",  CmdQuit,  1, "Exit program"},
-  {NULL, NULL, 0, NULL}
+       {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},
+       {"analyse", CmdAnalyse, 1, "{ Analyse bytes... }"},
+       {"data",        CmdData,        1, "{ Plot window / data buffer manipulation... }"},
+       {"hf",          CmdHF,          1, "{ High Frequency commands... }"},
+       {"hw",          CmdHW,          1, "{ Hardware commands... }"},
+       {"lf",          CmdLF,          1, "{ Low Frequency commands... }"},
+       {"reveng",      CmdRev,         1, "Crc calculations from the software reveng 1.40"},
+       {"script",      CmdScript,      1, "{ Scripting commands }"},   
+       {"quit",        CmdQuit,        1, "Exit program"},
+       {"exit",        CmdQuit,        1, "Exit program"},
+       {NULL, NULL, 0, NULL}

 };
 
 command_t* getTopLevelCommandTable()
 };
 
 command_t* getTopLevelCommandTable()


@@ -65,7 +69,12 @@ int CmdHelp(const char *Cmd)
 
 int CmdQuit(const char *Cmd)
 {
 
 int CmdQuit(const char *Cmd)
 {

-  exit(0);
+  return 99;
+}
+
+int CmdRev(const char *Cmd)
+{
+  CmdCrc(Cmd);

   return 0;
 }
 /**
   return 0;
 }
 /**


@@ -107,17 +116,16 @@ void storeCommand(UsbCommand *command)
 int getCommand(UsbCommand* response)
 {
     //If head == tail, there's nothing to read, or if we just got initialized
 int getCommand(UsbCommand* response)
 {
     //If head == tail, there's nothing to read, or if we just got initialized

-    if(cmd_head == cmd_tail){
-        return 0;
-    }
+    if(cmd_head == cmd_tail)  return 0;
+

     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));

+

     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     return 1;
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     return 1;

-

 }
 
 /**
 }
 
 /**


@@ -131,39 +139,38 @@ int getCommand(UsbCommand* response)
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
   
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
   

-  UsbCommand resp;
-       
+       UsbCommand resp;
+

        if (response == NULL)
        if (response == NULL)

-    response = &resp;
-
-
-  // Wait until the command is received
-  for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
-
-               while(getCommand(response)) {
-          if(response->cmd == cmd){
-          return true;
-          }
-      }
-        msleep(10); // XXX ugh
-        if (dm_seconds == 200) { // Two seconds elapsed
-          PrintAndLog("Waiting for a response from the proxmark...");
-          PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
-        }
+               response = &resp;
+
+       // Wait until the command is received
+       for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
+
+               while( getCommand(response) ) {
+                       if(response->cmd == cmd)
+                               return true;                    
+               }
+
+               msleep(10); // XXX ugh
+               if (dm_seconds == 250) { // 2.5 seconds elapsed
+                       PrintAndLog("Waiting for a response from the proxmark...");
+                       PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
+               }

        }
        }

-    return false;
+       return false;

 }
 
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
 }
 
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {

-       return WaitForResponseTimeout(cmd,response,-1);
+       return WaitForResponseTimeout(cmd, response, -1);

 }
 
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------

-void CommandReceived(char *Cmd) {
-  CmdsParse(CommandTable, Cmd);
+int CommandReceived(char *Cmd) {
+       return CmdsParse(CommandTable, Cmd);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -175,27 +182,36 @@ void UsbCommandReceived(UsbCommand *UC)
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {

-                       char s[USB_CMD_DATA_SIZE+1] = {0x00};
+                       char s[USB_CMD_DATA_SIZE+1];
+                       memset(s, 0x00, sizeof(s)); 

                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);

-                       memcpy(s,UC->d.asBytes,len);
-                       PrintAndLog("#db# %s       ", s);
+                       memcpy(s, UC->d.asBytes, len);
+                       
+                       // test
+                       if ( UC->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
+                               printf("\r#db# %s", s);
+                               fflush(stdout);
+                       }
+                       else 
+                               PrintAndLog("#db# %s", s);
+                       

                        return;
                } break;
 
                case CMD_DEBUG_PRINT_INTEGERS: {
                        return;
                } break;
 
                case CMD_DEBUG_PRINT_INTEGERS: {

-                       PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
-                       return;
-               } break;
-
-               case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
-                       sample_buf_len += UC->arg[1];
-                       memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
-               } break;
-
-               default:
+                       PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]);
+                       break;
+               }
+               case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
+               case CMD_DOWNLOADED_EML_BIGBUF: {
+                       memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
+                       break;
+               }
+               default: {
+                       storeCommand(UC);

                        break;
                        break;

+               }

        }
 
        }
 

-       storeCommand(UC);

 }
 
 }