X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7bb9d33e2c2dccd700db53468d58e7b6f5b796c6..7bd30f12ac6def96c82df20ed7d927160db289af:/client/cmdhf15.c

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index cbc0ae12..55a33de7 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -33,7 +33,7 @@
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf15.h"
-#include "iso15693tools.h"
+#include "../common/iso15693tools.h"
 #include "cmdmain.h"
 
 #define FrameSOF              Iso15693FrameSOF
@@ -44,8 +44,7 @@
 #define Crc(data,datalen)     Iso15693Crc(data,datalen)
 #define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)	Iso15693sprintUID(target,uid)
-
-static int CmdHelp(const char *Cmd);
+#define TRACE_BUFF_SIZE 12000
 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
@@ -254,6 +253,17 @@ int CmdHF15Read(const char *Cmd)
 {
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693};
 	SendCommand(&c);
+
+	uint8_t data[TRACE_BUFF_SIZE] = {0x00};
+	
+	GetFromBigBuf(data,TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
+	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+	for (int j = 0; j < TRACE_BUFF_SIZE; j++) {
+		GraphBuffer[j] = ((int)data[j]) ;
+	}
+	GraphTraceLen = TRACE_BUFF_SIZE;
+	RepaintGraphWindow();
 	return 0;
 }
 
@@ -262,6 +272,17 @@ int CmdHF15Record(const char *Cmd)
 {
 	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693};
 	SendCommand(&c);
+
+	uint8_t data[TRACE_BUFF_SIZE] = {0x00};
+	
+	GetFromBigBuf(data,TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
+	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+	for (int j = 0; j < TRACE_BUFF_SIZE; j++) {
+		GraphBuffer[j] = ((int)data[j]) ;
+	}
+	GraphTraceLen = TRACE_BUFF_SIZE;
+	RepaintGraphWindow();
 	return 0;
 }
 
@@ -423,8 +444,9 @@ int CmdHF15CmdInquiry(const char *Cmd)
 int CmdHF15CmdDebug( const char *cmd) {
 	int debug=atoi(cmd);
 	if (strlen(cmd)<1) {
-		PrintAndLog("Usage: hf 15 cmd debug  <0/1>");
-		PrintAndLog("	0..no debugging output  1..turn debugging on");	
+		PrintAndLog("Usage: hf 15 cmd debug  <0|1>");
+		PrintAndLog("	0 no debugging");
+		PrintAndLog("	1 turn debugging on");	
 		return 0;
 	}