clean up em410x output

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index a69b5ca739c0913b59ccc011d51c5cf3cf5aa58a..3e23e588a53db64155e38968e3c5b61d3b8e7348 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -280,24 +280,22 @@ void printEM410x(uint32_t hi, uint64_t id)
     }
     if (hi){
       //output 88 bit em id
-      PrintAndLog("EM TAG ID    : %06x%016llx", hi, id);
+      PrintAndLog("\nEM TAG ID      : %06x%016llx", hi, id);
     } else{
       //output 40 bit em id
-      PrintAndLog("EM TAG ID    : %010llx", id);
-      PrintAndLog("Unique TAG ID: %010llx",  id2lo);
-      PrintAndLog("");
-      PrintAndLog("Possible de-scramble patterns");
-      PrintAndLog("HoneyWell IdentKey");
-      PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
-      PrintAndLog("DEZ 10       : %010lld",id & 0xFFFFFFFF);
-      PrintAndLog("DEZ 5.5      : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
-      PrintAndLog("DEZ 3.5A     : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
-      PrintAndLog("DEZ 3.5B     : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF));
-      PrintAndLog("DEZ 3.5C     : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF));
-      PrintAndLog("DEZ 14/IK2   : %014lld",id);
-      PrintAndLog("DEZ 15/IK3   : %015lld",id2lo);
-      PrintAndLog("Other        : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-      PrintAndLog("DEZ 20/ZK    : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld",
+      PrintAndLog("\nEM TAG ID      : %010llx", id);
+      PrintAndLog("Unique TAG ID  : %010llx",  id2lo);
+      PrintAndLog("\nPossible de-scramble patterns");
+      PrintAndLog("HoneyWell IdentKey {");
+      PrintAndLog("DEZ 8          : %08lld",id & 0xFFFFFF);
+      PrintAndLog("DEZ 10         : %010lld",id & 0xFFFFFFFF);
+      PrintAndLog("DEZ 5.5        : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
+      PrintAndLog("DEZ 3.5A       : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
+      PrintAndLog("DEZ 3.5B       : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF));
+      PrintAndLog("DEZ 3.5C       : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF));
+      PrintAndLog("DEZ 14/IK2     : %014lld",id);
+      PrintAndLog("DEZ 15/IK3     : %015lld",id2lo);
+      PrintAndLog("DEZ 20/ZK      : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld",
         (id2lo & 0xf000000000) >> 36,
         (id2lo & 0x0f00000000) >> 32,
         (id2lo & 0x00f0000000) >> 28,
@@ -309,10 +307,9 @@ void printEM410x(uint32_t hi, uint64_t id)
         (id2lo & 0x00000000f0) >> 4,
         (id2lo & 0x000000000f)
       );
-
-      PrintAndLog("");                 
       uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
-      PrintAndLog("Pattern Paxton  : %0d", paxton);    
+      PrintAndLog("}\nOther          : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
+      PrintAndLog("Pattern Paxton : %0d", paxton);
 
       uint32_t p1id = (id & 0xFFFFFF);
       uint8_t arr[32] = {0x00};
@@ -322,7 +319,7 @@ void printEM410x(uint32_t hi, uint64_t id)
        arr[i] = (p1id >> i) & 1;
       }
 
-      uint32_t p1  = 0;        
+      uint32_t p1  = 0;
 
       p1 |= arr[23] << 21;
       p1 |= arr[22] << 23;
@@ -337,7 +334,7 @@ void printEM410x(uint32_t hi, uint64_t id)
       p1 |= arr[15] << 13;
       p1 |= arr[14] << 15;
       p1 |= arr[13] << 12;
-      p1 |= arr[12] << 14;     
+      p1 |= arr[12] << 14;
 
       p1 |= arr[11] << 6;
       p1 |= arr[10] << 2;
@@ -347,18 +344,18 @@ void printEM410x(uint32_t hi, uint64_t id)
       p1 |= arr[7]  << 0;
       p1 |= arr[6]  << 8;
       p1 |= arr[5]  << 11;
-      p1 |= arr[4]  << 3;      
+      p1 |= arr[4]  << 3;
 
       p1 |= arr[3]  << 10;
       p1 |= arr[2]  << 4;
       p1 |= arr[1]  << 5;
-      p1 |= arr[0]  << 9;      
-      PrintAndLog("Pattern 1       : 0x%X - %d", p1, p1);
+      p1 |= arr[0]  << 9;
+      PrintAndLog("Pattern 1      : 0x%X - %d", p1, p1);
 
       uint16_t sebury1 = id & 0xFFFF;
       uint8_t  sebury2 = (id >> 16) & 0x7F;
       uint32_t sebury3 = id & 0x7FFFFF;
-      PrintAndLog("Pattern Sebury  : %d %d %d  (hex: %X %X %X)", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+      PrintAndLog("Pattern Sebury : %d %d %d  (hex: %X %X %X)", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
     }
   }
   return;
@@ -400,8 +397,8 @@ int CmdAskEM410xDemod(const char *Cmd)
     PrintAndLog("          : data askem410xdemod 64 1 0 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/64 and inverting data and allowing 0 demod errors");
     return 0;
   }
-  uint32_t hi;
-  uint64_t lo;
+  uint32_t hi = 0;
+  uint64_t lo = 0;
   if (AskEm410xDemod(Cmd, &hi, &lo)) {
     PrintAndLog("EM410x pattern found: ");
     printEM410x(hi, lo);
@@ -1428,7 +1425,7 @@ int CmdFSKdemodIO(const char *Cmd)
 
   for (uint8_t i=1; i<6; ++i){
     calccrc += bytebits_to_byte(BitStream+idx+9*i,8);
-    PrintAndLog("%d", calccrc);
+    //PrintAndLog("%d", calccrc);
   }
   calccrc &= 0xff;
   calccrc = 0xff - calccrc;
@@ -1436,7 +1433,6 @@ int CmdFSKdemodIO(const char *Cmd)
   char *crcStr = (crc == calccrc) ? "crc ok": "!crc";
 
   PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr);
-  //PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);
   setDemodBuf(BitStream,64,idx);
   if (g_debugMode){
     PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);