X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8a8de2cb6d850bf2252a52e11f8e3b1428e4a382..ea6a49dc5edcf3ffbb9e9bcf6d35429e812b05af:/client/cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 4248920d..7852508d 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("20000", TRUE);
 	return CmdJablotronDemod(Cmd);
 }
 
@@ -179,7 +175,7 @@ int CmdJablotronClone(const char *Cmd) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i = 2; i >= 0; --i) {
+	for (int i = 2; i >= 0; --i) {
 		c.arg[0] = blocks[i];
 		c.arg[1] = i;
 		clearCommandBuffer();