PCF7931: Print found single/consecutive block(s), fixes to block 1 check

[proxmark3-svn] / client / cmdlfti.c

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 26128e2f029f4a37ded25678348a8c3646a086ae..ff463971689ed830b43e4c5e514bbe3566907277 100644 (file)
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -8,16 +8,17 @@
 // Low frequency TI commands
 //-----------------------------------------------------------------------------
 
 // Low frequency TI commands
 //-----------------------------------------------------------------------------
 

+#include "cmdlfti.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <inttypes.h>

 #include "crc16.h"
 #include "crc16.h"

-//#include "proxusb.h"
-#include "proxmark3.h"
-#include "data.h"
+#include "comms.h"

 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"

-#include "cmdlfti.h"
+#include "util.h"

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


@@ -274,7 +275,8 @@ int CmdTIWrite(const char *Cmd)
   UsbCommand c = {CMD_WRITE_TI_TYPE};
   int res = 0;
 
   UsbCommand c = {CMD_WRITE_TI_TYPE};
   int res = 0;
 

-  res = sscanf(Cmd, "0x%"PRIu64"x 0x%"PRIu64"x 0x%"PRIu64"x ", &c.arg[0], &c.arg[1], &c.arg[2]);
+  res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
+  

   if (res == 2) c.arg[2]=0;
   if (res < 2)
     PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third");
   if (res == 2) c.arg[2]=0;
   if (res < 2)
     PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third");