ADD: some defines to make headerfiles behave better.

[proxmark3-svn] / client / cmdlfti.c

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 7b0328407e58dba01f8b0ac11312af3d08cf6aa1..2e5cfbba03b983393fd581fbee19158d01432f54 100644 (file)
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -174,7 +174,7 @@ int CmdTIDemod(const char *Cmd)
 
        uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
 
-       for (i = 0; i < arraylen(bits)-1; i++) {
+       for (i = 0; i < ARRAYLEN(bits)-1; i++) {
                int high = 0;
                int low = 0;
                int j;
@@ -205,6 +205,9 @@ int CmdTIDemod(const char *Cmd)
                GraphBuffer[maxPos] = 800;
                GraphBuffer[maxPos+1] = -800;
        }
+
+       RepaintGraphWindow();
+       
        PrintAndLog("Info: raw tag bits = %s", bits);
 
        TagType = (shift3>>8)&0xff;
@@ -254,7 +257,7 @@ int CmdTIDemod(const char *Cmd)
                PrintAndLog("Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
 
                if (crc != (shift2&0xffff))
-                       PrintAndLog("Error: CRC mismatch, calculated %04X, got ^04X", crc, shift2&0xffff);
+                       PrintAndLog("Error: CRC mismatch, calculated %04X, got %04X", crc, shift2&0xffff);
    
        }
        else {
@@ -280,11 +283,12 @@ int CmdTIWrite(const char *Cmd)
        res = sscanf(Cmd, "%012"llx" %012"llx" %012"llx"", &c.arg[0], &c.arg[1], &c.arg[2]);
 
        if (res == 2) c.arg[2]=0;
-       if (res < 2)
+       if (res < 2) {
                PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third");
-       else
-               clearCommandBuffer();
-               SendCommand(&c);
+               return 1;
+       }
+       clearCommandBuffer();
+       SendCommand(&c);
        return 0;
 }
 
@@ -297,11 +301,12 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFTI(const char *Cmd){
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0;
 }
 
 int CmdHelp(const char *Cmd){
-  CmdsHelp(CommandTable);
-  return 0;
+       CmdsHelp(CommandTable);
+       return 0;
 }