X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a087e9cf40bdb4d7546a7645995624a519aef2a6..6255c8b107cdce88f4863a6133aea293d917f993:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index ceec9489..2266baa4 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -286,12 +286,26 @@ void printEM410x(uint32_t hi, uint64_t id)
     PrintAndLog("EM TAG ID    : %010llx", id);
     PrintAndLog("Unique TAG ID: %010llx",  id2lo);
     PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
-    PrintAndLog("DEZ 10       : %010lld",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("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",
+			(id2lo & 0xf000000000) >> 36,
+			(id2lo & 0x0f00000000) >> 32,
+			(id2lo & 0x00f0000000) >> 28,
+			(id2lo & 0x000f000000) >> 24,
+			(id2lo & 0x0000f00000) >> 20,
+			(id2lo & 0x00000f0000) >> 16,
+			(id2lo & 0x000000f000) >> 12,
+			(id2lo & 0x0000000f00) >> 8,
+			(id2lo & 0x00000000f0) >> 4,
+			(id2lo & 0x000000000f)
+			);
   }
   }
   return;