X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/218103efd33433c4e728e8f5624506e1d3a011bf..8040711b9026716982b6909cc2c9abdbb930a583:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 2563cb18..2e363054 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -8,25 +8,26 @@
 // Data and Graph commands
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include "proxmark3.h"
-#include "data.h"
-#include "ui.h"
-#include "graph.h"
-#include "cmdparser.h"
+#include <stdio.h>    // also included in util.h
+#include <string.h>   // also included in util.h
+#include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
+#include "data.h"     // also included in util.h
+#include "cmddata.h"
 #include "util.h"
 #include "cmdmain.h"
-#include "cmddata.h"
-#include "lfdemod.h"
-#include "usb_cmd.h"
-#include "crc.h"
+#include "proxmark3.h"
+#include "ui.h"       // for show graph controls
+#include "graph.h"    // for graph data
+#include "cmdparser.h"// already included in cmdmain.h
+#include "usb_cmd.h"  // already included in cmdmain.h and proxmark3.h
+#include "lfdemod.h"  // for demod code
+#include "crc.h"      // for pyramid checksum maxim
+#include "crc16.h"    // for FDXB demod checksum
+#include "loclass/cipherutils.h" // for decimating samples in getsamples
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
-uint8_t g_debugMode;
-int DemodBufferLen;
+uint8_t g_debugMode=0;
+size_t DemodBufferLen=0;
 static int CmdHelp(const char *Cmd);
 
 //set the demod buffer with given array of binary (one bit per byte)
@@ -55,164 +56,89 @@ int CmdSetDebugMode(const char *Cmd)
 	return 1;
 }
 
+int usage_data_printdemodbuf(){
+		PrintAndLog("Usage: data printdemodbuffer x o <offset> l <length>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h          This help");
+	PrintAndLog("       x          output in hex (omit for binary output)");
+	PrintAndLog("       o <offset> enter offset in # of bits");
+		PrintAndLog("       l <length> enter length to print in # of bits or hex characters respectively");
+	return 0;	
+}
+
 //by marshmellow
 void printDemodBuff(void)
 {
-	uint32_t i = 0;
 	int bitLen = DemodBufferLen;
-	if (bitLen<16) {
+	if (bitLen<1) {
 		PrintAndLog("no bits found in demod buffer");
 		return;
 	}
 	if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
 
-	// ensure equally divided by 16
-	bitLen &= 0xfff0;
-
-	for (i = 0; i <= (bitLen-16); i+=16) {
-		PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
-		    DemodBuffer[i],
-		    DemodBuffer[i+1],
-		    DemodBuffer[i+2],
-		    DemodBuffer[i+3],
-		    DemodBuffer[i+4],
-		    DemodBuffer[i+5],
-		    DemodBuffer[i+6],
-		    DemodBuffer[i+7],
-		    DemodBuffer[i+8],
-		    DemodBuffer[i+9],
-		    DemodBuffer[i+10],
-		    DemodBuffer[i+11],
-		    DemodBuffer[i+12],
-		    DemodBuffer[i+13],
-		    DemodBuffer[i+14],
-		    DemodBuffer[i+15]
-		);
-	}
+	char *bin = sprint_bin_break(DemodBuffer,bitLen,16);
+	PrintAndLog("%s",bin);
+
 	return;
 }
 
 int CmdPrintDemodBuff(const char *Cmd)
 {
-	char hex;
-	char printBuff[512]={0x00};
-	uint8_t numBits = DemodBufferLen & 0xFFF0;
-	sscanf(Cmd, "%c", &hex);
-	if (hex == 'h'){
-		PrintAndLog("Usage: data printdemodbuffer [x]");
-		PrintAndLog("Options:        ");
-		PrintAndLog("       h       This help");
-		PrintAndLog("       x       output in hex (omit for binary output)");
-		return 0;
-	}
-	if (hex == 'x'){
-		numBits = binarraytohex(printBuff, (char *)DemodBuffer, numBits);
-		if (numBits==0) return 0;
-		PrintAndLog("DemodBuffer: %s",printBuff);
-	} else {
-		printDemodBuff();
-	}
-	return 1;
-}
-int CmdAmp(const char *Cmd)
-{
-	int i, rising, falling;
-	int max = INT_MIN, min = INT_MAX;
-
-	for (i = 10; i < GraphTraceLen; ++i) {
-		if (GraphBuffer[i] > max)
-			max = GraphBuffer[i];
-		if (GraphBuffer[i] < min)
-			min = GraphBuffer[i];
-	}
-
-	if (max != min) {
-		rising = falling= 0;
-		for (i = 0; i < GraphTraceLen; ++i) {
-			if (GraphBuffer[i + 1] < GraphBuffer[i]) {
-				if (rising) {
-					GraphBuffer[i] = max;
-					rising = 0;
-				}
-				falling = 1;
-			}
-			if (GraphBuffer[i + 1] > GraphBuffer[i]) {
-				if (falling) {
-					GraphBuffer[i] = min;
-					falling = 0;
-				}
-				rising= 1;
-			}
+	char hex[512]={0x00};
+	bool hexMode = false;
+	bool errors = false;
+	uint32_t offset = 0; //could be size_t but no param_get16...
+	uint32_t length = 512;
+	char cmdp = 0;
+	while(param_getchar(Cmd, cmdp) != 0x00)
+	{
+		switch(param_getchar(Cmd, cmdp))
+		{
+		case 'h':
+		case 'H':
+			return usage_data_printdemodbuf();
+		case 'x':
+		case 'X':
+			hexMode = true;
+			cmdp++;
+			break;
+		case 'o':
+		case 'O':
+			offset = param_get32ex(Cmd, cmdp+1, 0, 10);
+			if (!offset) errors = true;
+			cmdp += 2;
+			break;
+		case 'l':
+		case 'L':
+			length = param_get32ex(Cmd, cmdp+1, 512, 10);
+			if (!length) errors = true;
+			cmdp += 2;
+			break;
+		default:
+			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
 		}
+		if(errors) break;
 	}
-	RepaintGraphWindow();
-	return 0;
-}
+	//Validations
+	if(errors) return usage_data_printdemodbuf();
+	length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; 
+	int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
-/*
- * Generic command to demodulate ASK.
- *
- * Argument is convention: positive or negative (High mod means zero
- * or high mod means one)
- *
- * Updates the Graph trace with 0/1 values
- *
- * Arguments:
- * c : 0 or 1  (or invert)
- */
- //this method ignores the clock
-
- //this function strictly converts highs and lows to 1s and 0s for each sample in the graphbuffer
-int Cmdaskdemod(const char *Cmd)
-{
-	int i;
-	int c, high = 0, low = 0;
-
-	sscanf(Cmd, "%i", &c);
-
-	/* Detect high and lows */
-	for (i = 0; i < GraphTraceLen; ++i)
-	{
-		if (GraphBuffer[i] > high)
-			high = GraphBuffer[i];
-		else if (GraphBuffer[i] < low)
-			low = GraphBuffer[i];
-	}
-	high=abs(high*.75);
-	low=abs(low*.75);
-	if (c != 0 && c != 1) {
-		PrintAndLog("Invalid argument: %s", Cmd);
-		return 0;
-	}
-	//prime loop
-	if (GraphBuffer[0] > 0) {
-		GraphBuffer[0] = 1-c;
+	if (hexMode){
+		char *buf = (char *) (DemodBuffer + offset);
+		numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
+		numBits = binarraytohex(hex, buf, numBits);
+		if (numBits==0) return 0;
+		PrintAndLog("DemodBuffer: %s",hex);		
 	} else {
-		GraphBuffer[0] = c;
-	}
-	for (i = 1; i < GraphTraceLen; ++i) {
-		/* Transitions are detected at each peak
-		 * Transitions are either:
-		 * - we're low: transition if we hit a high
-		 * - 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)
-		 */
-		//[marhsmellow] change == to >= for high and <= for low for fuzz
-		if ((GraphBuffer[i] >= high) && (GraphBuffer[i - 1] == c)) {
-			GraphBuffer[i] = 1 - c;
-		} else if ((GraphBuffer[i] <= low) && (GraphBuffer[i - 1] == (1 - c))){
-			GraphBuffer[i] = c;
-		} else {
-			/* No transition */
-			GraphBuffer[i] = GraphBuffer[i - 1];
-		}
+		PrintAndLog("DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset,numBits,16));
 	}
-	RepaintGraphWindow();
-	return 0;
+	return 1;
 }
 
+//by marshmellow
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
 int CmdGetBitStream(const char *Cmd)
 {
@@ -229,43 +155,6 @@ int CmdGetBitStream(const char *Cmd)
 	return 0;
 }
 
-
-//by marshmellow
-void printBitStream(uint8_t BitStream[], uint32_t bitLen)
-{
-	uint32_t i = 0;
-	if (bitLen<16) {
-		PrintAndLog("Too few bits found: %d",bitLen);
-		return;
-	}
-	if (bitLen>512) bitLen=512;
-
-		// ensure equally divided by 16
-	bitLen &= 0xfff0;
-
-
-	for (i = 0; i <= (bitLen-16); i+=16) {
-		PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
-		    BitStream[i],
-		    BitStream[i+1],
-		    BitStream[i+2],
-		    BitStream[i+3],
-		    BitStream[i+4],
-		    BitStream[i+5],
-		    BitStream[i+6],
-		    BitStream[i+7],
-		    BitStream[i+8],
-		    BitStream[i+9],
-		    BitStream[i+10],
-		    BitStream[i+11],
-		    BitStream[i+12],
-		    BitStream[i+13],
-		    BitStream[i+14],
-		    BitStream[i+15]
-		);
-	}
-	return;
-}
 //by marshmellow
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
@@ -282,11 +171,11 @@ void printEM410x(uint32_t hi, uint64_t id)
 		}
 		if (hi){
 			//output 88 bit em id
-			PrintAndLog("\nEM TAG ID      : %06x%016llx", hi, id);
+			PrintAndLog("\nEM TAG ID      : %06X%016llX", hi, id);
 		} else{
 			//output 40 bit em id
-			PrintAndLog("\nEM TAG ID      : %010llx", id);
-			PrintAndLog("Unique TAG ID  : %010llx",  id2lo);
+			PrintAndLog("\nEM TAG ID      : %010llX", id);
+			PrintAndLog("Unique TAG ID  : %010llX",  id2lo);
 			PrintAndLog("\nPossible de-scramble patterns");
 			PrintAndLog("HoneyWell IdentKey {");
 			PrintAndLog("DEZ 8          : %08lld",id & 0xFFFFFF);
@@ -311,7 +200,7 @@ void printEM410x(uint32_t hi, uint64_t id)
 			);
 			uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
 			PrintAndLog("}\nOther          : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-      PrintAndLog("Pattern Paxton  : %lld [0x%llX]", paxton, paxton);
+			PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton);
 
 			uint32_t p1id = (id & 0xFFFFFF);
 			uint8_t arr[32] = {0x00};
@@ -352,33 +241,46 @@ void printEM410x(uint32_t hi, uint64_t id)
 			p1 |= arr[2]  << 4;
 			p1 |= arr[1]  << 5;
 			p1 |= arr[0]  << 9;
-	PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
+			PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
 
 			uint16_t sebury1 = id & 0xFFFF;
 			uint8_t  sebury2 = (id >> 16) & 0x7F;
 			uint32_t sebury3 = id & 0x7FFFFF;
-      PrintAndLog("Pattern Sebury  : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+			PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
 		}
 	}
 	return;
 }
 
