Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags...

[proxmark3-svn] / client / cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 233eb72c9a511cd2fc89efe66862926968d5784c..5fdbf65498fa46cdafc9a5b92f37c399621f35a1 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -16,7 +16,7 @@
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "cmdlfawid.h"  // AWID function declarations
 #include "lfdemod.h"    // parityTest
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "cmdlfawid.h"  // AWID function declarations
 #include "lfdemod.h"    // parityTest

-
+#include "cmdmain.h"

 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 
 


@@ -69,6 +69,7 @@ int CmdAWIDDemodFSK(const char *Cmd)
   if (Cmd[0]=='h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod();
   UsbCommand c={CMD_AWID_DEMOD_FSK};
   c.arg[0]=findone;
   if (Cmd[0]=='h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod();
   UsbCommand c={CMD_AWID_DEMOD_FSK};
   c.arg[0]=findone;

+  clearCommandBuffer();

   SendCommand(&c);
   return 0;   
 }
   SendCommand(&c);
   return 0;   
 }


@@ -167,17 +168,18 @@ int CmdAWIDSim(const char *Cmd)
   c.arg[2] = 96; // Bitstream length: 96-bits == 12 bytes
   for (i=0; i < 96; i++)
     c.d.asBytes[i] = (BS[i/8] & (1<<(7-(i%8))))?1:0;
   c.arg[2] = 96; // Bitstream length: 96-bits == 12 bytes
   for (i=0; i < 96; i++)
     c.d.asBytes[i] = (BS[i/8] & (1<<(7-(i%8))))?1:0;

-  SendCommand(&c);
+  clearCommandBuffer();
+    SendCommand(&c);

   return 0;
 }
 
 int CmdAWIDClone(const char *Cmd)
 {
   return 0;
 }
 
 int CmdAWIDClone(const char *Cmd)
 {

+clearCommandBuffer();

   uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0;
   uint8_t BitStream[12];
   uint8_t *BS=BitStream;
   uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0;
   uint8_t BitStream[12];
   uint8_t *BS=BitStream;

-  UsbCommand c;
-  
+       UsbCommand c, resp;

 
   if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) {
     return usage_lf_awid_clone();
 
   if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) {
     return usage_lf_awid_clone();


@@ -206,6 +208,11 @@ int CmdAWIDClone(const char *Cmd)
       c.arg[1] = i;
       c.arg[2] = 0;
       SendCommand(&c);
       c.arg[1] = i;
       c.arg[2] = 0;
       SendCommand(&c);

+                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+                               PrintAndLog("Error occurred, device did not respond during write operation.");
+                               return -1;
+                       }
+

     }
   }
   return 0;
     }
   }
   return 0;