X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e88096ba259b88d0dc2edfd0e77cde5b297e1bd8..f9f0e83b7cf98887fc5dbe97bcb491b8c45c7d69:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index f7addc53..cce39089 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -10,6 +10,7 @@
 
 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
+#include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
 #include "data.h"     // also included in util.h
 #include "cmddata.h"
@@ -171,22 +172,22 @@ void printEM410x(uint32_t hi, uint64_t id)
 		}
 		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("\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,
@@ -199,8 +200,8 @@ void printEM410x(uint32_t hi, uint64_t id)
 			    (id2lo & 0x000000000f)
 			);
 			uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
-			PrintAndLog("}\nOther          : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-			PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton);
+			PrintAndLog("}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
+			PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
 
 			uint32_t p1id = (id & 0xFFFFFF);
 			uint8_t arr[32] = {0x00};
@@ -1572,8 +1573,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 	if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
 
 	uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
-	PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
-	PrintAndLog("National Code: %012llu", NationalCode);
+	PrintAndLog("Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLog("National Code: %012" PRIu64, NationalCode);
 	PrintAndLog("CountryCode:   %04u", countryCode);
 	PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
 	PrintAndLog("reserved Code: %u", reservedCode);
@@ -1906,6 +1907,12 @@ int CmdGrid(const char *Cmd)
 	return 0;
 }
 
+int CmdSetGraphMarkers(const char *Cmd) {
+	sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
+	RepaintGraphWindow();
+	return 0;
+}
+
 int CmdHexsamples(const char *Cmd)
 {
 	int i, j;
@@ -2418,6 +2425,7 @@ static command_t CommandTable[] =
 	{"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
 	{"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
 	{"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
+	{"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
 	{"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
 	{"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
 	{"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},