X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bb73c58d9a5501426646b8fcfff87331ea3312a6..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/client/cmdlfnedap.c

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 52cc7359..7a3268bb 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -136,7 +136,8 @@ int CmdLFNedapDemod(const char *Cmd) {
 	raw[2] = bytebits_to_byte(DemodBuffer+idx+32,32);
 	raw[3] = bytebits_to_byte(DemodBuffer+idx,32);
 	setDemodBuf(DemodBuffer,128,idx);
-
+	setGrid_Clock(64);
+	
 	uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63);
 	if ( firstParity != DemodBuffer[63]  ) {
 		PrintAndLog("DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
@@ -202,7 +203,7 @@ lf t55xx wr b 4 d 4c0003ff
 
 int CmdLFNedapRead(const char *Cmd) {
 	CmdLFRead("s");
-	getSamples("20000", TRUE);
+	getSamples("12000", TRUE);
 	return CmdLFNedapDemod("");
 }
 /*
@@ -229,11 +230,11 @@ int CmdLFNedapClone(const char *Cmd) {
 	((ASK/DIphase   data rawdemod ab 0 64 1 0
 	//NEDAP - compat mode, ASK/DIphase, data rate 64, 4 data blocks
 	// DI-pahse (CDP) T55x7_MODULATION_DIPHASE
-	blocks[0] = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 7<<T55x7_MAXBLOCK_SHIFT;
+	blocks[0] = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 7 << T55x7_MAXBLOCK_SHIFT;
 
 	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 7<<T5555_MAXBLOCK_SHIFT;
+		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | ((64-2)>>1) << T5555_BITRATE_SHIFT | 7 <<T5555_MAXBLOCK_SHIFT;
 
 	blocks[1] = bytebits_to_byte(bs,32);
 	blocks[2] = bytebits_to_byte(bs+32,32);
@@ -254,7 +255,7 @@ int CmdLFNedapClone(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;
 		}
@@ -298,7 +299,7 @@ int CmdLFNedapSim(const char *Cmd) {
 }
 
 int CmdLFNedapChk(const char *Cmd){
-    
+    //301600714021BE
 	uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
 	int len = 0;
 	param_gethex_ex(Cmd, 0, data, &len);
@@ -313,7 +314,7 @@ int CmdLFNedapChk(const char *Cmd){
     uint8_t cl = 0x1D, ch = 0x1D, carry = 0;
     uint8_t al, bl, temp;
     
-	for (int i = len; i >=0; --i){
+	for (int i =len; i >= 0; --i){
 		al = data[i];
         for (int j = 8; j > 0; --j) {
 			
@@ -340,7 +341,7 @@ int CmdLFNedapChk(const char *Cmd){
         }
     }
 	
-	PrintAndLog("Nedap checksum: [ 0x21, 0xBE ] %x", ((ch << 8) | cl) );
+	PrintAndLog("Nedap checksum: 0x%X", ((ch << 8) | cl) );
 	return 0;
 }