X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4b3655e7f4dbb40b049d550612b1d03cc0900d3b..9bd1640803a4318ed589dbddb19aada36b2a02c0:/client/cmdlf.c?ds=inline

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 8469d80d..eb9aec68 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -7,44 +7,19 @@
 //-----------------------------------------------------------------------------
 // Low frequency commands
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include "proxmark3.h"
-#include "data.h"
-#include "graph.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmdmain.h"
-#include "cmddata.h"
-#include "util.h"
 #include "cmdlf.h"
-#include "cmdlfhid.h"
-#include "cmdlfawid.h"
-#include "cmdlfti.h"
-#include "cmdlfem4x.h"
-#include "cmdlfhitag.h"
-#include "cmdlft55xx.h"
-#include "cmdlfpcf7931.h"
-#include "cmdlfio.h"
-#include "lfdemod.h"
-#include "cmdlfviking.h"
-#include "cmdlfpresco.h"
-#include "cmdlfpyramid.h"
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
 	PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h             This help");
 	PrintAndLog("       L             Low frequency (125 KHz)");
 	PrintAndLog("       H             High frequency (134 KHz)");
-	PrintAndLog("       d <delay>     delay OFF period, (dec)");
-	PrintAndLog("       z <zero>      time period ZERO, (dec)");
-	PrintAndLog("       o <one>       time period ONE, (dec)");
-	PrintAndLog("       c <cmd>       Command bytes");
+	PrintAndLog("       d <delay>     delay OFF period, (decimal)");
+	PrintAndLog("       z <zero>      time period ZERO, (decimal)");
+	PrintAndLog("       o <one>       time period ONE, (decimal)");
+	PrintAndLog("       c <cmd>       Command bytes  (in ones and zeros)");
 	PrintAndLog("       ************* All periods in microseconds (ms)");
 	PrintAndLog("Examples:");
 	PrintAndLog("      lf cmdread d 80 z 100 o 200 c 11000");