-
-int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo)
+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
-	int ans = ASKmanDemod(Cmd, FALSE, FALSE);
-	if (!ans) return 0;
-
-	size_t idx=0;
-	if (Em410xDecode(DemodBuffer,(size_t *) &DemodBufferLen, &idx, hi, lo)){
+	size_t idx = 0;
+	size_t BitLen = DemodBufferLen;
+	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+	memcpy(BitStream, DemodBuffer, BitLen); 
+	if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){
+		//set GraphBuffer for clone or sim command
+		setDemodBuf(BitStream, BitLen, idx);
 		if (g_debugMode){
-			PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, DemodBufferLen);
+			PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
 			printDemodBuff();
 		}
+		if (verbose){
+			PrintAndLog("EM410x pattern found: ");
+			printEM410x(*hi, *lo);
+		}
 		return 1;
 	}
 	return 0;
 }
+
+int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)
+{
+	bool st = TRUE;
+	if (!ASKDemod_ext(Cmd, FALSE, FALSE, 1, &st)) return 0;
+	return AskEm410xDecode(verbose, hi, lo);
+}
+
 //by marshmellow
 //takes 3 arguments - clock, invert and maxErr as integers
 //attempts to demodulate ask while decoding manchester
@@ -399,24 +301,27 @@ int CmdAskEM410xDemod(const char *Cmd)
 		PrintAndLog("          : data askem410xdemod 64 1 0 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/64 and inverting data and allowing 0 demod errors");
 		return 0;
 	}
-	uint32_t hi = 0;
 	uint64_t lo = 0;
-	if (AskEm410xDemod(Cmd, &hi, &lo)) {
-		PrintAndLog("EM410x pattern found: ");
-		printEM410x(hi, lo);
-		return 1;
-	}
-	return 0;
+	uint32_t hi = 0;
+	return AskEm410xDemod(Cmd, &hi, &lo, true);
 }
 
-int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch)
-{
+//by marshmellow
+//Cmd Args: Clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
+//   (amp may not be needed anymore)
+//verbose will print results and demoding messages
+//emSearch will auto search for EM410x format in bitstream
+//askType switches decode: ask/raw = 0, ask/manchester = 1 
+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
 	int invert=0;
 	int clk=0;
 	int maxErr=100;
-	
+	int maxLen=0;
+	uint8_t askAmp = 0;
+	char amp = param_getchar(Cmd, 0);
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
+	sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
+	if (!maxLen) maxLen = BIGBUF_SIZE;
 	if (invert != 0 && invert != 1) {
 		PrintAndLog("Invalid argument: %s", Cmd);
 		return 0;
@@ -425,56 +330,67 @@ int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch)
 		invert=1;
 		clk=0;
 	}
+	if (amp == 'a' || amp == 'A') askAmp=1; 
 	size_t BitLen = getFromGraphBuf(BitStream);
-	if (g_debugMode==1) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
-	if (BitLen==0) return 0;
-	int errCnt=0;
-	errCnt = askmandemod(BitStream, &BitLen, &clk, &invert, maxErr);
-	if (errCnt<0||BitLen<16){  //if fatal error (or -1)
-		if (g_debugMode==1) PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
+	if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
+	if (BitLen<255) return 0;
+	if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
+	int foundclk = 0;
+	bool st = false;
+	if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
+	if (st) {
+		*stCheck = st;
+		clk = (clk == 0) ? foundclk : clk;
+		if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
+	}
+	int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);
+	if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
+		if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
 		return 0;
 	}
-	if (verbose || g_debugMode) PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);
+	if (errCnt>maxErr){
+		if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);
+		return 0;
+	}
+	if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen);
 
 	//output
-	if (errCnt>0){
-		if (verbose || g_debugMode) PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
-	}
-	if (verbose || g_debugMode) PrintAndLog("ASK/Manchester decoded bitstream:");
-	// Now output the bitstream to the scrollback by line of 16 bits
 	setDemodBuf(BitStream,BitLen,0);
-	if (verbose || g_debugMode) printDemodBuff();
-	uint64_t lo =0;
-	uint32_t hi =0;
-	size_t idx=0;
+	if (verbose || g_debugMode){
+		if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
+		if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+		else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
+		// Now output the bitstream to the scrollback by line of 16 bits
+		printDemodBuff();
+		
+	}
+	uint64_t lo = 0;
+	uint32_t hi = 0;
 	if (emSearch){
-		if (Em410xDecode(BitStream, &BitLen, &idx, &hi, &lo)){
-			//set GraphBuffer for clone or sim command
-			setDemodBuf(BitStream, BitLen, idx);
-			if (g_debugMode){
-				PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
-				printDemodBuff();
-			}
-			if (verbose) PrintAndLog("EM410x pattern found: ");
-			if (verbose) printEM410x(hi, lo);
-			return 1;
-		}
+		AskEm410xDecode(true, &hi, &lo);
 	}
 	return 1;
 }
+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
+	bool st = false;
+	return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);
+}
 
 //by marshmellow
-//takes 3 arguments - clock, invert, maxErr as integers
+//takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskmandemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  data rawdemod am [clock] <0|1> [maxError]");
-		PrintAndLog("     [set clock as integer] optional, if not set, autodetect.");
-		PrintAndLog("     <invert>, 1 for invert output");
-		PrintAndLog("     [set maximum allowed errors], default = 100.");
+	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
+		PrintAndLog("     ['s'] optional, check for Sequence Terminator");
+		PrintAndLog("     [set clock as integer] optional, if not set, autodetect");
+		PrintAndLog("     <invert>, 1 to invert output");
+		PrintAndLog("     [set maximum allowed errors], default = 100");
+		PrintAndLog("     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
+		PrintAndLog("     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
 		PrintAndLog("");
 		PrintAndLog("    sample: data rawdemod am        = demod an ask/manchester tag from GraphBuffer");
 		PrintAndLog("          : data rawdemod am 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
@@ -483,7 +399,13 @@ int Cmdaskmandemod(const char *Cmd)
 		PrintAndLog("          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
 		return 0;
 	}
-	return ASKmanDemod(Cmd, TRUE, TRUE);
+	bool st = TRUE;
+	if (Cmd[0]=='s') 
+		return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st);
+	else if (Cmd[1] == 's')
+		return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st);
+	else
+	return ASKDemod(Cmd, TRUE, TRUE, 1);
 }
 
 //by marshmellow
@@ -494,12 +416,15 @@ int Cmdmandecoderaw(const char *Cmd)
 	int i =0;
 	int errCnt=0;
 	size_t size=0;
-	size_t maxErr = 20;
+	int invert=0;
+	int maxErr = 20;
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  data manrawdecode");
+	if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  data manrawdecode [invert] [maxErr]");
 		PrintAndLog("     Takes 10 and 01 and converts to 0 and 1 respectively");
 		PrintAndLog("     --must have binary sequence in demodbuffer (run data askrawdemod first)");
+		PrintAndLog("  [invert]  invert output");		
+		PrintAndLog("  [maxErr]  set number of errors allowed (default = 20)");		
 		PrintAndLog("");
 		PrintAndLog("    sample: data manrawdecode   = decode manchester bitstream from the demodbuffer");
 		return 0;
@@ -512,18 +437,20 @@ int Cmdmandecoderaw(const char *Cmd)
 		else if(DemodBuffer[i]<low) low=DemodBuffer[i];
 		BitStream[i]=DemodBuffer[i];
 	}
-	if (high>1 || low <0 ){
-    PrintAndLog("Error: please raw demod the wave first then manchester raw decode");
+	if (high>7 || low <0 ){
+		PrintAndLog("Error: please raw demod the wave first then manchester raw decode");
 		return 0;
 	}
+
+	sscanf(Cmd, "%i %i", &invert, &maxErr);
 	size=i;
-	errCnt=manrawdecode(BitStream, &size);
+	errCnt=manrawdecode(BitStream, &size, invert);
 	if (errCnt>=maxErr){
 		PrintAndLog("Too many errors: %d",errCnt);
 		return 0;
 	}
 	PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
-	printBitStream(BitStream, size);
+	PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
 	if (errCnt==0){
 		uint64_t id = 0;
 		uint32_t hi = 0;
@@ -543,11 +470,7 @@ int Cmdmandecoderaw(const char *Cmd)
 //take 01 or 10 = 0 and 11 or 00 = 1
 //takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit
 // and "invert" default = 0 if 1 it will invert output
-//  since it is not like manchester and doesn't have an incorrect bit pattern we
-//  cannot determine if our decode is correct or if it should be shifted by one bit
-//  the argument offset allows us to manually shift if the output is incorrect
-//  (better would be to demod and decode at the same time so we can distinguish large
-//    width waves vs small width waves to help the decode positioning) or askbiphdemod
+//  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
 int CmdBiphaseDecodeRaw(const char *Cmd)
 {
 	size_t size=0;
@@ -586,111 +509,34 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 	}
 
 	if (errCnt>0){
-		PrintAndLog("# Errors found during Demod (shown as 77 in bit stream): %d",errCnt);
+		PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
 	}
 	PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
-	printBitStream(BitStream, size);
+	PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
 	
 	if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);  //remove first bit from raw demod
 	return 1;
 }
 
