CHG: 'lf cotag demod' - now finds FC/CN Thanks to @marshmellow42

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 7852508d1f07df2ace191183fb6d89194c38a566..f1da737db610f981e940a4c1098438c734694951 100644 (file)
--- 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;
                }