chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get starti...

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index f1da737db610f981e940a4c1098438c734694951..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);
        }
 
        setDemodBuf(DemodBuffer+ans, 64, 0);

+       setGrid_Clock(64);

        
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
        
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);


@@ -125,14 +126,14 @@ int CmdJablotronDemod(const char *Cmd) {
 
 int CmdJablotronRead(const char *Cmd) {
        CmdLFRead("s");
 
 int CmdJablotronRead(const char *Cmd) {
        CmdLFRead("s");

-       getSamples("12000", TRUE);
+       getSamples("10000", TRUE);

        return CmdJablotronDemod(Cmd);
 }
 
 int CmdJablotronClone(const char *Cmd) {
 
        uint64_t fullcode = 0;
        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;
 
        uint8_t bits[64];
        uint8_t *bs = bits;


@@ -146,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)
        //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. 
        }
        
        // clearing the topbit needed for the preambl detection.