-// set demod buffer back to raw after biphase demod
-void setBiphasetoRawDemodBuf(uint8_t *BitStream, size_t size)
-{
-	uint8_t rawStream[512]={0x00};
-	size_t i=0;
-	uint8_t curPhase=0;
-	if (size > 256) {
-		PrintAndLog("ERROR - Biphase Demod Buffer overrun");
-		return;
-	}
-	for (size_t idx=0; idx<size; idx++){
-		if(!BitStream[idx]){
-			rawStream[i++] = curPhase;
-			rawStream[i++] = curPhase;
-			curPhase ^= 1; 
-		} else {
-			rawStream[i++] = curPhase;
-			rawStream[i++] = curPhase ^ 1;
-		}
-	}
-	setDemodBuf(rawStream,i,0);
-	return;
-}
-
-//by marshmellow
-//takes 4 arguments - clock, invert, maxErr as integers and amplify as char
-//attempts to demodulate ask only
-//prints binary found and saves in graphbuffer for further commands
-int ASKrawDemod(const char *Cmd, bool verbose)
-{
-	int invert=0;
-	int clk=0;
-	int maxErr=100;
-	uint8_t askAmp = 0;
-	char amp = param_getchar(Cmd, 0);
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-	sscanf(Cmd, "%i %i %i %c", &clk, &invert, &maxErr, &amp);
-		
-	if (invert != 0 && invert != 1) {
-		if (verbose || g_debugMode) PrintAndLog("Invalid argument: %s", Cmd);
-		return 0;
-	}
-	if (clk==1){
-		invert=1;
-		clk=0;
-	}
-	if (amp == 'a' || amp == 'A') askAmp=1; 
-	size_t BitLen = getFromGraphBuf(BitStream);
-	if (BitLen==0) return 0;
-	int errCnt=0;
-	errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp);
-	if (errCnt==-1||BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		if (verbose || g_debugMode) PrintAndLog("no data found");
-		if (g_debugMode) PrintAndLog("errCnt: %d, BitLen: %d, clk: %d, invert: %d", errCnt, BitLen, clk, invert);
-		return 0;
-	}
-	if (verbose || g_debugMode) PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
-	
-	//move BitStream back to DemodBuffer
-	setDemodBuf(BitStream,BitLen,0);
-
-	//output
-	if (errCnt>0 && (verbose || g_debugMode)){
-		PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d", errCnt);
-	}
-	if (verbose || g_debugMode){
-		PrintAndLog("ASK demoded bitstream:");
-		// Now output the bitstream to the scrollback by line of 16 bits
-		printBitStream(BitStream,BitLen);
-	} 
-	return 1;
-}
-
 //by marshmellow
 // - ASK Demod then Biphase decode GraphBuffer samples
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
 	//ask raw demod GraphBuffer first
-	int offset=0, clk=0, invert=0, maxErr=0, ans=0;
-	ans = sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
-
-	if (ans>0)
-		ans = ASKrawDemod(Cmd+2, FALSE);
-	else
-		ans = ASKrawDemod(Cmd, FALSE);
-	if (!ans) {
-		if (g_debugMode || verbose) PrintAndLog("Error AskrawDemod: %d", ans);
-		return 0;
-	}
-
-	//attempt to Biphase decode DemodBuffer
-	size_t size = DemodBufferLen;
+	int offset=0, clk=0, invert=0, maxErr=0;
+	sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
+	
 	uint8_t BitStream[MAX_DEMOD_BUF_LEN];
-	memcpy(BitStream, DemodBuffer, DemodBufferLen); 
+	size_t size = getFromGraphBuf(BitStream);	  
+	//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
+	int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);  
+	if ( errCnt < 0 || errCnt > maxErr ) {   
+		if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
+			return 0;  
+	} 
 
-	int errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
+	//attempt to Biphase decode BitStream
+	errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
 	if (errCnt < 0){
 		if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
 		return 0;
@@ -702,7 +548,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 	//success set DemodBuffer and return
 	setDemodBuf(BitStream, size, 0);
 	if (g_debugMode || verbose){
-		PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);
+		PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
 		printDemodBuff();
 	}
 	return 1;
@@ -711,12 +557,13 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 int Cmdaskbiphdemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 12 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] <amplify>");
+	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
 		PrintAndLog("     [offset], offset to begin biphase, default=0");
 		PrintAndLog("     [set clock as integer] optional, if not set, autodetect");
 		PrintAndLog("     <invert>, 1 to invert output");
 		PrintAndLog("     [set maximum allowed errors], default = 100");
+		PrintAndLog("     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
 		PrintAndLog("     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
 		PrintAndLog("     NOTE: <invert>  can be entered as second or third argument");
 		PrintAndLog("     NOTE: <amplify> can be entered as first, second or last argument");
@@ -724,13 +571,13 @@ int Cmdaskbiphdemod(const char *Cmd)
 		PrintAndLog("");
 		PrintAndLog("     NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester");
 		PrintAndLog("");
-		PrintAndLog("    sample: data rawdemod ab            = demod an ask/biph tag from GraphBuffer");
-		PrintAndLog("          : data rawdemod ab a          = demod an ask/biph tag from GraphBuffer, amplified");
-		PrintAndLog("          : data rawdemod ab 1 32       = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32");
-		PrintAndLog("          : data rawdemod ab 0 32 1     = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data");
-		PrintAndLog("          : data rawdemod ab 0 1        = demod an ask/biph tag from GraphBuffer while inverting data");
-		PrintAndLog("          : data rawdemod ab 0 64 1 0   = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-		PrintAndLog("          : data rawdemod ab 0 64 1 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+		PrintAndLog("    sample: data rawdemod ab              = demod an ask/biph tag from GraphBuffer");
+		PrintAndLog("          : data rawdemod ab 0 a          = demod an ask/biph tag from GraphBuffer, amplified");
+		PrintAndLog("          : data rawdemod ab 1 32         = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32");
+		PrintAndLog("          : data rawdemod ab 0 32 1       = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data");
+		PrintAndLog("          : data rawdemod ab 0 1          = demod an ask/biph tag from GraphBuffer while inverting data");
+		PrintAndLog("          : data rawdemod ab 0 64 1 0     = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+		PrintAndLog("          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
 		return 0;
 	}
 	return ASKbiphaseDemod(Cmd, TRUE);
@@ -744,7 +591,7 @@ int Cmdaskbiphdemod(const char *Cmd)
 int CmdG_Prox_II_Demod(const char *Cmd)
 {
 	if (!ASKbiphaseDemod(Cmd, FALSE)){
-		if (g_debugMode) PrintAndLog("ASKbiphaseDemod failed 1st try");
+		if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
 		return 0;
 	}
 	size_t size = DemodBufferLen;
@@ -754,46 +601,32 @@ int CmdG_Prox_II_Demod(const char *Cmd)
 		if (g_debugMode) PrintAndLog("Error gProxII_Demod");
 		return 0;
 	}
-	//got a good demod
-	uint32_t ByteStream[65] = {0x00};
+	//got a good demod of 96 bits
+	uint8_t ByteStream[8] = {0x00};
 	uint8_t xorKey=0;
-	uint8_t keyCnt=0;
-	uint8_t bitCnt=0;
-	uint8_t ByteCnt=0;
-	size_t startIdx = ans + 6; //start after preamble
-	for (size_t idx = 0; idx<size-6; idx++){
-		if ((idx+1) % 5 == 0){
-			//spacer bit - should be 0
-			if (DemodBuffer[startIdx+idx] != 0) {
-				if (g_debugMode) PrintAndLog("Error spacer not 0: %d, pos: %d",DemodBuffer[startIdx+idx],startIdx+idx);
+	size_t startIdx = ans + 6; //start after 6 bit preamble
+
+	uint8_t bits_no_spacer[90];
+	//so as to not mess with raw DemodBuffer copy to a new sample array
+	memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
+	// remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
+	size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
+	if (bitLen != 72) {
+		if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
 				return 0;
 			}
-			continue;
-		} 
-		if (keyCnt<8){ //lsb first
-			xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);
-			keyCnt++;
-			if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", xorKey);
-			continue;
-		}
-		//lsb first
-		ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);
-		bitCnt++;
-		if (bitCnt % 8 == 0){
-			if (g_debugMode) PrintAndLog("byte %d: %02x",ByteCnt,ByteStream[ByteCnt]);
-			bitCnt=0;
-			ByteCnt++;
-		}
+	// get key and then get all 8 bytes of payload decoded
+	xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
+	for (size_t idx = 0; idx < 8; idx++) {
+		ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
+		if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
 	}
-	for (uint8_t i = 0; i < ByteCnt; i++){
-		ByteStream[i] ^= xorKey; //xor
-		if (g_debugMode) PrintAndLog("byte %d after xor: %02x", i, ByteStream[i]);
-	}
-	//now ByteStream contains 64 bytes of decrypted raw tag data
+	//now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
 	// 
 	uint8_t fmtLen = ByteStream[0]>>2;
 	uint32_t FC = 0;
 	uint32_t Card = 0;
+	//get raw 96 bits to print
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
 	uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
@@ -801,40 +634,68 @@ int CmdG_Prox_II_Demod(const char *Cmd)
 	if (fmtLen==36){
 		FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
 		Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);
+		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
 	} else if(fmtLen==26){
 		FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
 		Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
-		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);    
+		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
 	} else {
-		PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",fmtLen);
+		PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
+		PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); 
 	}
 	PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
 	setDemodBuf(DemodBuffer+ans, 96, 0);
 	return 1;
 }
 
