X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5fe0a11dfed1d22aeeb2642d7d1abae2fca56e7a..e513cf8a318561cc58a22e30162ffa20b969139e:/client/cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index cae1bc8c..dc5e10d7 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;
 	}
@@ -109,8 +105,7 @@ int CmdJablotronDemod(const char *Cmd) {
 	uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
 	uint64_t id = getJablontronCardId(rawid);
 
-	PrintAndLog("Jablotron Tag Found: Card ID %u", id);
-	PrintAndLog("Raw: %08X%08X", raw1 ,raw2);
+	PrintAndLog("Jablotron Tag Found: Card ID %u  :: Raw: %08X%08X", id, raw1 ,raw2);
 
 	uint8_t chksum = raw2 & 0xFF;
 	PrintAndLog("Checksum: %02X [%s]",
@@ -130,14 +125,14 @@ int CmdJablotronDemod(const char *Cmd) {
 
 int CmdJablotronRead(const char *Cmd) {
 	CmdLFRead("s");
-	getSamples("30000",false);
+	getSamples("12000", TRUE);
 	return CmdJablotronDemod(Cmd);
 }
 
 int CmdJablotronClone(const char *Cmd) {
 
 	uint64_t fullcode = 0;
-	uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2<<T55x7_MAXBLOCK_SHIFT, 0, 0};
+	uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
 
 	uint8_t bits[64];
 	uint8_t *bs = bits;
@@ -151,7 +146,7 @@ int CmdJablotronClone(const char *Cmd) {
 	//Q5
 	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 2<<T5555_MAXBLOCK_SHIFT;
+		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | ((64-2)>>1) << T5555_BITRATE_SHIFT | 2 << T5555_MAXBLOCK_SHIFT;
 	}
 	
 	// clearing the topbit needed for the preambl detection. 
@@ -179,12 +174,12 @@ int CmdJablotronClone(const char *Cmd) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (int i=3; i>=0; i--) {
+	for (int i = 2; i >= 0; --i) {
 		c.arg[0] = blocks[i];
 		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;
 		}