X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4db2af08cdd040abc9388e95033257bfe878a044..5215a874429bf41ec24c83d6d5f631233faf3d76:/client/cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index e75211e6..374f8166 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 '<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.44"},
+	{"script",	CmdScript,	1, "{ Scripting commands }"},	
 	{"quit",	CmdQuit,	1, "Exit program"},
 	{"exit",	CmdQuit,	1, "Exit program"},
 	{NULL, NULL, 0, NULL}
@@ -120,6 +121,7 @@ int getCommand(UsbCommand* response)
     //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;
 
@@ -146,12 +148,12 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
 	for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
 
 		while( getCommand(response) ) {
-			if(response->cmd == cmd){
-				return true;
-			}
+			if(response->cmd == cmd)
+				return true;			
 		}
+
 		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");
 		}
@@ -180,23 +182,36 @@ void UsbCommandReceived(UsbCommand *UC)
 	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);
-			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: {
-			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: {
-			memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
-			return;
-		} 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_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 %" PRIu64 " | size %" PRIu64 " | tracelen:%" PRIu64 " \n", UC->arg[0], UC->arg[1], UC->arg[2]);
+			break;
+		}
 		default: {
 			storeCommand(UC);
 			break;