CHG: fix covertyscan error CID 133851, Cardstate can't not be SIM_NOFIELD when...

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 04d8ad7aeab68a6647b59e89b7a56bff35e5255c..dc44a55cb7769baf3e989f8f561818ff05022630 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "cmdscript.h"
 #include "cmdcrc.h"
-
+#include "cmdanalyse.h"
 
 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."},
+       {"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.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}
@@ -191,9 +192,9 @@ void UsbCommandReceived(UsbCommand *UC)
                                printf("\r#db# %s", s);
                                fflush(stdout);
                        }
-                       else 
+                       else {
                                PrintAndLog("#db# %s", s);
-                       
+                       }
                        return;
                } break;
 
@@ -203,7 +204,12 @@ void UsbCommandReceived(UsbCommand *UC)
                }
                case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
                case CMD_DOWNLOADED_EML_BIGBUF: {
+                       // sample_buf is a array pointer, located in data.c
+                       // arg0 = offset in transfer. Startindex of this chunk
+                       // arg1 = length bytes to transfer
+                       // arg2 = bigbuff tracelength (?)
                        memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
+                       //printf("DBG:: Download from device. chunk %llu | size %llu | tracelen:%llu \n", UC->arg[0], UC->arg[1], UC->arg[2]);
                        break;
                }
                default: {