X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c5d886170c256ea2296ef5ac85a5137ae072d67b..e04f23fabf67d76d9a8594083da1e19e8a2034a1:/client/cmdlfjablotron.c?ds=sidebyside

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index bd99fede..95fe2922 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -75,27 +75,23 @@ int CmdJablotronDemod(const char *Cmd) {
 	//Differential Biphase / di-phase (inverted biphase)
 	//get binary from ask wave
 	if (!ASKbiphaseDemod("0 64 1 0", FALSE)) {
-		if (g_debugMode) PrintAndLog("Error Jablotron: ASKbiphaseDemod failed");
+		if (g_debugMode) PrintAndLog("DEBUG: Error - Jablotron ASKbiphaseDemod failed");
 		return 0;
 	}
 	size_t size = DemodBufferLen;
 	int ans = JablotronDemod(DemodBuffer, &size);
 	if (ans < 0){
 		if (g_debugMode){
-			// if (ans == -5)
-				// PrintAndLog("DEBUG: Error - not enough samples");
 			if (ans == -1)
 				PrintAndLog("DEBUG: Error - Jablotron too few bits found");
-			// else if (ans == -2)
-				// PrintAndLog("DEBUG: Error - problem during ASK/Biphase demod");
-			else if (ans == -3)
-				PrintAndLog("DEBUG: Error - Jablotron Size not correct: %d", size);
-			else if (ans == -4)
+			else if (ans == -2)
 				PrintAndLog("DEBUG: Error - Jablotron preamble not found");
+			else if (ans == -3)
+				PrintAndLog("DEBUG: Error - Jablotron size not correct: %d", size);
 			else if (ans == -5)
 				PrintAndLog("DEBUG: Error - Jablotron checksum failed");
 			else
-				PrintAndLog("DEBUG: Error - ans: %d", ans);
+				PrintAndLog("DEBUG: Error - Jablotron ans: %d", ans);
 		}
 		return 0;
 	}
@@ -130,7 +126,7 @@ int CmdJablotronDemod(const char *Cmd) {
 
 int CmdJablotronRead(const char *Cmd) {
 	CmdLFRead("s");
-	getSamples("30000",false);
+	getSamples("12000", TRUE);
 	return CmdJablotronDemod(Cmd);
 }
 
@@ -184,7 +180,7 @@ int CmdJablotronClone(const char *Cmd) {
 		c.arg[1] = i;
 		clearCommandBuffer();
 		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
 			PrintAndLog("Error occurred, device did not respond during write operation.");
 			return -1;
 		}