FIX: @marshmellow42 's fixes for enhanced STT and AskDemod. Now the "lf presco...

[proxmark3-svn] / client / cmdlfvisa2000.c

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index af41f320b710a0828222008336a6b49fc1bdb9ef..e432954d98d0c4ea90e7f413082de314da118501 100644 (file)
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -48,10 +48,16 @@ static uint8_t visa_chksum( uint32_t id ) {
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
 
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
 

+       // save GraphBuffer - to restore it later       
+       save_restoreGB(1);
+       
+       CmdAskEdgeDetect("");
+       

        //ASK / Manchester
        bool st = TRUE;
        if (!ASKDemod_ext("64 0 0", FALSE, FALSE, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
        //ASK / Manchester
        bool st = TRUE;
        if (!ASKDemod_ext("64 0 0", FALSE, FALSE, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed");

+               save_restoreGB(0);

                return 0;
        }
        size_t size = DemodBufferLen;
                return 0;
        }
        size_t size = DemodBufferLen;


@@ -67,6 +73,7 @@ int CmdVisa2kDemod(const char *Cmd) {
                        else
                                PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans);
                }
                        else
                                PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans);
                }

+               save_restoreGB(0);

                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);


@@ -82,10 +89,11 @@ int CmdVisa2kDemod(const char *Cmd) {
        // test checksums
        if ( chk != calc ) { 
                printf("DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
        // test checksums
        if ( chk != calc ) { 
                printf("DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);

+               save_restoreGB(0);

                return 0;
        }
        PrintAndLog("Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
                return 0;
        }
        PrintAndLog("Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);

-
+       save_restoreGB(0);

        return 1;
 }
 
        return 1;
 }
 


@@ -113,15 +121,13 @@ int CmdVisa2kClone(const char *Cmd) {
        
        // 
        blocks[2] = id;
        
        // 
        blocks[2] = id;

-       blocks[3] = visa_chksum( id);
+       blocks[3] = visa_chksum(id);

 
        PrintAndLog("Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
 
        PrintAndLog("Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");

-       PrintAndLog(" 00 | 0x%08x", blocks[0]);
-       PrintAndLog(" 01 | 0x%08x", blocks[1]);
-       PrintAndLog(" 02 | 0x%08x", blocks[2]);
-       PrintAndLog(" 02 | 0x%08x", blocks[3]);
+       for(int i = 0; i<4; ++i)
+               PrintAndLog(" %02d | 0x%08x", i , blocks[i]);

        
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
        
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};


@@ -131,7 +137,7 @@ int CmdVisa2kClone(const char *Cmd) {
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);
                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;
                }