-//by marshmellow - see ASKrawDemod
+//by marshmellow
+//see ASKDemod for what args are accepted
+int CmdVikingDemod(const char *Cmd)
+{
+	if (!ASKDemod(Cmd, false, false, 1)) {
+		if (g_debugMode) PrintAndLog("ASKDemod failed");
+		return 0;
+	}
+	size_t size = DemodBufferLen;
+	//call lfdemod.c demod for Viking
+	int ans = VikingDemod_AM(DemodBuffer, &size);
+	if (ans < 0) {
+		if (g_debugMode) PrintAndLog("Error Viking_Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
+		return 0;
+	}
+	//got a good demod
+	uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
+	uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
+	uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);
+	uint8_t  checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
+	PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
+	PrintAndLog("Raw: %08X%08X", raw1,raw2);
+	setDemodBuf(DemodBuffer+ans, 64, 0);
+	return 1;
+}
+
+//by marshmellow - see ASKDemod
 int Cmdaskrawdemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 12 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  data rawdemod ar [clock] <invert> [maxError] [amplify]");
+	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
 		PrintAndLog("     [set clock as integer] optional, if not set, autodetect");
 		PrintAndLog("     <invert>, 1 to invert output");
 		PrintAndLog("     [set maximum allowed errors], default = 100");
+		PrintAndLog("     [set maximum Samples to read], default = 32768 (1024 bits at rf/64)");
 		PrintAndLog("     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
 		PrintAndLog("");
-		PrintAndLog("    sample: data rawdemod ar          = demod an ask tag from GraphBuffer");
-		PrintAndLog("          : data rawdemod ar a        = demod an ask tag from GraphBuffer, amplified");
-		PrintAndLog("          : data rawdemod ar 32       = demod an ask tag from GraphBuffer using a clock of RF/32");
-		PrintAndLog("          : data rawdemod ar 32 1     = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
-		PrintAndLog("          : data rawdemod ar 1        = demod an ask tag from GraphBuffer while inverting data");
-		PrintAndLog("          : data rawdemod ar 64 1 0   = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-		PrintAndLog("          : data rawdemod ar 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+		PrintAndLog("    sample: data rawdemod ar            = demod an ask tag from GraphBuffer");
+		PrintAndLog("          : data rawdemod ar a          = demod an ask tag from GraphBuffer, amplified");
+		PrintAndLog("          : data rawdemod ar 32         = demod an ask tag from GraphBuffer using a clock of RF/32");
+		PrintAndLog("          : data rawdemod ar 32 1       = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
+		PrintAndLog("          : data rawdemod ar 1          = demod an ask tag from GraphBuffer while inverting data");
+		PrintAndLog("          : data rawdemod ar 64 1 0     = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+		PrintAndLog("          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
 		return 0;
 	}
-	return ASKrawDemod(Cmd, TRUE);
+	return ASKDemod(Cmd, TRUE, FALSE, 0);
 }
 
 int AutoCorrelate(int window, bool SaveGrph, bool verbose)
@@ -895,8 +756,7 @@ int usage_data_autocorr(void)
 int CmdAutoCorr(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') 
-		return usage_data_autocorr();
+	if (cmdp == 'h' || cmdp == 'H') return usage_data_autocorr();
 	int window = 4000; //set default
 	char grph=0;
 	bool updateGrph = FALSE;
@@ -933,67 +793,6 @@ int CmdBitsamples(const char *Cmd)
 	return 0;
 }
 
-/*
- * Convert to a bitstream
- */
-int CmdBitstream(const char *Cmd)
-{
-	int i, j;
-	int bit;
-	int gtl;
-	int clock;
-	int low = 0;
-	int high = 0;
-	int hithigh, hitlow, first;
-
-	/* Detect high and lows and clock */
-	for (i = 0; i < GraphTraceLen; ++i)
-	{
-		if (GraphBuffer[i] > high)
-			high = GraphBuffer[i];
-		else if (GraphBuffer[i] < low)
-			low = GraphBuffer[i];
-	}
-
-	/* Get our clock */
-	clock = GetAskClock(Cmd, high, 1);
-	gtl = ClearGraph(0);
-
-	bit = 0;
-	for (i = 0; i < (int)(gtl / clock); ++i)
-	{
-		hithigh = 0;
-		hitlow = 0;
-		first = 1;
-		/* Find out if we hit both high and low peaks */
-		for (j = 0; j < clock; ++j)
-		{
-			if (GraphBuffer[(i * clock) + j] == high)
-				hithigh = 1;
-			else if (GraphBuffer[(i * clock) + j] == low)
-				hitlow = 1;
-			/* it doesn't count if it's the first part of our read
-				 because it's really just trailing from the last sequence */
-			if (first && (hithigh || hitlow))
-				hithigh = hitlow = 0;
-			else
-				first = 0;
-
-			if (hithigh && hitlow)
-				break;
-		}
-
-		/* If we didn't hit both high and low peaks, we had a bit transition */
-		if (!hithigh || !hitlow)
-			bit ^= 1;
-
-		AppendGraph(0, clock, bit);
-	}
-
-	RepaintGraphWindow();
-	return 0;
-}
-
 int CmdBuffClear(const char *Cmd)
 {
 	UsbCommand c = {CMD_BUFF_CLEAR};
@@ -1031,19 +830,20 @@ int CmdUndec(const char *Cmd)
 		return 0;
 	}
 
-	uint8_t factor = param_get8ex(Cmd, 0,2, 10);
+	uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
 	//We have memory, don't we?
 	int swap[MAX_GRAPH_TRACE_LEN] = { 0 };
 	uint32_t g_index = 0 ,s_index = 0;
-	while(g_index < GraphTraceLen && s_index < MAX_GRAPH_TRACE_LEN)
+	while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
 	{
 		int count = 0;
-		for(count = 0; count < factor && s_index+count < MAX_GRAPH_TRACE_LEN; count ++)
+		for (count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++)
 			swap[s_index+count] = GraphBuffer[g_index];
-		s_index+=count;
+		s_index += count;
+		g_index++;
 	}
 
-	memcpy(GraphBuffer,swap, s_index * sizeof(int));
+	memcpy(GraphBuffer, swap, s_index * sizeof(int));
 	GraphTraceLen = s_index;
 	RepaintGraphWindow();
 	return 0;
@@ -1072,30 +872,20 @@ int CmdGraphShiftZero(const char *Cmd)
 
 //by marshmellow
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
-//similar to dirtheshold, threshold, and askdemod commands 
+//similar to dirtheshold, threshold commands 
 //takes a threshold length which is the measured length between two samples then determines an edge
 int CmdAskEdgeDetect(const char *Cmd)
 {
 	int thresLen = 25;
 	sscanf(Cmd, "%i", &thresLen); 
-	int shift = 127;
-	int shiftedVal=0;
+
 	for(int i = 1; i<GraphTraceLen; i++){
 		if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up
-			shift=127;
+			GraphBuffer[i-1] = 127;
 		else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down
-			shift=-127;
-
-		shiftedVal=GraphBuffer[i]+shift;
-
-		if (shiftedVal>127) 
-			shiftedVal=127;
-		else if (shiftedVal<-127) 
-			shiftedVal=-127;
-		GraphBuffer[i-1] = shiftedVal;
+			GraphBuffer[i-1] = -127;
 	}
 	RepaintGraphWindow();
-	//CmdNorm("");
 	return 0;
 }
 
@@ -1105,9 +895,10 @@ int CmdAskEdgeDetect(const char *Cmd)
 int CmdDetectClockRate(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 3 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  data detectclock [modulation]");
+	if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  data detectclock [modulation] <clock>");
 		PrintAndLog("     [modulation as char], specify the modulation type you want to detect the clock of");
+		PrintAndLog("     <clock>             , specify the clock (optional - to get best start position only)");
 		PrintAndLog("       'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk");
 		PrintAndLog("");
 		PrintAndLog("    sample: data detectclock a    = detect the clock of an ask modulated wave in the GraphBuffer");
@@ -1117,7 +908,7 @@ int CmdDetectClockRate(const char *Cmd)
 	}
 	int ans=0;
 	if (cmdp == 'a'){
-		ans = GetAskClock("", true, false);
+		ans = GetAskClock(Cmd+1, true, false);
 	} else if (cmdp == 'f'){
 		ans = GetFskClock("", true, false);
 	} else if (cmdp == 'n'){
@@ -1130,6 +921,27 @@ int CmdDetectClockRate(const char *Cmd)
 	return ans;
 }
 
+char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
+{
+	static char fType[8];
+	memset(fType, 0x00, 8);	
+	char *fskType = fType;
+	if (fchigh==10 && fclow==8){
+		if (invert) //fsk2a
+			memcpy(fskType, "FSK2a", 5);
+		else //fsk2
+			memcpy(fskType, "FSK2", 4);
+	} else if (fchigh == 8 && fclow == 5) {
+		if (invert)
+			memcpy(fskType, "FSK1", 4);
+		else
+			memcpy(fskType, "FSK1a", 5);
+	} else {
+		memcpy(fskType, "FSK??", 5);
+	}
+	return fskType;
+}
+
 //by marshmellow
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
@@ -1137,20 +949,19 @@ int CmdDetectClockRate(const char *Cmd)
 int FSKrawDemod(const char *Cmd, bool verbose)
 {
 	//raw fsk demod  no manchester decoding no start bit finding just get binary from wave
-	//set defaults
-	int rfLen = 0;
-	int invert = 0;
-	int fchigh = 0;
-	int fclow = 0;
+	uint8_t rfLen, invert, fchigh, fclow;
 
+	//set defaults
 	//set options from parameters entered with the command
-	sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);
-
+	rfLen = param_get8(Cmd, 0);
+	invert = param_get8(Cmd, 1);
+	fchigh = param_get8(Cmd, 2);
+	fclow = param_get8(Cmd, 3);
 	if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
-		 if (rfLen==1){
-			invert=1;   //if invert option only is used
+		if (rfLen==1) {
+			invert = 1;   //if invert option only is used
 			rfLen = 0;
-		 }
+		}
 	}
 
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
@@ -1158,36 +969,35 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 	if (BitLen==0) return 0;
 	//get field clock lengths
 	uint16_t fcs=0;
-	if (fchigh==0 || fclow == 0){
+	if (!fchigh || !fclow) {
 		fcs = countFC(BitStream, BitLen, 1);
-		if (fcs==0){
-			fchigh=10;
-			fclow=8;
-		}else{
-			fchigh = (fcs >> 8) & 0xFF;
-			fclow = fcs & 0xFF;
+		if (!fcs) {
+			fchigh = 10;
+			fclow = 8;
+		} else {
+			fchigh = (fcs >> 8) & 0x00FF;
+			fclow = fcs & 0x00FF;
 		}
 	}
 	//get bit clock length
-	if (rfLen==0){
+	if (!rfLen) {
 		rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);
-		if (rfLen == 0) rfLen = 50;
+		if (!rfLen) rfLen = 50;
 	}
-	if (verbose) PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);
-	int size = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);
-	if (size>0){
-		setDemodBuf(BitStream,size,0);
+	int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);
+	if (size > 0) {
+		setDemodBuf(BitStream, size, 0);
 
 		// Now output the bitstream to the scrollback by line of 16 bits
-		if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits  most tags will have full bit stream inside that sample size
-		if (verbose) {
-			PrintAndLog("FSK decoded bitstream:");
-			printBitStream(BitStream,size);
+		if (verbose || g_debugMode) {
+			PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen,  (unsigned int)invert,  (unsigned int)fchigh,  (unsigned int)fclow);
+			PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
+			printDemodBuff();
 		}
 
 		return 1;
-	} else{
-		if (verbose) PrintAndLog("no FSK data found");
+	} else {
+		if (g_debugMode) PrintAndLog("no FSK data found");
 	}
 	return 0;
 }
@@ -1358,8 +1168,6 @@ int CmdFSKdemodParadox(const char *Cmd)
 //print ioprox ID and some format details
 int CmdFSKdemodIO(const char *Cmd)
 {
-	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
-	//set defaults
 	int idx=0;
 	//something in graphbuffer?
 	if (GraphTraceLen < 65) {
@@ -1391,9 +1199,9 @@ int CmdFSKdemodIO(const char *Cmd)
 		return 0;
 	}
 	if (idx==0){
-		if (g_debugMode==1){
+		if (g_debugMode){
 			PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen);
-			if (BitLen > 92) printBitStream(BitStream,92);
+			if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16));
 		} 
 		return 0;
 	}
