X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/523f4c90a1e0558200c411f9827f8190aa761f02..bb4d2cca76aae4b9fee4289dfdbe8f904b439053:/winsrc/command.cpp?ds=sidebyside

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index c1b3e372..da0f2388 100644
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -2272,9 +2272,11 @@ static void Cmdaskdemod(char *str) {
 	int c, high = 0, low = 0;
 
 	// TODO: complain if we do not give 2 arguments here !
+	// (AL - this doesn't make sense! we're only using one argument!!!)
 	sscanf(str, "%i", &c);
 
 	/* Detect high and lows and clock */
+	// (AL - clock???)
 	for (i = 0; i < GraphTraceLen; i++)
 	{
 		if (GraphBuffer[i] > high)
@@ -2282,6 +2284,10 @@ static void Cmdaskdemod(char *str) {
 		else if (GraphBuffer[i] < low)
 			low = GraphBuffer[i];
 	}
+	if(c != 0 && c != 1) {
+		PrintToScrollback("Invalid argument: %s",str);
+		return;
+		}
 
 	if (GraphBuffer[0] > 0) {
 		GraphBuffer[0] = 1-c;
@@ -2526,7 +2532,12 @@ static void Cmdmanchesterdemod(char *str) {
 
 	/* Detect first transition */
 	/* Lo-Hi (arbitrary)       */
-	for (i = 0; i < GraphTraceLen; i++)
+	/* skip to the first high */
+	for (i= 0; i < GraphTraceLen; i++)
+		if(GraphBuffer[i] == high)
+			break;
+	/* now look for the first low */
+	for (; i < GraphTraceLen; i++)
 	{
 		if (GraphBuffer[i] == low)
 		{
@@ -2819,6 +2830,22 @@ static void CmdSetDivisor(char *str)
 	}
 }
 
+static void CmdSetMux(char *str)
+{
+	UsbCommand c;
+	c.cmd = CMD_SET_ADC_MUX;
+	if(strncasecmp(str, "lopkd", 5) == 0) {
+		c.ext1 = 0;
+	} else if(strncasecmp(str, "loraw", 5) == 0) {
+		c.ext1 = 1;
+	} else if(strncasecmp(str, "hipkd", 5) == 0) {
+		c.ext1 = 2;
+	} else if(strncasecmp(str, "hiraw", 5) == 0) {
+		c.ext1 = 3;
+	}
+	SendCommand(&c, FALSE);
+}
+
 typedef void HandlerFunction(char *cmdline);
 
 /* in alphabetic order */
@@ -2829,7 +2856,7 @@ static struct {
 	char		*docString;
 } CommandTable[] = {
 	{"amp",					CmdAmp,						1, "Amplify peaks"},
-	{"askdemod",			Cmdaskdemod,				1, "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},
+	{"askdemod",			Cmdaskdemod,				1, "<0|1> -- Attempt to demodulate simple ASK tags"},
 	{"autocorr",			CmdAutoCorr,				1, "<window length> -- Autocorrelation over window"},
 	{"bitsamples",		CmdBitsamples,			0, "Get raw samples as bitstring"},
 	{"bitstream",			Cmdbitstream,				1, "[clock rate] -- Convert waveform into a bitstream"},
@@ -2890,6 +2917,7 @@ static struct {
 	{"save",					CmdSave,						1, "<filename> -- Save trace (from graph window)"},
 	{"scale",					CmdScale,						1, "<int> -- Set cursor display scale"},
 	{"setlfdivisor",	CmdSetDivisor,			0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+	{"setmux",		CmdSetMux,			0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
 	{"sri512read",		CmdSri512read,			0, "<int> -- Read contents of a SRI512 tag"},
 	{"tidemod",				CmdTIDemod,					1, "Demodulate raw bits for TI-type LF tag"},
 	{"tiread",				CmdTIRead,					0, "Read and decode a TI 134 kHz tag"},