X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/15db5fb71a07c6f7431ebdaff78f53df3c4fe022..ac174b297a8d16b138186d4c5543c11a9572515c:/winsrc/command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index 0397ea37..3fa75431 100644
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -52,6 +52,13 @@ static void CmdReset(char *str)
 	SendCommand(&c, FALSE);
 }
 
+static void CmdBuffClear(char *str)
+{
+	UsbCommand c;
+	c.cmd = CMD_BUFF_CLEAR;
+	SendCommand(&c, FALSE);
+	CmdClearGraph(TRUE);
+}
 
 static void CmdQuit(char *str)
 {
@@ -262,6 +269,7 @@ static void CmdEM410xread(char *str)
 	int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low;
 	int parity[4];
 	char id[11];
+	int retested = 0;
 	int BitStream[MAX_GRAPH_TRACE_LEN];
 	high = low = 0;
 
@@ -307,14 +315,15 @@ static void CmdEM410xread(char *str)
 			if (hithigh && hitlow)
 				break;
 		}
-
+		
 		/* If we didn't hit both high and low peaks, we had a bit transition */
 		if (!hithigh || !hitlow)
 			bit ^= 1;
-
+		
 		BitStream[bit2idx++] = bit;
 	}
-
+	
+retest:
 	/* We go till 5 before the graph ends because we'll get that far below */
 	for (i = 1; i < bit2idx - 5; i++)
 	{
@@ -363,7 +372,7 @@ static void CmdEM410xread(char *str)
 
 				/* Stop any loops */
 				go = 0;
-				break;
+				return;
 			}
 
 			/* Crap! Incorrect parity or no stop bit, start all over */
@@ -388,6 +397,16 @@ static void CmdEM410xread(char *str)
 				header = 0;
 		}
 	}
+	
+	/* if we've already retested after flipping bits, return */
+	if (retested++)
+		return;
+
+	/* if this didn't work, try flipping bits */
+	for (i = 0; i < bit2idx; i++)
+		BitStream[i] ^= 1;
+
+	goto retest;
 }
 
 /* emulate an EM410X tag
@@ -1862,7 +1881,7 @@ static void Cmdaskdemod(char *str) {
 		 * - we're high: transition if we hit a low
 		 * (we need to do it this way because some tags keep high or
 		 * low for long periods, others just reach the peak and go
-		 * down)
+		 * down)
 		 */
 		if ((GraphBuffer[i]==high) && (GraphBuffer[i-1] == c)) {
 					GraphBuffer[i]=1-c;
@@ -2046,7 +2065,7 @@ static void Cmdmanchestermod(char *str)
  *               Typical values can be 64, 32, 128...
  */
 static void Cmdmanchesterdemod(char *str) {
-	int i, j;
+	int i, j, invert= 0;
 	int bit;
 	int clock;
 	int lastval;
@@ -2058,6 +2077,16 @@ static void Cmdmanchesterdemod(char *str) {
 	int bit2idx = 0;
 	int warnings = 0;
 
+	/* check if we're inverting output */
+ 	if(*str == 'i')
+	{
+		PrintToScrollback("Inverting output");
+		invert= 1;
+		do
+			++str;
+		while(*str == ' '); // in case a 2nd argument was given
+	}
+
 	/* Holds the decoded bitstream: each clock period contains 2 bits       */
 	/* later simplified to 1 bit after manchester decoding.                 */
 	/* Add 10 bits to allow for noisy / uncertain traces without aborting   */
@@ -2128,7 +2157,7 @@ static void Cmdmanchesterdemod(char *str) {
 			if (!hithigh || !hitlow)
 				bit ^= 1;
 
-			BitStream[bit2idx++] = bit;
+			BitStream[bit2idx++] = bit ^ invert;
 		}
 	}
 
@@ -2136,7 +2165,7 @@ static void Cmdmanchesterdemod(char *str) {
 	else
 	{
 
-	/* Then detect duration between 2 successive transitions */
+		/* Then detect duration between 2 successive transitions */
 		for (bitidx = 1; i < GraphTraceLen; i++)
 		{
 			if (GraphBuffer[i-1] != GraphBuffer[i])
@@ -2171,18 +2200,18 @@ static void Cmdmanchesterdemod(char *str) {
 						PrintToScrollback("Error: too many detection errors, aborting.");
 						return;
 					}
+				}
 			}
 		}
-	}
 
-	// At this stage, we now have a bitstream of "01" ("1") or "10" ("0"), parse it into final decoded bitstream
-	// Actually, we overwrite BitStream with the new decoded bitstream, we just need to be careful
-	// to stop output at the final bitidx2 value, not bitidx
-	for (i = 0; i < bitidx; i += 2) {
-		if ((BitStream[i] == 0) && (BitStream[i+1] == 1)) {
-			BitStream[bit2idx++] = 1;
+		// At this stage, we now have a bitstream of "01" ("1") or "10" ("0"), parse it into final decoded bitstream
+		// Actually, we overwrite BitStream with the new decoded bitstream, we just need to be careful
+		// to stop output at the final bitidx2 value, not bitidx
+		for (i = 0; i < bitidx; i += 2) {
+			if ((BitStream[i] == 0) && (BitStream[i+1] == 1)) {
+				BitStream[bit2idx++] = 1 ^ invert;
 		} else if ((BitStream[i] == 1) && (BitStream[i+1] == 0)) {
-			BitStream[bit2idx++] = 0;
+			BitStream[bit2idx++] = 0 ^ invert;
 		} else {
 			// We cannot end up in this state, this means we are unsynchronized,
 			// move up 1 bit:
@@ -2196,8 +2225,8 @@ static void Cmdmanchesterdemod(char *str) {
 					PrintToScrollback("Error: too many decode errors, aborting.");
 					return;
 				}
-		}
-	}
+			}
+		}	
 	}
 
 	PrintToScrollback("Manchester decoded bitstream");
@@ -2384,6 +2413,7 @@ static struct {
 	"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",
+	"buffclear",		CmdBuffClear,0,		"    Clear sample buffer and graph window",
 	"dec",				CmdDec,1,		"    Decimate samples",
 	"detectclock",		Cmddetectclockrate,1, "    Detect clock rate",
 	"em410xsim",		CmdEM410xsim,1,		"<UID> -- Simulate EM410x tag",
@@ -2424,7 +2454,7 @@ static struct {
 	"losamples",		CmdLosamples,0,		"[128 - 16000] -- Get raw samples for LF tag",
 	"losim",			CmdLosim,0,		"    Simulate LF tag",
 	"ltrim",			CmdLtrim,1,		"<samples> -- Trim samples from left of trace",
-	"mandemod",			Cmdmanchesterdemod,1,	"[clock rate] -- Try a Manchester demodulation on a binary stream",
+	"mandemod",			Cmdmanchesterdemod,1,	"[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)",
 	"manmod",			Cmdmanchestermod,1,	"[clock rate] -- Manchester modulate a binary stream",
 	"norm",				CmdNorm,1,		"    Normalize max/min to +/-500",
 	"plot",				CmdPlot,1,		"    Show graph window",