X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f5538c1c4ec3fc35e52cc7436029322cc3bb8639..905c55de2bbe642412b47ed4e92344096c817fac:/client/cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 3c5edd39..473fbe28 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------------
 // Low frequency Presco tag commands
 //-----------------------------------------------------------------------------
+
 #include "cmdlfjablotron.h"
 
 static int CmdHelp(const char *Cmd);
@@ -18,7 +19,7 @@ int usage_lf_jablotron_clone(void){
 	PrintAndLog("      <card ID>  : jablotron card ID");
 	PrintAndLog("      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf jablotron clone d 112233");
+	PrintAndLog("Sample: lf jablotron clone 112233");
 	return 0;
 }
 
@@ -31,7 +32,7 @@ int usage_lf_jablotron_sim(void) {
 	PrintAndLog("      h          : This help");
 	PrintAndLog("      <card ID>  : jablotron card ID");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf jablotron sim d 112233");
+	PrintAndLog("Sample: lf jablotron sim 112233");
 	return 0;
 }
 
@@ -57,74 +58,82 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
 	return 1;
 }
 
+static uint64_t getJablontronCardId( uint64_t rawcode ){
+	uint64_t id = 0;
+	uint8_t bytes[] = {0,0,0,0,0};
+	num_to_bytes(rawcode, 5, bytes);
+	for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
+		id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
+		id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
+	}
+	return id;
+}
+
 //see ASKDemod for what args are accepted
 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;
 	}
 
 	setDemodBuf(DemodBuffer+ans, 64, 0);
+	setGrid_Clock(64);
 	
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint64_t cardid = (raw1 & 0xFFFF);
-	cardid <<= 24;
-	cardid |= (raw2 >> 8);
-	
-	PrintAndLog("Jablotron Tag Found: Card ID %"PRIx64, cardid);
-	PrintAndLog("Raw: %08X%08X", raw1 ,raw2);
+
+	uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
+	uint64_t id = getJablontronCardId(rawid);
+
+	PrintAndLog("Jablotron Tag Found: Card ID %u  :: Raw: %08X%08X", id, raw1 ,raw2);
 
 	uint8_t chksum = raw2 & 0xFF;
 	PrintAndLog("Checksum: %02X [%s]",
 		chksum,
 		(chksum == jablontron_chksum(DemodBuffer)) ? "OK":"FAIL"		
 	);
-		
+
+	id = DEC2BCD(id);
 	// Printed format: 1410-nn-nnnn-nnnn	
-	PrintAndLog("Printed:  1410-%02X-%04X-%04X",
-		(raw1 & 0x0000FF00) >> 8,
-		(raw1 & 0xFF) << 8 | ((raw2 >> 24) & 0xFF),
-		(raw2 & 0x00FFFF00) >> 8
-	);	
+	PrintAndLog("Printed: 1410-%02X-%04X-%04X",
+		(uint8_t)(id >> 32) & 0xFF,
+		(uint16_t)(id >> 16) & 0xFFFF,
+		(uint16_t)id & 0xFFFF
+	);
 	return 1;
 }
 
 int CmdJablotronRead(const char *Cmd) {
 	CmdLFRead("s");
-	getSamples("30000",false);
+	getSamples("10000", 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;
@@ -138,7 +147,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. 
@@ -166,12 +175,12 @@ int CmdJablotronClone(const char *Cmd) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (int i=4; 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;
 		}