chg: moved to header file

[proxmark3-svn] / client / cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index f1097121a2090373af8fe45b77a6a3bc3bb518b0..b6c8ed6a600c9eeba59a0d99e40c958ae1707a10 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -74,7 +74,7 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
 int CmdPyramidRead(const char *Cmd) {
        CmdLFRead("s");
 
 int CmdPyramidRead(const char *Cmd) {
        CmdLFRead("s");

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

        return CmdFSKdemodPyramid("");
 }
 
        return CmdFSKdemodPyramid("");
 }
 


@@ -115,7 +115,7 @@ int CmdPyramidClone(const char *Cmd) {
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        for ( i = 0; i<5; ++i )
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        for ( i = 0; i<5; ++i )

-               PrintAndLog(" %02d | %08" PRIx32, i, blocks[i]);
+               PrintAndLog(" %02d | 0x%08" PRIx32, 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}};


@@ -125,7 +125,7 @@ int CmdPyramidClone(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;
                }