@@ -53,7 +28,7 @@ int usage_lf_cmdread(void) {
 }
 int usage_lf_read(void){
 	PrintAndLog("Usage: lf read [h] [s]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h            This help");
 	PrintAndLog("       s            silent run no printout");
 	PrintAndLog("This function takes no arguments. ");
@@ -62,15 +37,15 @@ int usage_lf_read(void){
 }
 int usage_lf_snoop(void) {
 	PrintAndLog("Usage: lf snoop");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h            This help");
 	PrintAndLog("This function takes no arguments. ");
 	PrintAndLog("Use 'lf config' to set parameters.");
 	return 0;
 }
 int usage_lf_config(void) {
-	PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+	PrintAndLog("Options:");
 	PrintAndLog("       h             This help");
 	PrintAndLog("       L             Low frequency (125 KHz)");
 	PrintAndLog("       H             High frequency (134 KHz)");
@@ -93,7 +68,7 @@ int usage_lf_config(void) {
 }
 int usage_lf_simfsk(void) {
 	PrintAndLog("Usage: lf simfsk [c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h              This help");
 	PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
 	PrintAndLog("       i              invert data");
@@ -106,20 +81,20 @@ int usage_lf_simfsk(void) {
 }
 int usage_lf_simask(void) {
 	PrintAndLog("Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h              This help");
 	PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
 	PrintAndLog("       i              invert data");
 	PrintAndLog("       b              sim ask/biphase");
 	PrintAndLog("       m              sim ask/manchester - Default");
 	PrintAndLog("       r              sim ask/raw");
-	PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
+	PrintAndLog("       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
 	PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
 	return 0;
 }
 int usage_lf_simpsk(void) {
 	PrintAndLog("Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
-	PrintAndLog("Options:        ");
+	PrintAndLog("Options:");
 	PrintAndLog("       h              This help");
 	PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
 	PrintAndLog("       i              invert data");
@@ -131,42 +106,43 @@ int usage_lf_simpsk(void) {
 	return 0;
 }
 int usage_lf_find(void){
-    PrintAndLog("Usage:  lf search <0|1> [u]");
-    PrintAndLog("     <use data from Graphbuffer> , if not set, try reading data from tag.");
-    PrintAndLog("     [Search for Unknown tags] , if not set, reads only known tags.");
+    PrintAndLog("Usage:  lf search [h] <0|1> [u]");
     PrintAndLog("");
-    PrintAndLog("    sample: lf search     = try reading data from tag & search for known tags");
-    PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
-    PrintAndLog("          : lf search u   = try reading data from tag & search for known and unknown tags");
-    PrintAndLog("          : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
+	PrintAndLog("Options:");
+	PrintAndLog("       h             This help");
+	PrintAndLog("       <0|1>         Use data from Graphbuffer, if not set, try reading data from tag.");
+    PrintAndLog("       u             Search for Unknown tags, if not set, reads only known tags.");
+	PrintAndLog("Examples:");
+    PrintAndLog("      lf search     = try reading data from tag & search for known tags");
+    PrintAndLog("      lf search 1   = use data from GraphBuffer & search for known tags");
+    PrintAndLog("      lf search u   = try reading data from tag & search for known and unknown tags");
+    PrintAndLog("      lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
 	return 0;
 }
 
 
 /* send a LF command before reading */
-int CmdLFCommandRead(const char *Cmd)
-{
-	static char dummy[3] = {0x20,0x00,0x00};
-	UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};
-	bool errors = FALSE;
+int CmdLFCommandRead(const char *Cmd) {
 
+	bool errors = FALSE;
+	bool useHighFreq = FALSE;
+	uint16_t one = 0, zero = 0;
   	uint8_t cmdp = 0;
-	int strLength = 0;
-
+	UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
+	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch(param_getchar(Cmd, cmdp))
-		{
+		switch(param_getchar(Cmd, cmdp)) {
 		case 'h':
 			return usage_lf_cmdread();
 		case 'H':
-			dummy[1]='h';
+			useHighFreq = TRUE;
 			cmdp++;
 			break;
 		case 'L':
 			cmdp++;
 			break;
 		case 'c':
-			strLength = param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+			param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
 			cmdp+=2;
 			break;
 		case 'd':
@@ -174,11 +150,11 @@ int CmdLFCommandRead(const char *Cmd)
 			cmdp+=2;
 			break;
 		case 'z':
-			c.arg[1] = param_get32ex(Cmd, cmdp+1, 0, 10);
+			zero = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
 			cmdp+=2;
 			break;
 		case 'o':
-			c.arg[2] = param_get32ex(Cmd, cmdp+1, 0, 10);
+			one = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
 			cmdp+=2;
 			break;
 		default:
@@ -189,13 +165,16 @@ int CmdLFCommandRead(const char *Cmd)
 		if(errors) break;
 	}
 	// No args
-	if (cmdp == 0) errors = 1;
+	if (cmdp == 0) errors = TRUE;
 
 	//Validations
 	if (errors) return usage_lf_cmdread();
 	
-	// in case they specified 'H'
-	strcpy((char *)&c.d.asBytes + strLength, dummy);
+	// zero and one lengths
+	c.arg[1] = (uint32_t)(zero << 16 | one);
+	
+	// add frequency 125 or 134
+	c.arg[2] = useHighFreq;
 
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -204,81 +183,68 @@ int CmdLFCommandRead(const char *Cmd)
 
 int CmdFlexdemod(const char *Cmd)
 {
-  int i;
-  for (i = 0; i < GraphTraceLen; ++i) {
-    if (GraphBuffer[i] < 0) {
-      GraphBuffer[i] = -1;
-    } else {
-      GraphBuffer[i] = 1;
-    }
-  }
-
-#define LONG_WAIT 100
-  int start;
-  for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
-    int first = GraphBuffer[start];
-    for (i = start; i < start + LONG_WAIT; i++) {
-      if (GraphBuffer[i] != first) {
-        break;
-      }
-    }
-    if (i == (start + LONG_WAIT)) {
-      break;
-    }
-  }
-  if (start == GraphTraceLen - LONG_WAIT) {
-    PrintAndLog("nothing to wait for");
-    return 0;
-  }
-
-  GraphBuffer[start] = 2;
-  GraphBuffer[start+1] = -2;
+#define LONG_WAIT 100	
+	int i, j, start, bit, sum;
+	int phase = 0;
+
+	for (i = 0; i < GraphTraceLen; ++i)
+		GraphBuffer[i] = (GraphBuffer[i] < 0) ? -1 : 1;
+
+	for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
+		int first = GraphBuffer[start];
+		for (i = start; i < start + LONG_WAIT; i++) {
+			if (GraphBuffer[i] != first) {
+				break;
+			}
+		}
+		if (i == (start + LONG_WAIT))
+			break;
+	}
+	
+	if (start == GraphTraceLen - LONG_WAIT) {
+		PrintAndLog("nothing to wait for");
+		return 0;
+	}
+
+	GraphBuffer[start] = 2;
+	GraphBuffer[start+1] = -2;
 	uint8_t bits[64] = {0x00};
 
-	int bit, sum;
-  i = start;
-  for (bit = 0; bit < 64; bit++) {
+	i = start;
+	for (bit = 0; bit < 64; bit++) {
 		sum = 0;
 		for (int j = 0; j < 16; j++) {
-      sum += GraphBuffer[i++];
-    }
-
+			sum += GraphBuffer[i++];
+		}
 		bits[bit] = (sum > 0) ? 1 : 0;
+		PrintAndLog("bit %d sum %d", bit, sum);
+	}
+
+	for (bit = 0; bit < 64; bit++) {
+		sum = 0;
+		for (j = 0; j < 16; j++)
+			sum += GraphBuffer[i++];
+
+		if (sum > 0 && bits[bit] != 1) PrintAndLog("oops1 at %d", bit);
+
+		if (sum < 0 && bits[bit] != 0) PrintAndLog("oops2 at %d", bit);
 
-    PrintAndLog("bit %d sum %d", bit, sum);
-  }
-
-  for (bit = 0; bit < 64; bit++) {
-    int j;
-    int sum = 0;
-    for (j = 0; j < 16; j++) {
-      sum += GraphBuffer[i++];
-    }
-    if (sum > 0 && bits[bit] != 1) {
-      PrintAndLog("oops1 at %d", bit);
-    }
-    if (sum < 0 && bits[bit] != 0) {
-      PrintAndLog("oops2 at %d", bit);
-    }
-  }
+	}
 
 	// HACK writing back to graphbuffer.
-  GraphTraceLen = 32*64;
-  i = 0;
-  int phase = 0;
-  for (bit = 0; bit < 64; bit++) {
-	
+	GraphTraceLen = 32*64;
+	i = 0;
+	for (bit = 0; bit < 64; bit++) {
+		
 		phase = (bits[bit] == 0) ? 0 : 1;
 		
-    int j;
-    for (j = 0; j < 32; j++) {
-      GraphBuffer[i++] = phase;
-      phase = !phase;
-    }
-  }
-
-  RepaintGraphWindow();
-  return 0;
+		for (j = 0; j < 32; j++) {
+			GraphBuffer[i++] = phase;
+			phase = !phase;
+		}
+	}
+	RepaintGraphWindow();
+	return 0;
 }
   
 int CmdIndalaDemod(const char *Cmd)
@@ -291,10 +257,9 @@ int CmdIndalaDemod(const char *Cmd)
 
 	// worst case with GraphTraceLen=64000 is < 4096
 	// under normal conditions it's < 2048
-
 	uint8_t rawbits[4096];
-	int rawbit = 0;
-	int worst = 0, worstPos = 0;
+
+	int rawbit = 0, worst = 0, worstPos = 0;
 	// PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
 	
 	// loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
@@ -469,51 +434,49 @@ int CmdIndalaDemod(const char *Cmd)
 	return 1;
 }
 
-int CmdIndalaClone(const char *Cmd)
-{
-  UsbCommand c;
+int CmdIndalaClone(const char *Cmd){
+	UsbCommand c;
 	unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
 
 	uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
-  int n = 0, i = 0;
-
-  if (strchr(Cmd,'l') != 0) {
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-      uid1 = (uid1 << 4) | (uid2 >> 28);
-      uid2 = (uid2 << 4) | (uid3 >> 28);
-      uid3 = (uid3 << 4) | (uid4 >> 28);
-      uid4 = (uid4 << 4) | (uid5 >> 28);
-      uid5 = (uid5 << 4) | (uid6 >> 28);
-      uid6 = (uid6 << 4) | (uid7 >> 28);
-    	uid7 = (uid7 << 4) | (n & 0xf);
-    }
-    PrintAndLog("Cloning 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
-    c.cmd = CMD_INDALA_CLONE_TAG_L;
-    c.d.asDwords[0] = uid1;
-    c.d.asDwords[1] = uid2;
-    c.d.asDwords[2] = uid3;
-    c.d.asDwords[3] = uid4;
-    c.d.asDwords[4] = uid5;
-    c.d.asDwords[5] = uid6;
-    c.d.asDwords[6] = uid7;
+	int n = 0, i = 0;
+
+	if (strchr(Cmd,'l') != 0) {
+		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+			uid1 = (uid1 << 4) | (uid2 >> 28);
+			uid2 = (uid2 << 4) | (uid3 >> 28);
+			uid3 = (uid3 << 4) | (uid4 >> 28);
+			uid4 = (uid4 << 4) | (uid5 >> 28);
+			uid5 = (uid5 << 4) | (uid6 >> 28);
+			uid6 = (uid6 << 4) | (uid7 >> 28);
+			uid7 = (uid7 << 4) | (n & 0xf);
+		}
+		PrintAndLog("Cloning 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+		c.cmd = CMD_INDALA_CLONE_TAG_L;
+		c.d.asDwords[0] = uid1;
+		c.d.asDwords[1] = uid2;
+		c.d.asDwords[2] = uid3;
+		c.d.asDwords[3] = uid4;
+		c.d.asDwords[4] = uid5;
+		c.d.asDwords[5] = uid6;
+		c.d.asDwords[6] = uid7;
 	} else {
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-      uid1 = (uid1 << 4) | (uid2 >> 28);
-      uid2 = (uid2 << 4) | (n & 0xf);
-    }
-    PrintAndLog("Cloning 64bit tag with UID %x%08x", uid1, uid2);
-    c.cmd = CMD_INDALA_CLONE_TAG;
-    c.arg[0] = uid1;
-    c.arg[1] = uid2;
-  }
+		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+			uid1 = (uid1 << 4) | (uid2 >> 28);
+			uid2 = (uid2 << 4) | (n & 0xf);
+		}
+		PrintAndLog("Cloning 64bit tag with UID %x%08x", uid1, uid2);
+		c.cmd = CMD_INDALA_CLONE_TAG;
+		c.arg[0] = uid1;
+		c.arg[1] = uid2;
+	}
 
 	clearCommandBuffer();
-  SendCommand(&c);
-  return 0;
+	SendCommand(&c);
+	return 0;
 }
 
-int CmdLFSetConfig(const char *Cmd)
-{
+int CmdLFSetConfig(const char *Cmd) {
 	uint8_t divisor =  0;//Frequency divisor
 	uint8_t bps = 0; // Bits per sample
 	uint8_t decimation = 0; //How many to keep
@@ -523,10 +486,8 @@ int CmdLFSetConfig(const char *Cmd)
 	uint8_t unsigned_trigg = 0;
 
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00)
-	{
-		switch(param_getchar(Cmd, cmdp))
-		{
+	while(param_getchar(Cmd, cmdp) != 0x00) {
+		switch(param_getchar(Cmd, cmdp)) {
 		case 'h':
 			return usage_lf_config();
 		case 'H':
@@ -585,8 +546,7 @@ int CmdLFSetConfig(const char *Cmd)
 	return 0;
 }
 
-int CmdLFRead(const char *Cmd)
-{
+int CmdLFRead(const char *Cmd) {
 	bool arg1 = false;
 	uint8_t cmdp =  param_getchar(Cmd, 0);
 	
@@ -605,8 +565,7 @@ int CmdLFRead(const char *Cmd)
 	return 0;
 }
 
-int CmdLFSnoop(const char *Cmd)
-{
+int CmdLFSnoop(const char *Cmd) {
 	uint8_t cmdp = param_getchar(Cmd, 0);
 	if(cmdp == 'h' || cmdp == 'H') return usage_lf_snoop();
 	
@@ -617,22 +576,18 @@ int CmdLFSnoop(const char *Cmd)
 	return 0;
 }
 
-static void ChkBitstream(const char *str)
-{
-  int i;
- 
-  /* convert to bitstream if necessary */
-	for (i = 0; i < (int)(GraphTraceLen / 2); i++){
+static void ChkBitstream(const char *str) {
+	// convert to bitstream if necessary
+	for (int i = 0; i < (int)(GraphTraceLen / 2); i++){
 		if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
-      CmdGetBitStream("");
-      break;
-    }
-  }
+			CmdGetBitStream("");
+			break;
+		}
+	}
 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
-int CmdLFSim(const char *Cmd)
-{
+int CmdLFSim(const char *Cmd) {
 	int i,j;
 	static int gap;
 
@@ -662,395 +617,386 @@ int CmdLFSim(const char *Cmd)
 	return 0;
 }
 
-// by marshmellow - sim ask data given clock, fcHigh, fcLow, invert 
+// by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert 
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd)
 {
 	//might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
 	// otherwise will need FChigh, FClow, Clock, and bitstream
-  uint8_t fcHigh=0, fcLow=0, clk=0;
-  uint8_t invert=0;
-  bool errors = FALSE;
-  char hexData[32] = {0x00}; // store entered hex data
-  uint8_t data[255] = {0x00}; 
-  int dataLen = 0;
-  uint8_t cmdp = 0;
-  while(param_getchar(Cmd, cmdp) != 0x00)
-  {
-    switch(param_getchar(Cmd, cmdp))
-    {
-    case 'h':
-      return usage_lf_simfsk();
-    case 'i':
-      invert = 1;
-      cmdp++;
-      break;
-    case 'c':
-      errors |= param_getdec(Cmd,cmdp+1,&clk);
-      cmdp+=2;
-      break;
-    case 'H':
-      errors |= param_getdec(Cmd,cmdp+1,&fcHigh);
-      cmdp+=2;
-      break;
-    case 'L':
-      errors |= param_getdec(Cmd,cmdp+1,&fcLow);
-      cmdp+=2;
-      break;
-    //case 's':
-    //  separator=1;
-    //  cmdp++;
-    //  break;
-    case 'd':
-      dataLen = param_getstr(Cmd, cmdp+1, hexData);
-      if (dataLen==0) {
-        errors=TRUE; 
-      } else {
-        dataLen = hextobinarray((char *)data, hexData);
-      }   
-      if (dataLen==0) errors=TRUE; 
-      if (errors) PrintAndLog ("Error getting hex data");
-      cmdp+=2;
-      break;
-    default:
-      PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-      errors = TRUE;
-      break;
-    }
-    if(errors) break;
-  }
-  if(cmdp == 0 && DemodBufferLen == 0)
-  {
-    errors = TRUE;// No args
-  }
-
-  //Validations
-  if(errors)
-  {
-    return usage_lf_simfsk();
-  }
-
-  if (dataLen == 0){ //using DemodBuffer 
-    if (clk==0 || fcHigh==0 || fcLow==0){ //manual settings must set them all
-      uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0);
-      if (ans==0){
-        if (!fcHigh) fcHigh=10;
-        if (!fcLow) fcLow=8;
-        if (!clk) clk=50;
-      }
-    }
-  } else {
-    setDemodBuf(data, dataLen, 0);
-  }
+	uint8_t fcHigh = 0, fcLow = 0, clk = 0;
+	uint8_t invert = 0;
+	bool errors = FALSE;
+	char hexData[32] = {0x00}; // store entered hex data
+	uint8_t data[255] = {0x00}; 
+	int dataLen = 0;
+	uint8_t cmdp = 0;
+	
+	while(param_getchar(Cmd, cmdp) != 0x00) {
+		switch(param_getchar(Cmd, cmdp)){
+			case 'h':
+				return usage_lf_simfsk();
+			case 'i':
+				invert = 1;
+				cmdp++;
+				break;
+			case 'c':
+				errors |= param_getdec(Cmd, cmdp+1, &clk);
+				cmdp += 2;
+				break;
+			case 'H':
+				errors |= param_getdec(Cmd, cmdp+1, &fcHigh);
+				cmdp += 2;
+				break;
+			case 'L':
+				errors |= param_getdec(Cmd, cmdp+1, &fcLow);
+				cmdp += 2;
+				break;
+			//case 's':
+			//  separator = 1;
+			//  cmdp++;
+			//  break;
+			case 'd':
+				dataLen = param_getstr(Cmd, cmdp+1, hexData);
+				if (dataLen == 0)
+					errors = TRUE; 
+				else
+					dataLen = hextobinarray((char *)data, hexData);
+				   
+				if (dataLen == 0) errors = TRUE; 
+				if (errors) PrintAndLog ("Error getting hex data");
+				cmdp+=2;
+				break;
+			default:
+				PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+				errors = TRUE;
+				break;
+		}
+		if(errors) break;
+	}
+	
+	// No args
+	if(cmdp == 0 && DemodBufferLen == 0)
+		errors = TRUE;
+
+	//Validations
+	if(errors) return usage_lf_simfsk();
+
+	if (dataLen == 0){ //using DemodBuffer 
+		if (clk == 0 || fcHigh == 0 || fcLow == 0){ //manual settings must set them all
+			uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0);
+			if (ans==0){
+				if (!fcHigh) fcHigh = 10;
+				if (!fcLow) fcLow = 8;
+				if (!clk) clk = 50;
+			}
+		}
+	} else {
+		setDemodBuf(data, dataLen, 0);
+	}
 
 	//default if not found
-  if (clk == 0) clk = 50;
-  if (fcHigh == 0) fcHigh = 10;
-  if (fcLow == 0) fcLow = 8;
-
-  uint16_t arg1, arg2;
-  arg1 = fcHigh << 8 | fcLow;
-  arg2 = invert << 8 | clk;
-  size_t size = DemodBufferLen;
-  if (size > USB_CMD_DATA_SIZE) {
-    PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-    size = USB_CMD_DATA_SIZE;
-  } 
-  UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-
-  memcpy(c.d.asBytes, DemodBuffer, size);
+	if (clk == 0) clk = 50;
+	if (fcHigh == 0) fcHigh = 10;
+	if (fcLow == 0) fcLow = 8;
+
+	uint16_t arg1, arg2;
+	arg1 = fcHigh << 8 | fcLow;
+	arg2 = invert << 8 | clk;
+	size_t size = DemodBufferLen;
+	if (size > USB_CMD_DATA_SIZE) {
+		PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+		size = USB_CMD_DATA_SIZE;
+	} 
+	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+
+	memcpy(c.d.asBytes, DemodBuffer, size);
 	clearCommandBuffer();
-  SendCommand(&c);
-  return 0;
+	SendCommand(&c);
+	return 0;
 }
 
 // by marshmellow - sim ask data given clock, invert, manchester or raw, separator 
 // - allow pull data from DemodBuffer
 int CmdLFaskSim(const char *Cmd)
 {
-  //autodetect clock from Graphbuffer if using demod buffer
+	// autodetect clock from Graphbuffer if using demod buffer
 	// needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
-  uint8_t encoding = 1, separator = 0;
-  uint8_t clk=0, invert=0;
-  bool errors = FALSE;
-  char hexData[32] = {0x00}; 
-  uint8_t data[255]= {0x00}; // store entered hex data
-  int dataLen = 0;
-  uint8_t cmdp = 0;
-  while(param_getchar(Cmd, cmdp) != 0x00)
-  {
-    switch(param_getchar(Cmd, cmdp))
-    {
-    case 'h':
-      return usage_lf_simask();
-    case 'i':
-      invert = 1;
-      cmdp++;
-      break;
-    case 'c':
-      errors |= param_getdec(Cmd,cmdp+1,&clk);
-      cmdp+=2;
-      break;
-    case 'b':
-      encoding=2; //biphase
-      cmdp++;
-      break;
-    case 'm':
-      encoding=1;
-      cmdp++;
-      break;
-    case 'r':
-      encoding=0;
-      cmdp++;
-      break;
-    case 's':
-      separator=1;
-      cmdp++;
-      break;
-    case 'd':
-      dataLen = param_getstr(Cmd, cmdp+1, hexData);
-      if (dataLen==0) {
-        errors=TRUE; 
-      } else {
-        dataLen = hextobinarray((char *)data, hexData);
-      }
-      if (dataLen==0) errors=TRUE; 
-      if (errors) PrintAndLog ("Error getting hex data, datalen: %d",dataLen);
-        cmdp+=2;
-      break;
-    default:
-      PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-      errors = TRUE;
-      break;
-    }
-    if(errors) break;
-  }
-  if(cmdp == 0 && DemodBufferLen == 0)
-  {
-    errors = TRUE;// No args
-  }
-
-  //Validations
-  if(errors)
-  {
-    return usage_lf_simask();
-  }
-  if (dataLen == 0){ //using DemodBuffer
-    if (clk == 0) clk = GetAskClock("0", false, false);
-  } else {
-    setDemodBuf(data, dataLen, 0);
-  }
-  if (clk == 0) clk = 64;
-  if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
-  uint16_t arg1, arg2;
-  size_t size=DemodBufferLen;
-  arg1 = clk << 8 | encoding;
-  arg2 = invert << 8 | separator;
-  if (size > USB_CMD_DATA_SIZE) {
-    PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-    size = USB_CMD_DATA_SIZE;
-  }
-  UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-  PrintAndLog("preparing to sim ask data: %d bits", size);
-  memcpy(c.d.asBytes, DemodBuffer, size);
+	uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
+	bool errors = FALSE;
+	char hexData[32] = {0x00}; 
+	uint8_t data[255]= {0x00}; // store entered hex data
+	int dataLen = 0;
+	uint8_t cmdp = 0;
+	
+	while(param_getchar(Cmd, cmdp) != 0x00) {
+		switch(param_getchar(Cmd, cmdp)) {
+			case 'h': return usage_lf_simask();
+			case 'i':
+				invert = 1;
+				cmdp++;
+				break;
+			case 'c':
+				errors |= param_getdec(Cmd, cmdp+1, &clk);
+				cmdp += 2;
+				break;
+			case 'b':
+				encoding = 2; //biphase
+				cmdp++;
+				break;
+			case 'm':
+				encoding = 1; //manchester
+				cmdp++;
+				break;
+			case 'r':
+				encoding = 0; //raw
+				cmdp++;
+				break;
+			case 's':
+				separator = 1;
+				cmdp++;
+				break;
+			case 'd':
+				dataLen = param_getstr(Cmd, cmdp+1, hexData);
+				if (dataLen == 0)
+					errors = TRUE; 
+				else
+					dataLen = hextobinarray((char *)data, hexData);
+				
+				if (dataLen == 0) errors = TRUE; 
+				if (errors) PrintAndLog ("Error getting hex data, datalen: %d", dataLen);
+				cmdp += 2;
+				break;
+			default:
+				PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+				errors = TRUE;
+				break;
+		}
+		if(errors) break;
+	}
+
+	// No args
+	if(cmdp == 0 && DemodBufferLen == 0)
+		errors = TRUE;
+
+	//Validations
+	if(errors) return usage_lf_simask();
+	
+	if (dataLen == 0){ //using DemodBuffer
+		if (clk == 0) 
+			clk = GetAskClock("0", false, false);
+	} else {
+		setDemodBuf(data, dataLen, 0);
+	}
+	if (clk == 0) clk = 64;
+	if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
+	
+	size_t size = DemodBufferLen;
+
+	if (size > USB_CMD_DATA_SIZE) {
+		PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+		size = USB_CMD_DATA_SIZE;
+	}
+	
+	PrintAndLog("preparing to sim ask data: %d bits", size);	
+
+	uint16_t arg1, arg2;	
+	arg1 = clk << 8 | encoding;
+	arg2 = invert << 8 | separator;
+
+	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+	memcpy(c.d.asBytes, DemodBuffer, size);
 	clearCommandBuffer();
-  SendCommand(&c);
-  return 0;
+	SendCommand(&c);
+	return 0;
 }
 
 // by marshmellow - sim psk data given carrier, clock, invert 
 // - allow pull data from DemodBuffer or parameters
-int CmdLFpskSim(const char *Cmd)
-{
-  //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
-  //will need carrier, Clock, and bitstream
-  uint8_t carrier=0, clk=0;
-  uint8_t invert=0;
-  bool errors = FALSE;
-  char hexData[32] = {0x00}; // store entered hex data
-  uint8_t data[255] = {0x00}; 
-  int dataLen = 0;
-  uint8_t cmdp = 0;
-  uint8_t pskType = 1;
-  while(param_getchar(Cmd, cmdp) != 0x00)
-  {
-    switch(param_getchar(Cmd, cmdp))
-    {
-    case 'h':
-      return usage_lf_simpsk();
-    case 'i':
-      invert = 1;
-      cmdp++;
-      break;
-    case 'c':
-      errors |= param_getdec(Cmd,cmdp+1,&clk);
-      cmdp+=2;
-      break;
-    case 'r':
-      errors |= param_getdec(Cmd,cmdp+1,&carrier);
-      cmdp+=2;
-      break;
-    case '1':
-      pskType=1;
-      cmdp++;
-      break;
-    case '2':
-      pskType=2;
-      cmdp++;
-      break;
-    case '3':
-      pskType=3;
-      cmdp++;
-      break;
-    case 'd':
-      dataLen = param_getstr(Cmd, cmdp+1, hexData);
-      if (dataLen==0) {
-        errors=TRUE; 
-      } else {
-        dataLen = hextobinarray((char *)data, hexData);
-      }    
-      if (dataLen==0) errors=TRUE; 
-      if (errors) PrintAndLog ("Error getting hex data");
-      cmdp+=2;
-      break;
-    default:
-      PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-      errors = TRUE;
-      break;
-    }
-    if (errors) break;
-  }
-  if (cmdp == 0 && DemodBufferLen == 0)
-  {
-    errors = TRUE;// No args
-  }
-
-  //Validations
-  if (errors)
-  {
-    return usage_lf_simpsk();
-  }
-  if (dataLen == 0){ //using DemodBuffer
-    PrintAndLog("Getting Clocks");
-    if (clk==0) clk = GetPskClock("", FALSE, FALSE);
-    PrintAndLog("clk: %d",clk);
-    if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE); 
-    PrintAndLog("carrier: %d", carrier);
-  } else {
-    setDemodBuf(data, dataLen, 0);
-  }
-
-  if (clk <= 0) clk = 32;
-  if (carrier == 0) carrier = 2;
-  if (pskType != 1){
-    if (pskType == 2){
-      //need to convert psk2 to psk1 data before sim
-      psk2TOpsk1(DemodBuffer, DemodBufferLen);
-    } else {
-      PrintAndLog("Sorry, PSK3 not yet available");
-    }
-  }
-  uint16_t arg1, arg2;
-  arg1 = clk << 8 | carrier;
-  arg2 = invert;
-  size_t size=DemodBufferLen;
-  if (size > USB_CMD_DATA_SIZE) {
-    PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-    size=USB_CMD_DATA_SIZE;
-  }
-  UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-  PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
-  memcpy(c.d.asBytes, DemodBuffer, size);
-	clearCommandBuffer();
-  SendCommand(&c);
+int CmdLFpskSim(const char *Cmd) {
+	//might be able to autodetect FC and clock from Graphbuffer if using demod buffer
+	//will need carrier, Clock, and bitstream
+	uint8_t carrier=0, clk=0;
+	uint8_t invert=0;
+	bool errors = FALSE;
+	char hexData[32] = {0x00}; // store entered hex data
+	uint8_t data[255] = {0x00}; 
+	int dataLen = 0;
+	uint8_t cmdp = 0;
+	uint8_t pskType = 1;
+	
+	while(param_getchar(Cmd, cmdp) != 0x00)	{
+		switch(param_getchar(Cmd, cmdp)) {
+			case 'h':
+				return usage_lf_simpsk();
+			case 'i':
+				invert = 1;
+				cmdp++;
+				break;
+			case 'c':
+				errors |= param_getdec(Cmd,cmdp+1,&clk);
+				cmdp +=2;
+				break;
+			case 'r':
+				errors |= param_getdec(Cmd,cmdp+1,&carrier);
+				cmdp += 2;
+				break;
+			case '1':
+				pskType = 1;
+				cmdp++;
+				break;
+			case '2':
+				pskType = 2;
+				cmdp++;
+				break;
+			case '3':
+				pskType = 3;
+				cmdp++;
+				break;
+			case 'd':
+				dataLen = param_getstr(Cmd, cmdp+1, hexData);
+				if (dataLen == 0)
+					errors = TRUE; 
+				else
+					dataLen = hextobinarray((char *)data, hexData);
+				    
+				if (dataLen == 0) errors = TRUE; 
+				if (errors) PrintAndLog ("Error getting hex data");
+				cmdp+=2;
+				break;
+			default:
+				PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+				errors = TRUE;
+				break;
+			}
+		if (errors) break;
+	}
+	// No args
+	if (cmdp == 0 && DemodBufferLen == 0)
+		errors = TRUE;
+
+	//Validations
+	if (errors) return usage_lf_simpsk();
+
+	if (dataLen == 0){ //using DemodBuffer
+		PrintAndLog("Getting Clocks");
+		
+		if (clk==0) clk = GetPskClock("", FALSE, FALSE);
+		PrintAndLog("clk: %d",clk);
+		
+		if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE); 
+		PrintAndLog("carrier: %d", carrier);
+		
+	} else {
+		setDemodBuf(data, dataLen, 0);
+	}
+
+	if (clk <= 0) clk = 32;
+
+	if (carrier == 0) carrier = 2;
   
-  return 0;
+	if (pskType != 1){
+		if (pskType == 2){
+			//need to convert psk2 to psk1 data before sim
+			psk2TOpsk1(DemodBuffer, DemodBufferLen);
+		} else {
+			PrintAndLog("Sorry, PSK3 not yet available");
+		}
+	}
+	uint16_t arg1, arg2;
+	arg1 = clk << 8 | carrier;
+	arg2 = invert;
+	size_t size = DemodBufferLen;
+	if (size > USB_CMD_DATA_SIZE) {
+		PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+		size = USB_CMD_DATA_SIZE;
+	}
+	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+	PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
+	memcpy(c.d.asBytes, DemodBuffer, size);
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
 }
 
-int CmdLFSimBidir(const char *Cmd)
-{
-  // Set ADC to twice the carrier for a slight supersampling
-  // HACK: not implemented in ARMSRC.
-  PrintAndLog("Not implemented yet.");
-  UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
-  SendCommand(&c);
-  return 0;
+int CmdLFSimBidir(const char *Cmd) {
+	// Set ADC to twice the carrier for a slight supersampling
+	// HACK: not implemented in ARMSRC.
+	PrintAndLog("Not implemented yet.");
+	UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
+	SendCommand(&c);
+	return 0;
 }
 
-int CmdVchDemod(const char *Cmd)
-{
-  // Is this the entire sync pattern, or does this also include some
-  // data bits that happen to be the same everywhere? That would be
-  // lovely to know.
-  static const int SyncPattern[] = {
-    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, -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,  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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  };
-
-  // So first, we correlate for the sync pattern, and mark that.
-  int bestCorrel = 0, bestPos = 0;
-  int i;
-  // It does us no good to find the sync pattern, with fewer than
-  // 2048 samples after it...
-  for (i = 0; i < (GraphTraceLen-2048); i++) {
-    int sum = 0;
-    int j;
-    for (j = 0; j < arraylen(SyncPattern); j++) {
-      sum += GraphBuffer[i+j]*SyncPattern[j];
-    }
-    if (sum > bestCorrel) {
-      bestCorrel = sum;
-      bestPos = i;
-    }
-  }
-  PrintAndLog("best sync at %d [metric %d]", bestPos, bestCorrel);
-
-  char bits[257];
-  bits[256] = '\0';
-
-  int worst = INT_MAX;
-  int worstPos = 0;
-
-  for (i = 0; i < 2048; i += 8) {
-    int sum = 0;
-    int j;
-    for (j = 0; j < 8; j++) {
-      sum += GraphBuffer[bestPos+i+j];
-    }
-    if (sum < 0) {
-      bits[i/8] = '.';
-    } else {
-      bits[i/8] = '1';
-    }
-    if(abs(sum) < worst) {
-      worst = abs(sum);
-      worstPos = i;
-    }
-  }
-  PrintAndLog("bits:");
-  PrintAndLog("%s", bits);
-  PrintAndLog("worst metric: %d at pos %d", worst, worstPos);
-
-  if (strcmp(Cmd, "clone")==0) {
-    GraphTraceLen = 0;
-    char *s;
-    for(s = bits; *s; s++) {
-      int j;
-      for(j = 0; j < 16; j++) {
-        GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
-      }
-    }
-    RepaintGraphWindow();
-  }
-  return 0;
+int CmdVchDemod(const char *Cmd) {
+	// Is this the entire sync pattern, or does this also include some
+	// data bits that happen to be the same everywhere? That would be
+	// lovely to know.
+	static const int SyncPattern[] = {
+		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, -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,  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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	};
+
+	// So first, we correlate for the sync pattern, and mark that.
+	int bestCorrel = 0, bestPos = 0;
+	int i, j, sum = 0;
+
+	// It does us no good to find the sync pattern, with fewer than 2048 samples after it.
+
+	for (i = 0; i < (GraphTraceLen - 2048); i++) {
+		for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
+			sum += GraphBuffer[i+j] * SyncPattern[j];
+		}
+		if (sum > bestCorrel) {
+			bestCorrel = sum;
+			bestPos = i;
+		}
+	}
+	PrintAndLog("best sync at %d [metric %d]", bestPos, bestCorrel);
+
+	char bits[257];
+	bits[256] = '\0';
+
+	int worst = INT_MAX, worstPos = 0;
+
+	for (i = 0; i < 2048; i += 8) {
+		sum = 0;
+		for (j = 0; j < 8; j++) 
+			sum += GraphBuffer[bestPos+i+j];
+		
+		if (sum < 0)
+			bits[i/8] = '.';
+		else
+			bits[i/8] = '1';
+		
+		if(abs(sum) < worst) {
+			worst = abs(sum);
+			worstPos = i;
+		}
+	}
+	PrintAndLog("bits:");
+	PrintAndLog("%s", bits);
+	PrintAndLog("worst metric: %d at pos %d", worst, worstPos);
+
+	// clone
+	if (strcmp(Cmd, "clone")==0) {
+		GraphTraceLen = 0;
+		char *s;
+			for(s = bits; *s; s++) {
+				for(j = 0; j < 16; j++) {
+					GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
+				}
+			}
+		RepaintGraphWindow();
+	}
+	return 0;
 }
 
 //by marshmellow
@@ -1075,75 +1021,74 @@ int CmdLFfind(const char *Cmd) {
 
 	ans=CmdFSKdemodIO("");
 	if (ans>0) {
-	PrintAndLog("\nValid IO Prox ID Found!");
-	return 1;
+		PrintAndLog("\nValid IO Prox ID Found!");
+		return 1;
 	}
-
 	ans=CmdFSKdemodPyramid("");
 	if (ans>0) {
-	PrintAndLog("\nValid Pyramid ID Found!");
-	return 1;
+		PrintAndLog("\nValid Pyramid ID Found!");
+		return 1;
 	}
-
 	ans=CmdFSKdemodParadox("");
 	if (ans>0) {
-	PrintAndLog("\nValid Paradox ID Found!");
-	return 1;
+		PrintAndLog("\nValid Paradox ID Found!");
+		return 1;
 	}
-
 	ans=CmdFSKdemodAWID("");
 	if (ans>0) {
-	PrintAndLog("\nValid AWID ID Found!");
-	return 1;
+		PrintAndLog("\nValid AWID ID Found!");
+		return 1;
 	}
-
 	ans=CmdFSKdemodHID("");
 	if (ans>0) {
-	PrintAndLog("\nValid HID Prox ID Found!");
-	return 1;
+		PrintAndLog("\nValid HID Prox ID Found!");
+		return 1;
 	}
-
 	ans=CmdAskEM410xDemod("");
 	if (ans>0) {
-	PrintAndLog("\nValid EM410x ID Found!");
-	return 1;
+		PrintAndLog("\nValid EM410x ID Found!");
+		return 1;
 	}
-
 	ans=CmdG_Prox_II_Demod("");
 	if (ans>0) {
-	PrintAndLog("\nValid Guardall G-Prox II ID Found!");
-	return 1;
+		PrintAndLog("\nValid Guardall G-Prox II ID Found!");
+		return 1;
 	}
-
 	ans=CmdFDXBdemodBI("");
 	if (ans>0) {
 		PrintAndLog("\nValid FDX-B ID Found!");
 		return 1;
 	}
-
 	ans=EM4x50Read("", false);
 	if (ans>0) {
 		PrintAndLog("\nValid EM4x50 ID Found!");
 		return 1;
 	}	
-
 	ans=CmdVikingDemod("");
 	if (ans>0) {
 		PrintAndLog("\nValid Viking ID Found!");
 		return 1;
 	}	
-
 	ans=CmdIndalaDecode("");
 	if (ans>0) {
 		PrintAndLog("\nValid Indala ID Found!");
 		return 1;
 	}
-
 	ans=CmdPSKNexWatch("");
 	if (ans>0) {
 		PrintAndLog("\nValid NexWatch ID Found!");
 		return 1;
 	}
+	ans=CmdJablotronDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Jablotron ID Found!");
+		return 1;
+	}
+	ans=CmdLFNedapDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid NEDAP ID Found!");
+		return 1;
+	}
 	// TIdemod?
 	
 
@@ -1213,9 +1158,12 @@ static command_t CommandTable[] =
 	{"help",        CmdHelp,            1, "This help"},
 	{"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
 	{"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
+	{"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},
 	{"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
 	{"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
 	{"io",			CmdLFIO,			1, "{ IOPROX RFIDs... }"},
+	{"jablotron",	CmdLFJablotron,		1, "{ JABLOTRON RFIDs... }"},
+	{"nedap",		CmdLFNedap,			1, "{ NEDAP RFIDs... }"},
 	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
 	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
 	{"pyramid",		CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},