X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/38a30dbf1842290f12d2d42b73c403efa0711705..a9eeb576983f932ee622554ccd4e08be10e695b5:/client/cmdlffdx.c?ds=inline

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 511806dd..da22a833 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -149,6 +149,7 @@ int CmdFdxDemod(const char *Cmd) {
 	}
 
 	setDemodBuf(DemodBuffer, 128, ans);
+	setGrid_Clock(32);
 	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
 	size = removeParity(DemodBuffer, 11, 9, 2, 117);
 	if ( size != 104 ) {
@@ -175,8 +176,8 @@ int CmdFdxDemod(const char *Cmd) {
 	uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
 	
 	PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
-	PrintAndLog("Animal ID          %04u-%012llu", countryCode, NationalCode);
-	PrintAndLog("National Code      %012llu (0x%llX)", NationalCode, NationalCode);
+	PrintAndLog("Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLog("National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
 	PrintAndLog("Country Code       %04u", countryCode);
 	PrintAndLog("Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
 	PrintAndLog("");
@@ -202,7 +203,7 @@ int CmdFdxClone(const char *Cmd) {
 
 	uint32_t countryid = 0;
 	uint64_t animalid = 0;
-	uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
+	uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
 	uint8_t bits[128];
 	uint8_t *bs = bits;
 	memset(bs, 0, sizeof(bits));
@@ -214,9 +215,9 @@ int CmdFdxClone(const char *Cmd) {
 	animalid = param_get64ex(Cmd, 1, 0, 10);
 	
 	//Q5
-	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
+	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') {
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
+		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | ((32-2)>>1) << T5555_BITRATE_SHIFT | 4 << T5555_MAXBLOCK_SHIFT;
 	}
 	
 	verify_values(countryid, animalid);
@@ -250,7 +251,7 @@ int CmdFdxClone(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;
 		}