@@ -1407,7 +1215,7 @@ int CmdFSKdemodIO(const char *Cmd)
 		//XSF(version)facility:codeone+codetwo (raw)
 		//Handle the data
 	if (idx+64>BitLen) {
-		if (g_debugMode==1) PrintAndLog("not enough bits found - bitlen: %d",BitLen);
+		if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen);
 		return 0;
 	}
 	PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx],    BitStream[idx+1],  BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
@@ -1428,7 +1236,6 @@ int CmdFSKdemodIO(const char *Cmd)
 
 	for (uint8_t i=1; i<6; ++i){
 		calccrc += bytebits_to_byte(BitStream+idx+9*i,8);
-		//PrintAndLog("%d", calccrc);
 	}
 	calccrc &= 0xff;
 	calccrc = 0xff - calccrc;
@@ -1449,11 +1256,6 @@ int CmdFSKdemodIO(const char *Cmd)
 //print full AWID Prox ID and some bit format details if found
 int CmdFSKdemodAWID(const char *Cmd)
 {
-
-	//int verbose=1;
-	//sscanf(Cmd, "%i", &verbose);
-
-	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
 	size_t size = getFromGraphBuf(BitStream);
 	if (size==0) return 0;
@@ -1461,7 +1263,7 @@ int CmdFSKdemodAWID(const char *Cmd)
 	//get binary from fsk wave
 	int idx = AWIDdemodFSK(BitStream, &size);
 	if (idx<=0){
-		if (g_debugMode==1){
+		if (g_debugMode){
 			if (idx == -1)
 				PrintAndLog("DEBUG: Error - not enough samples");
 			else if (idx == -2)
@@ -1499,7 +1301,7 @@ int CmdFSKdemodAWID(const char *Cmd)
 
 	size = removeParity(BitStream, idx+8, 4, 1, 88);
 	if (size != 66){
-		if (g_debugMode==1) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");
+		if (g_debugMode) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");
 		return 0;
 	}
 	// ok valid card found!
@@ -1559,7 +1361,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
 	//get binary from fsk wave
 	int idx = PyramiddemodFSK(BitStream, &size);
 	if (idx < 0){
-		if (g_debugMode==1){
+		if (g_debugMode){
 			if (idx == -5)
 				PrintAndLog("DEBUG: Error - not enough samples");
 			else if (idx == -1)
@@ -1593,7 +1395,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
 	// s = format start bit, o = odd parity of last 7 bits
 	// f = facility code, c = card number
 	// w = wiegand parity, x = extra space for other formats
-	// p = unknown checksum
+	// p = CRC8maxim checksum
 	// (26 bit format shown)
 
 	//get bytes for checksum calc
@@ -1615,7 +1417,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
 
 	size = removeParity(BitStream, idx+8, 8, 1, 120);
 	if (size != 105){
-		if (g_debugMode==1) 
+		if (g_debugMode) 
 			PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3);
 		return 0;
 	}
@@ -1640,39 +1442,33 @@ int CmdFSKdemodPyramid(const char *Cmd)
 	// s = format start bit, o = odd parity of last 7 bits
 	// f = facility code, c = card number
 	// w = wiegand parity, x = extra space for other formats
-	// p = unknown checksum
+	// p = CRC8-Maxim checksum
 	// (26 bit format shown)
 
 	//find start bit to get fmtLen
 	int j;
-	for (j=0; j<size; j++){
+	for (j=0; j < size; ++j){
 		if(BitStream[j]) break;
 	}
+	
 	uint8_t fmtLen = size-j-8;
 	uint32_t fc = 0;
 	uint32_t cardnum = 0;
 	uint32_t code1 = 0;
-	//uint32_t code2 = 0;
-	if (fmtLen==26){
+	
+	if ( fmtLen == 26 ){
 		fc = bytebits_to_byte(BitStream+73, 8);
 		cardnum = bytebits_to_byte(BitStream+81, 16);
 		code1 = bytebits_to_byte(BitStream+72,fmtLen);
 		PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
-	} else if (fmtLen==45){
-		fmtLen=42; //end = 10 bits not 7 like 26 bit fmt
+	} else if (fmtLen == 45) {
+		fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
 		fc = bytebits_to_byte(BitStream+53, 10);
 		cardnum = bytebits_to_byte(BitStream+63, 32);
 		PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
 	} else {
 		cardnum = bytebits_to_byte(BitStream+81, 16);
-		if (fmtLen>32){
-			//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32);
-			//code2 = bytebits_to_byte(BitStream+(size-32),32);
-			PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-		} else{
-			//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen);
-			PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-		}
+		PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
 	}
 	if (checksum == checkCS)
 		PrintAndLog("Checksum %02x passed", checksum);
@@ -1686,124 +1482,98 @@ int CmdFSKdemodPyramid(const char *Cmd)
 	return 1;
 }
 
-int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
-{
-	static const int LowTone[]  = {
-		1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1, -1, -1, -1, -1, -1
-	};
-	static const int HighTone[] = {
-		1,  1,  1,  1,  1,     -1, -1, -1, -1,
-		1,  1,  1,  1,         -1, -1, -1, -1,
-		1,  1,  1,  1,         -1, -1, -1, -1,
-		1,  1,  1,  1,         -1, -1, -1, -1,
-		1,  1,  1,  1,         -1, -1, -1, -1,
-		1,  1,  1,  1,     -1, -1, -1, -1, -1,
-	};
-
-	int lowLen = sizeof (LowTone) / sizeof (int);
-	int highLen = sizeof (HighTone) / sizeof (int);
-	int convLen = (highLen > lowLen) ? highLen : lowLen;
-	uint32_t hi = 0, lo = 0;
-
-	int i, j;
-	int minMark = 0, maxMark = 0;
-
-	for (i = 0; i < GraphTraceLen - convLen; ++i) {
-		int lowSum = 0, highSum = 0;
-
-		for (j = 0; j < lowLen; ++j) {
-			lowSum += LowTone[j]*GraphBuffer[i+j];
-		}
-		for (j = 0; j < highLen; ++j) {
-			highSum += HighTone[j] * GraphBuffer[i + j];
-		}
-		lowSum = abs(100 * lowSum / lowLen);
-		highSum = abs(100 * highSum / highLen);
-		GraphBuffer[i] = (highSum << 16) | lowSum;
+// FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
+// 8 databits + 1 parity (1)
+// CIITT 16 chksum
+// NATIONAL CODE, ICAR database
+// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
+// FLAG (animal/non-animal)
+/*
+38 IDbits   
+10 country code 
+1 extra app bit
+14 reserved bits
+1 animal bit
+16 ccitt CRC chksum over 64bit ID CODE.
+24 appli bits.
+
+-- sample: 985121004515220  [ 37FF65B88EF94 ]
+*/
+int CmdFDXBdemodBI(const char *Cmd){
+
+	int invert = 1;
+	int clk = 32;		
+	int errCnt = 0;
+	int maxErr = 0;
+	uint8_t BitStream[MAX_DEMOD_BUF_LEN];	
+	size_t size = getFromGraphBuf(BitStream);	
+	
+	errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
+	if ( errCnt < 0 || errCnt > maxErr ) { 
+		if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);
+		return 0;
 	}
 
-	for(i = 0; i < GraphTraceLen - convLen - 16; ++i) {
-		int lowTot = 0, highTot = 0;
-		// 10 and 8 are f_s divided by f_l and f_h, rounded
-		for (j = 0; j < 10; ++j) {
-			lowTot += (GraphBuffer[i+j] & 0xffff);
-		}
-		for (j = 0; j < 8; j++) {
-			highTot += (GraphBuffer[i + j] >> 16);
-		}
-		GraphBuffer[i] = lowTot - highTot;
-		if (GraphBuffer[i] > maxMark) maxMark = GraphBuffer[i];
-		if (GraphBuffer[i] < minMark) minMark = GraphBuffer[i];
+	errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
+	if (errCnt < 0 || errCnt > maxErr ) {
+		if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
+		return 0;
+	} 
+	
+	int preambleIndex = FDXBdemodBI(BitStream, &size);
+	if (preambleIndex < 0){
+		if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
+		return 0;
 	}
-
-	GraphTraceLen -= (convLen + 16);
-	RepaintGraphWindow();
-
-	// Find bit-sync (3 lo followed by 3 high) (HID ONLY)
-	int max = 0, maxPos = 0;
-	for (i = 0; i < 6000; ++i) {
-		int dec = 0;
-		for (j = 0; j < 3 * lowLen; ++j) {
-			dec -= GraphBuffer[i + j];
-		}
-		for (; j < 3 * (lowLen + highLen ); ++j) {
-			dec += GraphBuffer[i + j];
-		}
-		if (dec > max) {
-			max = dec;
-			maxPos = i;
-		}
+	if (size != 128) {
+		if (g_debugMode) PrintAndLog("Error incorrect data length found");
+		return 0;
 	}
+	
+	setDemodBuf(BitStream, 128, preambleIndex);
 
-	// place start of bit sync marker in graph
-	GraphBuffer[maxPos] = maxMark;
-	GraphBuffer[maxPos + 1] = minMark;
-
-	maxPos += j;
-
-	// place end of bit sync marker in graph
-	GraphBuffer[maxPos] = maxMark;
-	GraphBuffer[maxPos+1] = minMark;
-
-	PrintAndLog("actual data bits start at sample %d", maxPos);
-	PrintAndLog("length %d/%d", highLen, lowLen);
-
-	uint8_t bits[46] = {0x00};
-
-	// find bit pairs and manchester decode them
-	for (i = 0; i < arraylen(bits) - 1; ++i) {
-		int dec = 0;
-		for (j = 0; j < lowLen; ++j) {
-			dec -= GraphBuffer[maxPos + j];
-		}
-		for (; j < lowLen + highLen; ++j) {
-			dec += GraphBuffer[maxPos + j];
-		}
-		maxPos += j;
-		// place inter bit marker in graph
-		GraphBuffer[maxPos] = maxMark;
-		GraphBuffer[maxPos + 1] = minMark;
-
-		// hi and lo form a 64 bit pair
-		hi = (hi << 1) | (lo >> 31);
-		lo = (lo << 1);
-		// store decoded bit as binary (in hi/lo) and text (in bits[])
-		if(dec < 0) {
-			bits[i] = '1';
-			lo |= 1;
-		} else {
-			bits[i] = '0';
-		}
+	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
+	size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
+	if ( size != 104 ) {
+		if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
+		return 0;
 	}
-	PrintAndLog("bits: '%s'", bits);
-	PrintAndLog("hex: %08x %08x", hi, lo);
-	return 0;
+	if (g_debugMode) {
+		char *bin = sprint_bin_break(BitStream,size,16);
+		PrintAndLog("DEBUG BinStream:\n%s",bin);
+	}
+	PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
+	if (g_debugMode) PrintAndLog("Start marker %d;   Size %d", preambleIndex, size);
+
+	//got a good demod
+	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
+	uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10);
+	uint8_t dataBlockBit = BitStream[48];
+	uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14);
+	uint8_t animalBit = BitStream[63];
+	uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16);
+	uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24);
+
+	uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32);
+	uint8_t raw[8];
+	num_to_bytes(rawid, 8, raw);
+
+	if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
+
+	uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
+	PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
+	PrintAndLog("National Code: %012llu", NationalCode);
+	PrintAndLog("CountryCode:   %04u", countryCode);
+	PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
+	PrintAndLog("reserved Code: %u", reservedCode);
+	PrintAndLog("Animal Tag:    %s", animalBit ? "True" : "False");
+	PrintAndLog("CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
+	PrintAndLog("Extended:      0x%X\n", extended);
+	
+	return 1;
 }
 
+
 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
@@ -1817,31 +1587,34 @@ int PSKDemod(const char *Cmd, bool verbose)
 		clk=0;
 	}
 	if (invert != 0 && invert != 1) {
-		if (verbose) PrintAndLog("Invalid argument: %s", Cmd);
+		if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
 		return 0;
 	}
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
 	size_t BitLen = getFromGraphBuf(BitStream);
-	if (BitLen==0) return -1;
+	if (BitLen==0) return 0;
 	uint8_t carrier=countFC(BitStream, BitLen, 0);
 	if (carrier!=2 && carrier!=4 && carrier!=8){
 		//invalid carrier
 		return 0;
 	}
+	if (g_debugMode){
+		PrintAndLog("Carrier: rf/%d",carrier);
+	}
 	int errCnt=0;
 	errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
-		if (g_debugMode==1 && verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;
 	} 
 	if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		if (g_debugMode==1 && verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;
 	}
-	if (verbose){
-		PrintAndLog("Tried PSK Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
+	if (verbose || g_debugMode){
+		PrintAndLog("\nUsing Clock:%d, invert:%d, Bits Found:%d",clk,invert,BitLen);
 		if (errCnt>0){
-			PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
+			PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
 		}
 	}
 	//prime demod buffer for output
@@ -1862,66 +1635,38 @@ int CmdIndalaDecode(const char *Cmd)
 	}
 
 	if (!ans){
-		if (g_debugMode==1) 
+		if (g_debugMode) 
 			PrintAndLog("Error1: %d",ans);
 		return 0;
 	}
 	uint8_t invert=0;
-	ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);
-	if (ans < 1) {
-		if (g_debugMode==1)
+	size_t size = DemodBufferLen;
+	int startIdx = indala26decode(DemodBuffer, &size, &invert);
+	if (startIdx < 0 || size > 224) {
+		if (g_debugMode)
 			PrintAndLog("Error2: %d",ans);
 		return -1;
 	}
-	char showbits[251]={0x00};
+	setDemodBuf(DemodBuffer, size, (size_t)startIdx);
 	if (invert)
-		if (g_debugMode==1)
+		if (g_debugMode)
 			PrintAndLog("Had to invert bits");
 
+	PrintAndLog("BitLen: %d",DemodBufferLen);
 	//convert UID to HEX
 	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-	int idx;
-	uid1=0;
-	uid2=0;
-	PrintAndLog("BitLen: %d",DemodBufferLen);
+	uid1=bytebits_to_byte(DemodBuffer,32);
+	uid2=bytebits_to_byte(DemodBuffer+32,32);
 	if (DemodBufferLen==64){
-		for( idx=0; idx<64; idx++) {
-			uid1=(uid1<<1)|(uid2>>31);
-			if (DemodBuffer[idx] == 0) {
-				uid2=(uid2<<1)|0;
-				showbits[idx]='0';
-			} else {
-				uid2=(uid2<<1)|1;
-				showbits[idx]='1';
-			}
-		}
-		showbits[idx]='\0';
-		PrintAndLog("Indala UID=%s (%x%08x)", showbits, uid1, uid2);
-	}
-	else {
-		uid3=0;
-		uid4=0;
-		uid5=0;
-		uid6=0;
-		uid7=0;
-		for( idx=0; idx<DemodBufferLen; idx++) {
-			uid1=(uid1<<1)|(uid2>>31);
-			uid2=(uid2<<1)|(uid3>>31);
-			uid3=(uid3<<1)|(uid4>>31);
-			uid4=(uid4<<1)|(uid5>>31);
-			uid5=(uid5<<1)|(uid6>>31);
-			uid6=(uid6<<1)|(uid7>>31);
-			if (DemodBuffer[idx] == 0) {
-				uid7=(uid7<<1)|0;
-				showbits[idx]='0';
-			}
-			else {
-				uid7=(uid7<<1)|1;
-				showbits[idx]='1';
-			}
-		}
-		showbits[idx]='\0';
-		PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+		PrintAndLog("Indala UID=%s (%x%08x)",  sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2);
+	} else {
+		uid3=bytebits_to_byte(DemodBuffer+64,32);
+		uid4=bytebits_to_byte(DemodBuffer+96,32);
+		uid5=bytebits_to_byte(DemodBuffer+128,32);
+		uid6=bytebits_to_byte(DemodBuffer+160,32);
+		uid7=bytebits_to_byte(DemodBuffer+192,32);
+		PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", 
+		     sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7);
 	}
 	if (g_debugMode){
 		PrintAndLog("DEBUG: printing demodbuffer:");
@@ -1930,11 +1675,49 @@ int CmdIndalaDecode(const char *Cmd)
 	return 1;
 }
 
+int CmdPSKNexWatch(const char *Cmd)
+{
+	if (!PSKDemod("", false)) return 0;
+	uint8_t preamble[28] = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+	size_t startIdx = 0, size = DemodBufferLen; 
+	bool invert = false;
+	if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){
+		// if didn't find preamble try again inverting
+		if (!PSKDemod("1", false)) return 0; 
+		size = DemodBufferLen;
+		if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0;
+		invert = true;
+	} 
+	if (size != 128) return 0;
+	setDemodBuf(DemodBuffer, size, startIdx+4);
+	startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0)
+	//get ID
+	uint32_t ID = 0;
+	for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){
+		for (uint8_t idx=0; idx<8; idx++){
+			ID = (ID << 1) | DemodBuffer[startIdx+wordIdx+(idx*4)];
+		}	
+	}
+	//parity check (TBD)
+
+	//checksum check (TBD)
+
+	//output
+	PrintAndLog("NexWatch ID: %d", ID);
+	if (invert){
+		PrintAndLog("Had to Invert - probably NexKey");
+		for (uint8_t idx=0; idx<size; idx++)
+			DemodBuffer[idx] ^= 1;
+	} 
+
+	CmdPrintDemodBuff("x");
+	return 1;
+}
+
 // by marshmellow
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only
 // prints binary found and saves in demodbuffer for further commands
-
 int NRZrawDemod(const char *Cmd, bool verbose)
 {
 	int invert=0;
@@ -1953,12 +1736,12 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (BitLen==0) return 0;
 	int errCnt=0;
-	errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert, maxErr);
+	errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
 		if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;
 	} 
-	if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+	if (errCnt<0 || BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
 		if (g_debugMode) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;
 	}
@@ -1966,7 +1749,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 	//prime demod buffer for output
 	setDemodBuf(BitStream,BitLen,0);
 
-	if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
+	if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
 	if (verbose || g_debugMode) {
 		PrintAndLog("NRZ demoded bitstream:");
 		// Now output the bitstream to the scrollback by line of 16 bits
@@ -2022,7 +1805,7 @@ int CmdPSK1rawDemod(const char *Cmd)
 		return 0;
 	}
  
-	PrintAndLog("PSK demoded bitstream:");
+	PrintAndLog("PSK1 demoded bitstream:");
 	// Now output the bitstream to the scrollback by line of 16 bits
 	printDemodBuff();
 	return 1;
@@ -2064,7 +1847,7 @@ int CmdRawDemod(const char *Cmd)
 {
 	char cmdp = Cmd[0]; //param_getchar(Cmd, 0);
 
-	if (strlen(Cmd) > 14 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd)<2) {
+	if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd)<2) {
 		PrintAndLog("Usage:  data rawdemod [modulation] <help>|<options>");
 		PrintAndLog("   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");		
 		PrintAndLog("         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
@@ -2176,11 +1959,6 @@ int CmdHpf(const char *Cmd)
 	RepaintGraphWindow();
 	return 0;
 }
-typedef struct {
-	uint8_t * buffer;
-	uint32_t numbits;
-	uint32_t position;
-}BitstreamOut;
 
 bool _headBit( BitstreamOut *stream)
 {
@@ -2211,25 +1989,25 @@ int getSamples(const char *Cmd, bool silent)
 
 	int n = strtol(Cmd, NULL, 0);
 
-	if (n == 0)
-		n = sizeof(got);
-
-	if (n > sizeof(got))
+	if ( n == 0 || n > sizeof(got))
 		n = sizeof(got);
 
 	PrintAndLog("Reading %d bytes from device memory\n", n);
 	GetFromBigBuf(got,n,0);
 	PrintAndLog("Data fetched");
 	UsbCommand response;
-	WaitForResponse(CMD_ACK, &response);
+	if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) {
+        PrintAndLog("timeout while waiting for reply.");
+		return 1;
+    }
+	
 	uint8_t bits_per_sample = 8;
 
 	//Old devices without this feature would send 0 at arg[0]
 	if(response.arg[0] > 0)
 	{
 		sample_config *sc = (sample_config *) response.d.asBytes;
-		PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample
-		    , sc->decimation);
+		PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
 		bits_per_sample = sc->bits_per_sample;
 	}
 	if(bits_per_sample < 8)
@@ -2237,7 +2015,7 @@ int getSamples(const char *Cmd, bool silent)
 		PrintAndLog("Unpacking...");
 		BitstreamOut bout = { got, bits_per_sample * n,  0};
 		int j =0;
-		for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {
+		for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
 			uint8_t sample = getByte(bits_per_sample, &bout);
 			GraphBuffer[j] = ((int) sample )- 128;
 		}
@@ -2265,11 +2043,11 @@ int CmdTuneSamples(const char *Cmd)
 	int timeout = 0;
 	printf("\nMeasuring antenna characteristics, please wait...");
 
-	UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING};
+	UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0,0,0}};
+	clearCommandBuffer();
 	SendCommand(&c);
