X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/051643995984009593bcb8180ff9f9d570af7df5..1c07ca92c3b9338697a0f2fc0e41790164815aeb:/client/cmdmain.c?ds=sidebyside diff --git a/client/cmdmain.c b/client/cmdmain.c index 790a0c37..dc44a55c 100644 --- 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 ' 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} @@ -185,18 +186,32 @@ 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); - 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; - 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; - + } 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: { storeCommand(UC); break;