From c85189135eac76e96a38d22062f422c8ccfb18aa Mon Sep 17 00:00:00 2001
From: marshmellow42 <marshmellowrf@gmail.com>
Date: Fri, 24 Feb 2017 01:02:25 -0500
Subject: [PATCH] the timeout on lf read makes the threshold ...

option not work as expected..  need to find a more robust option...

+ added iceman's lf_em410x_sim help text..
---
 client/cmdlf.c     | 10 +++++-----
 client/cmdlfem4x.c | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 206d5355..5683a589 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -569,11 +569,11 @@ int CmdLFRead(const char *Cmd)
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	//WaitForResponse(CMD_ACK,NULL);	
-	if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
-		PrintAndLog("command execution time out");
-		return 1;
-	}
+	WaitForResponse(CMD_ACK,NULL);	
+	//if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+	//	PrintAndLog("command execution time out");
+	//	return 1;
+	//}
 
 	return 0;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c26b4f39..38bb5c5d 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -63,6 +63,20 @@ int CmdEM410xRead(const char *Cmd)
 	return 1;
 }
 
+int usage_lf_em410x_sim(void) {
+	PrintAndLog("Simulating EM410x tag");
+	PrintAndLog("");
+	PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h         - this help");
+	PrintAndLog("       uid       - uid (10 HEX symbols)");
+	PrintAndLog("       clock     - clock (32|64) (optional)");
+	PrintAndLog("samples:");
+	PrintAndLog("      lf em 410xsim 0F0368568B");
+	PrintAndLog("      lf em 410xsim 0F0368568B 32");
+	return 0;
+}
+
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -71,12 +85,7 @@ int CmdEM410xSim(const char *Cmd)
 	char cmdp = param_getchar(Cmd, 0);
 	uint8_t uid[5] = {0x00};
 
-	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf em 410xsim <UID> <clock>");
-		PrintAndLog("");
-		PrintAndLog("     sample: lf em 410xsim 0F0368568B");
-		return 0;
-	}
+	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
 	/* clock is 64 in EM410x tags */
 	uint8_t clock = 64;
 
-- 
2.39.2