-
 	UsbCommand resp;
-	while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING,&resp,1000)) {
+	while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
 		timeout++;
 		printf(".");
 		if (timeout > 7) {
@@ -2291,10 +2069,10 @@ int CmdTuneSamples(const char *Cmd)
 	PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
 	PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
 
-#define LF_UNUSABLE_V		2948		// was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
-#define LF_MARGINAL_V		14739		// was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
-#define HF_UNUSABLE_V		3167		// was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
-#define HF_MARGINAL_V		7917		// was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+ #define LF_UNUSABLE_V		2948		// was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
+ #define LF_MARGINAL_V		14739		// was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
+ #define HF_UNUSABLE_V		3167		// was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+ #define HF_MARGINAL_V		7917		// was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
 
 	if (peakv < LF_UNUSABLE_V)
 		PrintAndLog("# Your LF antenna is unusable.");
@@ -2315,7 +2093,6 @@ int CmdTuneSamples(const char *Cmd)
 		ShowGraphWindow();
 		RepaintGraphWindow();
 	}
-
 	return 0;
 }
 
@@ -2331,7 +2108,7 @@ int CmdLoad(const char *Cmd)
 	
 	FILE *f = fopen(filename, "r");
 	if (!f) {
-		 PrintAndLog("couldn't open '%s'", filename);
+		PrintAndLog("couldn't open '%s'", filename);
 		return 0;
 	}
 
