CHG: fix covertyscan error CID 133851, Cardstate can't not be SIM_NOFIELD when...

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index bbe39a5270bf47c0e07a919536052b089566a403..508886d5a86e06aad2f534b48ef7ca3ae4c374c5 100644 (file)
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------------
 // Low frequency Presco tag commands
 //-----------------------------------------------------------------------------
+
 #include "cmdlfjablotron.h"
 
 static int CmdHelp(const char *Cmd);
@@ -57,33 +58,40 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
        return 1;
 }
 
+static uint64_t getJablontronCardId( uint64_t rawcode ){
+       uint64_t id = 0;
+       uint8_t bytes[] = {0,0,0,0,0};
+       num_to_bytes(rawcode, 5, bytes);
+       for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
+               id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
+               id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
+       }
+       return id;
+}
+
 //see ASKDemod for what args are accepted
 int CmdJablotronDemod(const char *Cmd) {
 
        //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){
-                       // if (ans == -5)
-                               // PrintAndLog("DEBUG: Error - not enough samples");
                        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");
+                       else if (ans == -3)
+                               PrintAndLog("DEBUG: Error - Jablotron size not correct: %d", size);
                        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;
        }
@@ -93,11 +101,11 @@ int CmdJablotronDemod(const char *Cmd) {
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
        uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-       uint64_t cardid = (raw1 & 0xFFFF);
-       cardid <<= 24;
-       cardid |= (raw2 >> 8);
-       
-       PrintAndLog("Jablotron Tag Found: Card ID %"PRIx64, cardid);
+
+       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);
 
        uint8_t chksum = raw2 & 0xFF;
@@ -105,19 +113,20 @@ int CmdJablotronDemod(const char *Cmd) {
                chksum,
                (chksum == jablontron_chksum(DemodBuffer)) ? "OK":"FAIL"                
        );
-               
+
+       id = DEC2BCD(id);
        // Printed format: 1410-nn-nnnn-nnnn    
-       PrintAndLog("Printed:  1410-%02X-%04X-%04X",
-               (raw1 & 0x0000FF00) >> 8,
-               (raw1 & 0xFF) << 8 | ((raw2 >> 24) & 0xFF),
-               (raw2 & 0x00FFFF00) >> 8
-       );      
+       PrintAndLog("Printed: 1410-%02X-%04X-%04X",
+               (uint8_t)(id >> 32) & 0xFF,
+               (uint16_t)(id >> 16) & 0xFFFF,
+               (uint16_t)id & 0xFFFF
+       );
        return 1;
 }
 
 int CmdJablotronRead(const char *Cmd) {
        CmdLFRead("s");
-       getSamples("30000",false);
+       getSamples("20000", TRUE);
        return CmdJablotronDemod(Cmd);
 }
 
@@ -166,12 +175,12 @@ int CmdJablotronClone(const char *Cmd) {
        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);
-               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;
                }