syntax sugar

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 1f279a3b3b113a7c16e5373dfdf5af04972f0b31..473fbe28c56d3fb1b61f59c6abf9cc4f3c78f108 100644 (file)
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -75,32 +75,29 @@ int CmdJablotronDemod(const char *Cmd) {
        //Differential Biphase / di-phase (inverted biphase)
        //get binary from ask wave
        if (!ASKbiphaseDemod("0 64 1 0", FALSE)) {
        //Differential Biphase / di-phase (inverted biphase)
        //get binary from ask wave
        if (!ASKbiphaseDemod("0 64 1 0", FALSE)) {

-               if (g_debugMode) PrintAndLog("Error Jablotron: ASKbiphaseDemod failed");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Jablotron ASKbiphaseDemod failed");

                return 0;
        }
        size_t size = DemodBufferLen;
        int ans = JablotronDemod(DemodBuffer, &size);
        if (ans < 0){
                if (g_debugMode){
                return 0;
        }
        size_t size = DemodBufferLen;
        int ans = JablotronDemod(DemodBuffer, &size);
        if (ans < 0){
                if (g_debugMode){

-                       // if (ans == -5)
-                               // PrintAndLog("DEBUG: Error - not enough samples");

                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Jablotron too few bits found");
                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Jablotron too few bits found");

-                       // else if (ans == -2)
-                               // PrintAndLog("DEBUG: Error - problem during ASK/Biphase demod");
-                       else if (ans == -3)
-                               PrintAndLog("DEBUG: Error - Jablotron Size not correct: %d", size);
-                       else if (ans == -4)
+                       else if (ans == -2)

                                PrintAndLog("DEBUG: Error - Jablotron preamble not found");
                                PrintAndLog("DEBUG: Error - Jablotron preamble not found");

+                       else if (ans == -3)
+                               PrintAndLog("DEBUG: Error - Jablotron size not correct: %d", size);

                        else if (ans == -5)
                                PrintAndLog("DEBUG: Error - Jablotron checksum failed");
                        else
                        else if (ans == -5)
                                PrintAndLog("DEBUG: Error - Jablotron checksum failed");
                        else

-                               PrintAndLog("DEBUG: Error - ans: %d", ans);
+                               PrintAndLog("DEBUG: Error - Jablotron ans: %d", ans);

                }
                return 0;
        }
 
        setDemodBuf(DemodBuffer+ans, 64, 0);
                }
                return 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);


@@ -109,8 +106,7 @@ int CmdJablotronDemod(const char *Cmd) {
        uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
        uint64_t id = getJablontronCardId(rawid);
 
        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]",
 
        uint8_t chksum = raw2 & 0xFF;
        PrintAndLog("Checksum: %02X [%s]",


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

-       getSamples("30000",false);
+       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;


@@ -151,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. 


@@ -179,12 +175,12 @@ int CmdJablotronClone(const char *Cmd) {
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 

-       for (int i=4; i>=0; i--) {
+       for (int i = 2; i >= 0; --i) {

                c.arg[0] = blocks[i];
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);
                c.arg[0] = blocks[i];
                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;
                }
                        PrintAndLog("Error occurred, device did not respond during write operation.");
                        return -1;
                }