From: marshmellow42 <marshmellowrf@gmail.com>
Date: Thu, 23 Feb 2017 19:08:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.0.0~63^2~4
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4913be92ac529143d4ba7dffd5f709386c92dca5

Merge remote-tracking branch 'upstream/master'

Merge Head
---

4913be92ac529143d4ba7dffd5f709386c92dca5
diff --cc client/cmddata.c
index f7addc53,1b4fd238..f8a7dec7
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@@ -171,22 -172,22 +172,22 @@@ void printEM410x(uint32_t hi, uint64_t 
  		}
  		if (hi){
  			//output 88 bit em id
- 			PrintAndLog("\nEM TAG ID      : %06X%016llX", hi, id);
+ 			PrintAndLog("\nEM TAG ID      : %06X%016" PRIX64, hi, id);
  		} else{
  			//output 40 bit em id
- 			PrintAndLog("\nEM TAG ID      : %010llX", id);
+ 			PrintAndLog("\nEM TAG ID      : %010" PRIX64, id);
 -			PrintAndLog("Unique TAG ID  : %010" PRIX64,  id2lo);
  			PrintAndLog("\nPossible de-scramble patterns");
- 			PrintAndLog("Unique TAG ID  : %010llX",  id2lo);
++			PrintAndLog("Unique TAG ID  : %010" PRIX64,  id2lo);
  			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",
+ 			PrintAndLog("DEZ 8          : %08" PRIu64,id & 0xFFFFFF);
+ 			PrintAndLog("DEZ 10         : %010" PRIu64,id & 0xFFFFFFFF);
+ 			PrintAndLog("DEZ 5.5        : %05lld.%05" PRIu64,(id>>16LL) & 0xFFFF,(id & 0xFFFF));
+ 			PrintAndLog("DEZ 3.5A       : %03lld.%05" PRIu64,(id>>32ll),(id & 0xFFFF));
+ 			PrintAndLog("DEZ 3.5B       : %03lld.%05" PRIu64,(id & 0xFF000000) >> 24,(id & 0xFFFF));
+ 			PrintAndLog("DEZ 3.5C       : %03lld.%05" PRIu64,(id & 0xFF0000) >> 16,(id & 0xFFFF));
+ 			PrintAndLog("DEZ 14/IK2     : %014" PRIu64,id);
+ 			PrintAndLog("DEZ 15/IK3     : %015" PRIu64,id2lo);
+ 			PrintAndLog("DEZ 20/ZK      : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64,
  			    (id2lo & 0xf000000000) >> 36,
  			    (id2lo & 0x0f00000000) >> 32,
  			    (id2lo & 0x00f0000000) >> 28,