FIX: "hf mf hardnested" when "key found" exting the do-while loop doesn't need to...

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 58783030d24e4b8db1097654ef85d03d5db7c750..1ddf219a953d22be3725570e15cfbeecf8da7f62 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "cmdscript.h"
 #include "cmdcrc.h"
 #include "util.h"
 #include "cmdscript.h"
 #include "cmdcrc.h"

-
+#include "cmdanalyse.h"

 
 unsigned int current_command = CMD_UNKNOWN;
 
 
 unsigned int current_command = CMD_UNKNOWN;
 


@@ -45,12 +45,13 @@ static int cmd_tail;//Starts as 0
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},
 static command_t CommandTable[] = 
 {
        {"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... }"},
        {"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.30"},
-       {"script",      CmdScript,      1, "{ Scripting 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}
        {"quit",        CmdQuit,        1, "Exit program"},
        {"exit",        CmdQuit,        1, "Exit program"},
        {NULL, NULL, 0, NULL}


@@ -152,7 +153,7 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
                }
 
                msleep(10); // XXX ugh
                }
 
                msleep(10); // XXX ugh

-               if (dm_seconds == 200) { // Two seconds elapsed
+               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");
                }
                        PrintAndLog("Waiting for a response from the proxmark...");
                        PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
                }


@@ -185,18 +186,27 @@ void UsbCommandReceived(UsbCommand *UC)
                        memset(s, 0x00, sizeof(s)); 
                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        memcpy(s, UC->d.asBytes, len);
                        memset(s, 0x00, sizeof(s)); 
                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        memcpy(s, UC->d.asBytes, len);

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

                        return;
                } break;
 
                        return;
                } break;
 

-               case CMD_DEBUG_PRINT_INTEGERS:
+               case CMD_DEBUG_PRINT_INTEGERS: {

                        PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]);
                        break;
                        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_RAW_ADC_SAMPLES_125K:

+               case CMD_DOWNLOADED_EML_BIGBUF: {

                        memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
                        break;
                        memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
                        break;

-
+               }

                default: {
                        storeCommand(UC);
                        break;
                default: {
                        storeCommand(UC);
                        break;