X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bb73c58d9a5501426646b8fcfff87331ea3312a6..c631b1a216099f929a15193ec5841d980e8be8d0:/client/cmdlfnedap.c diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c index 52cc7359..eeb07939 100644 --- a/client/cmdlfnedap.c +++ b/client/cmdlfnedap.c @@ -202,7 +202,7 @@ lf t55xx wr b 4 d 4c0003ff int CmdLFNedapRead(const char *Cmd) { CmdLFRead("s"); - getSamples("20000", TRUE); + getSamples("12000", TRUE); return CmdLFNedapDemod(""); } /* @@ -254,7 +254,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 +298,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 +313,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 +340,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; }