X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/af17926620a2537d165d8b00d97ce8a88d2944d2..e7f43e92e9b8a8afe7aa235a34a70af59e8e6cea:/client/cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index eb9aec68..d64a15c5 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -596,8 +596,10 @@ int CmdLFSim(const char *Cmd) {
 	// convert to bitstream if necessary 
 	ChkBitstream(Cmd);
 
+	if (g_debugMode) 
+		printf("DEBUG: Sending [%d bytes]\n", GraphTraceLen);
+	
 	//can send only 512 bits at a time (1 byte sent per bit...)
-	printf("Sending [%d bytes]", GraphTraceLen);
 	for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
 		UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 
@@ -606,11 +608,12 @@ int CmdLFSim(const char *Cmd) {
 		}
 		clearCommandBuffer();
 		SendCommand(&c);
-		WaitForResponse(CMD_ACK,NULL);
+		WaitForResponse(CMD_ACK, NULL);
 		printf(".");
 	}
 
-	PrintAndLog("\nStarting to simulate");
+	PrintAndLog("Starting to simulate");
+
 	UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -730,6 +733,7 @@ int CmdLFaskSim(const char *Cmd)
 	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(param_getchar(Cmd, cmdp)) {
+			case 'H':
 			case 'h': return usage_lf_simask();
 			case 'i':
 				invert = 1;
@@ -788,7 +792,7 @@ int CmdLFaskSim(const char *Cmd)
 		setDemodBuf(data, dataLen, 0);
 	}
 	if (clk == 0) clk = 64;
-	if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
+	if (encoding == 0) clk >>= 2; //askraw needs to double the clock speed
 	
 	size_t size = DemodBufferLen;
 
@@ -1015,10 +1019,17 @@ int CmdLFfind(const char *Cmd) {
 	}
 	if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
 
+	// if ( justNoise(GraphBuffer, GraphTraceLen) ) {
+		// PrintAndLog("Signal looks just like noise. Quitting.");
+		// return 0;
+	// }
+	
 	PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
 	PrintAndLog("False Positives ARE possible\n");  
 	PrintAndLog("\nChecking for known tags:\n");
 
+
+		
 	ans=CmdFSKdemodIO("");
 	if (ans>0) {
 		PrintAndLog("\nValid IO Prox ID Found!");