@@ -2351,10 +2128,12 @@ int CmdLtrim(const char *Cmd)
 {
 	int ds = atoi(Cmd);
 
+	if (GraphTraceLen <= 0) return 0;
+
 	for (int i = ds; i < GraphTraceLen; ++i)
 		GraphBuffer[i-ds] = GraphBuffer[i];
-	GraphTraceLen -= ds;
 
+	GraphTraceLen -= ds;
 	RepaintGraphWindow();
 	return 0;
 }
@@ -2363,248 +2142,7 @@ int CmdLtrim(const char *Cmd)
 int CmdRtrim(const char *Cmd)
 {
 	int ds = atoi(Cmd);
-
 	GraphTraceLen = ds;
-
-	RepaintGraphWindow();
-	return 0;
-}
-
-/*
- * Manchester demodulate a bitstream. The bitstream needs to be already in
- * the GraphBuffer as 0 and 1 values
- *
- * Give the clock rate as argument in order to help the sync - the algorithm
- * resyncs at each pulse anyway.
- *
- * Not optimized by any means, this is the 1st time I'm writing this type of
- * routine, feel free to improve...
- *
- * 1st argument: clock rate (as number of samples per clock rate)
- *               Typical values can be 64, 32, 128...
- */
-int CmdManchesterDemod(const char *Cmd)
-{
-	int i, j, invert= 0;
-	int bit;
-	int clock;
-	int lastval = 0;
-	int low = 0;
-	int high = 0;
-	int hithigh, hitlow, first;
-	int lc = 0;
-	int bitidx = 0;
-	int bit2idx = 0;
-	int warnings = 0;
-
-	/* check if we're inverting output */
-	if (*Cmd == 'i')
-	{
-		PrintAndLog("Inverting output");
-		invert = 1;
-		++Cmd;
-		do
-			++Cmd;
-		while(*Cmd == ' '); // 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   */
-	/* int BitStream[GraphTraceLen*2/clock+10]; */
-
-	/* But it does not work if compiling on WIndows: therefore we just allocate a */
-	/* large array */
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
-
-	/* Detect high and lows */
-	for (i = 0; i < GraphTraceLen; i++)
-	{
-		if (GraphBuffer[i] > high)
-			high = GraphBuffer[i];
-		else if (GraphBuffer[i] < low)
-			low = GraphBuffer[i];
-	}
-
-	/* Get our clock */
-	clock = GetAskClock(Cmd, high, 1);
-
-	int tolerance = clock/4;
-
-	/* Detect first transition */
-	/* Lo-Hi (arbitrary)       */
-	/* 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)
-		{
-			lastval = i;
-			break;
-		}
-	}
-
-	/* If we're not working with 1/0s, demod based off clock */
-	if (high != 1)
-	{
-		bit = 0; /* We assume the 1st bit is zero, it may not be
-							* the case: this routine (I think) has an init problem.
-							* Ed.
-							*/
-		for (; i < (int)(GraphTraceLen / clock); i++)
-		{
-			hithigh = 0;
-			hitlow = 0;
-			first = 1;
-
-			/* Find out if we hit both high and low peaks */
-			for (j = 0; j < clock; j++)
-			{
-				if (GraphBuffer[(i * clock) + j] == high)
-					hithigh = 1;
-				else if (GraphBuffer[(i * clock) + j] == low)
-					hitlow = 1;
-
-				/* it doesn't count if it's the first part of our read
-					 because it's really just trailing from the last sequence */
-				if (first && (hithigh || hitlow))
-					hithigh = hitlow = 0;
-				else
-					first = 0;
-
-				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 ^ invert;
-		}
-	}
-
-	/* standard 1/0 bitstream */
-	else
-	{
-
-		/* Then detect duration between 2 successive transitions */
-		for (bitidx = 1; i < GraphTraceLen; i++)
-		{
-			if (GraphBuffer[i-1] != GraphBuffer[i])
-			{
-				lc = i-lastval;
-				lastval = i;
-
-				// Error check: if bitidx becomes too large, we do not
-				// have a Manchester encoded bitstream or the clock is really
-				// wrong!
-				if (bitidx > (GraphTraceLen*2/clock+8) ) {
-					PrintAndLog("Error: the clock you gave is probably wrong, aborting.");
-					return 0;
-				}
-				// Then switch depending on lc length:
-				// Tolerance is 1/4 of clock rate (arbitrary)
-				if (abs(lc-clock/2) < tolerance) {
-					// Short pulse : either "1" or "0"
-					BitStream[bitidx++]=GraphBuffer[i-1];
-				} else if (abs(lc-clock) < tolerance) {
-					// Long pulse: either "11" or "00"
-					BitStream[bitidx++]=GraphBuffer[i-1];
-					BitStream[bitidx++]=GraphBuffer[i-1];
-				} else {
-				// Error
-					warnings++;
-					PrintAndLog("Warning: Manchester decode error for pulse width detection.");
-					PrintAndLog("(too many of those messages mean either the stream is not Manchester encoded, or clock is wrong)");
-
-					if (warnings > 10)
-					{
-						PrintAndLog("Error: too many detection errors, aborting.");
-						return 0;
-					}
-				}
-			}
-		}
-
-		// 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 ^ invert;
-			} else {
-				// We cannot end up in this state, this means we are unsynchronized,
-				// move up 1 bit:
-				i++;
-				warnings++;
-				PrintAndLog("Unsynchronized, resync...");
-				PrintAndLog("(too many of those messages mean the stream is not Manchester encoded)");
-
-				if (warnings > 10)
-				{
-					PrintAndLog("Error: too many decode errors, aborting.");
-					return 0;
-				}
-			}
-		}
-	}
-
-	PrintAndLog("Manchester decoded bitstream");
-	// Now output the bitstream to the scrollback by line of 16 bits
-	for (i = 0; i < (bit2idx-16); i+=16) {
-		PrintAndLog("%i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i",
-			BitStream[i],
-			BitStream[i+1],
-			BitStream[i+2],
-			BitStream[i+3],
-			BitStream[i+4],
-			BitStream[i+5],
-			BitStream[i+6],
-			BitStream[i+7],
-			BitStream[i+8],
-			BitStream[i+9],
-			BitStream[i+10],
-			BitStream[i+11],
-			BitStream[i+12],
-			BitStream[i+13],
-			BitStream[i+14],
-			BitStream[i+15]);
-	}
-	return 0;
-}
-
-/* Modulate our data into manchester */
-int CmdManchesterMod(const char *Cmd)
-{
-	int i, j;
-	int clock;
-	int bit, lastbit, wave;
-
-	/* Get our clock */
-	clock = GetAskClock(Cmd, 0, 1);
-
-	wave = 0;
-	lastbit = 1;
-	for (i = 0; i < (int)(GraphTraceLen / clock); i++)
-	{
-		bit = GraphBuffer[i * clock] ^ 1;
-
-		for (j = 0; j < (int)(clock/2); j++)
-			GraphBuffer[(i * clock) + j] = bit ^ lastbit ^ wave;
-		for (j = (int)(clock/2); j < clock; j++)
-			GraphBuffer[(i * clock) + j] = bit ^ lastbit ^ wave ^ 1;
-
-		/* Keep track of how we start our wave and if we changed or not this time */
-		wave ^= bit ^ lastbit;
-		lastbit = bit;
-	}
-
 	RepaintGraphWindow();
 	return 0;
 }
