Merge pull request #89 from angelsl/mfsetmod

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 7852508d1f07df2ace191183fb6d89194c38a566..473fbe28c56d3fb1b61f59c6abf9cc4f3c78f108 100644 (file)
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -97,6 +97,7 @@ int CmdJablotronDemod(const char *Cmd) {
        }
 
        setDemodBuf(DemodBuffer+ans, 64, 0);
+       setGrid_Clock(64);
        
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
@@ -105,8 +106,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,14 +126,14 @@ int CmdJablotronDemod(const char *Cmd) {
 
 int CmdJablotronRead(const char *Cmd) {
        CmdLFRead("s");
-       getSamples("20000", TRUE);
+       getSamples("10000", TRUE);
        return CmdJablotronDemod(Cmd);
 }
 
 int CmdJablotronClone(const char *Cmd) {
 
        uint64_t fullcode = 0;
-       uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2<<T55x7_MAXBLOCK_SHIFT, 0, 0};
+       uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
 
        uint8_t bits[64];
        uint8_t *bs = bits;
@@ -147,7 +147,7 @@ int CmdJablotronClone(const char *Cmd) {
        //Q5
        if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
                //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-               blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 2<<T5555_MAXBLOCK_SHIFT;
+               blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | ((64-2)>>1) << T5555_BITRATE_SHIFT | 2 << T5555_MAXBLOCK_SHIFT;
        }
        
        // clearing the topbit needed for the preambl detection. 
@@ -180,7 +180,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;
                }