X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0b63a0fe2a0edb955a646038eec455720f884f86..2e8d938befceab53c0b88cad5d9be54061aff9b1:/client/cmdlfjablotron.c?ds=sidebyside diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index 7852508d..f1da737d 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -105,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]", @@ -126,7 +125,7 @@ int CmdJablotronDemod(const char *Cmd) { int CmdJablotronRead(const char *Cmd) { CmdLFRead("s"); - getSamples("20000", TRUE); + getSamples("12000", TRUE); return CmdJablotronDemod(Cmd); } @@ -180,7 +179,7 @@ int CmdJablotronClone(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; }