@@ -2673,20 +2211,6 @@ int CmdScale(const char *Cmd)
 	return 0;
 }
 
-int CmdThreshold(const char *Cmd)
-{
-	int threshold = atoi(Cmd);
-
-	for (int i = 0; i < GraphTraceLen; ++i) {
-		if (GraphBuffer[i] >= threshold)
-			GraphBuffer[i] = 1;
-		else
-			GraphBuffer[i] = -1;
-	}
-	RepaintGraphWindow();
-	return 0;
-}
-
 int CmdDirectionalThreshold(const char *Cmd)
 {
 	int8_t upThres = param_get8(Cmd, 0);
@@ -2751,22 +2275,114 @@ int CmdZerocrossings(const char *Cmd)
 	return 0;
 }
 
+int usage_data_bin2hex(){
+		PrintAndLog("Usage: data bin2hex <binary_digits>");
+		PrintAndLog("       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
+		return 0;
+}
+
+/**
+ * @brief Utility for conversion via cmdline.
+ * @param Cmd
+ * @return
+ */
+int Cmdbin2hex(const char *Cmd)
+{
+	int bg =0, en =0;
+	if(param_getptr(Cmd, &bg, &en, 0))
+	{
+		return usage_data_bin2hex();
+	}
+	//Number of digits supplied as argument
+	size_t length = en  - bg +1;
+	size_t bytelen = (length+7) / 8;
+	uint8_t* arr = (uint8_t *) malloc(bytelen);
+	memset(arr, 0, bytelen);
+	BitstreamOut bout = { arr, 0, 0 };
+
+	for(; bg <= en ;bg++)
+	{
+		char c = Cmd[bg];
+		if( c == '1')	pushBit(&bout, 1);
+		else if( c == '0')	pushBit(&bout, 0);
+		else PrintAndLog("Ignoring '%c'", c);
+	}
+
+	if(bout.numbits % 8 != 0)
+	{
+		printf("[padded with %d zeroes]\n", 8-(bout.numbits % 8));
+	}
+
+	//Uses printf instead of PrintAndLog since the latter
+	// adds linebreaks to each printout - this way was more convenient since we don't have to
+	// allocate a string and write to that first...
+	for(size_t x = 0; x  < bytelen ; x++)
+	{
+		printf("%02X", arr[x]);
+	}
+	printf("\n");
+	free(arr);
+	return 0;
+}
+
+int usage_data_hex2bin(){
+	PrintAndLog("Usage: data hex2bin <hex_digits>");
+	PrintAndLog("       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
+	return 0;
+}
+
+int Cmdhex2bin(const char *Cmd)
+{
+	int bg =0, en =0;
+	if(param_getptr(Cmd, &bg, &en, 0))  return usage_data_hex2bin();
+
+	while(bg <= en )
+	{
+		char x = Cmd[bg++];
+		// capitalize
+		if (x >= 'a' && x <= 'f')
+			x -= 32;
+		// convert to numeric value
+		if (x >= '0' && x <= '9')
+			x -= '0';
+		else if (x >= 'A' && x <= 'F')
+			x -= 'A' - 10;
+		else
+			continue;
+
+		//Uses printf instead of PrintAndLog since the latter
+		// adds linebreaks to each printout - this way was more convenient since we don't have to
+		// allocate a string and write to that first...
+
+		for(int i= 0 ; i < 4 ; ++i)
+			printf("%d",(x >> (3 - i)) & 1);
+	}
+	printf("\n");
+
+	return 0;
+}
+
+int CmdDataIIR(const char *Cmd){
+	iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
+	RepaintGraphWindow();
+	return 0;
+}
+
 static command_t CommandTable[] =
 {
 	{"help",            CmdHelp,            1, "This help"},
-	{"amp",             CmdAmp,             1, "Amplify peaks"},
-	//{"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
-	{"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave (default = 25)"},
+	{"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
 	{"askem410xdemod",  CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},
 	{"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},
+	{"askvikingdemod",  CmdVikingDemod,     1, "Demodulate a Viking AM tag from GraphBuffer"},
 	{"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
-	{"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+	{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+	{"bin2hex",         Cmdbin2hex,         1, "bin2hex <digits>     -- Converts binary to hexadecimal"},
 	{"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
-	//{"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
 	{"buffclear",       CmdBuffClear,       1, "Clear sample buffer and graph window"},
 	{"dec",             CmdDec,             1, "Decimate samples"},
 	{"detectclock",     CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
-	//{"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
+	{"fdxbdemod",       CmdFDXBdemodBI    , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
 	{"fskawiddemod",    CmdFSKdemodAWID,    1, "Demodulate an AWID FSK tag from GraphBuffer"},
 	//{"fskfcdetect",   CmdFSKfcDetect,     1, "Try to detect the Field Clock of an FSK wave"},
 	{"fskhiddemod",     CmdFSKdemodHID,     1, "Demodulate a HID FSK tag from GraphBuffer"},
@@ -2776,34 +2392,34 @@ static command_t CommandTable[] =
 	{"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
 	{"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
 	{"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
+	{"hex2bin",         Cmdhex2bin,         1, "hex2bin <hexadecimal> -- Converts hexadecimal to binary"},
 	{"hide",            CmdHide,            1, "Hide graph window"},
 	{"hpf",             CmdHpf,             1, "Remove DC offset from trace"},
 	{"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
 	{"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
 	{"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
-	//{"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
-	{"manrawdecode",    Cmdmandecoderaw,    1, "Manchester decode binary stream in DemodBuffer"},
-	{"manmod",          CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
+	{"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
 	{"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
 	{"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
-	{"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] -- print the data in the DemodBuffer - 'x' for hex output"},
+	{"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
 	{"pskindalademod",  CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},
+	{"psknexwatchdemod",CmdPSKNexWatch,     1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},
 	{"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
 	{"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
 	{"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
 	{"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
-	{"setdebugmode",    CmdSetDebugMode,    1, "<0|1> -- Turn on or off Debugging Mode for demods"},
+	{"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
 	{"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
-	//{"threshold",     CmdThreshold,       1, "<threshold> -- Maximize/minimize every value in the graph window depending on threshold"},
 	{"dirthreshold",    CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
 	{"tune",            CmdTuneSamples,     0, "Get hw tune samples for graph window"},
 	{"undec",           CmdUndec,           1, "Un-decimate samples by 2"},
 	{"zerocrossings",   CmdZerocrossings,   1, "Count time between zero-crossings"},
+	{"iir",				CmdDataIIR,			0, "apply IIR buttersworth filter on plotdata"},
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdData(const char *Cmd)
-{
+int CmdData(const char *Cmd){
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }