X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ff9c043da29150aa785723326537ba93ddac0614..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/client/cmdlffdx.c

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 292ebad6..ae8531a6 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -31,8 +31,8 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_fdx_clone(void){
-	PrintAndLog("clone a FDX-B Animal tag to a T55x7 tag.");
-	PrintAndLog("Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
+	PrintAndLog("Clone a FDX-B animal tag to a T55x7 tag.");
+	PrintAndLog("Usage: lf animal clone [h] <country id> <animal id> <Q5>");
 	PrintAndLog("Options:");
 	PrintAndLog("      h            : This help");
 	PrintAndLog("      <country id> : Country id");
@@ -41,23 +41,23 @@ int usage_lf_fdx_clone(void){
 	//reserved/rfu
 	//is animal tag
 	// extended data
-	PrintAndLog("      <Q5>        : specify write to Q5 (t5555 instead of t55x7)");
+	PrintAndLog("      <Q5>        : Specify write to Q5 (t5555 instead of t55x7)");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf fdx clone 999 112233");
+	PrintAndLog("Sample: lf animal clone 999 112233");
 	return 0;
 }
 
 int usage_lf_fdx_sim(void) {
-	PrintAndLog("Enables simulation of FDX-B Animal tag");
+	PrintAndLog("Enables simulation of FDX-B animal tag");
 	PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
 	PrintAndLog("");
-	PrintAndLog("Usage:  lf fdx sim [h] <country id> <animal id>");
+	PrintAndLog("Usage:  lf animal sim [h] <country id> <animal id>");
 	PrintAndLog("Options:");
 	PrintAndLog("      h            : This help");
-	PrintAndLog("      <country id> : Country id");
-	PrintAndLog("      <animal id>  : Animal id");
+	PrintAndLog("      <country id> : Country ID");
+	PrintAndLog("      <animal id>  : Animal ID");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf fdx sim 999 112233");
+	PrintAndLog("Sample: lf animal sim 999 112233");
 	return 0;
 }
 // clearing the topbit needed for the preambl detection. 
@@ -149,6 +149,7 @@ int CmdFdxDemod(const char *Cmd) {
 	}
 
 	setDemodBuf(DemodBuffer, 128, ans);
+	setGrid_Clock(32);
 	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
 	size = removeParity(DemodBuffer, 11, 9, 2, 117);
 	if ( size != 104 ) {
@@ -175,8 +176,8 @@ int CmdFdxDemod(const char *Cmd) {
 	uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
 	
 	PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
-	PrintAndLog("Animal ID          %04u-%012llu", countryCode, NationalCode);
-	PrintAndLog("National Code      %012llu (0x%llX)", NationalCode, NationalCode);
+	PrintAndLog("Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLog("National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
 	PrintAndLog("Country Code       %04u", countryCode);
 	PrintAndLog("Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
 	PrintAndLog("");
@@ -289,7 +290,7 @@ int CmdFdxSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",	CmdHelp,	1, "This help"},
-	{"demod",	CmdFdxDemod,1, "Attempt extract tag data from graphbuf"},
+	{"demod",	CmdFdxDemod,1, "Attempt to extract tag data from graphbuf"},
 	{"read",	CmdFdxRead,	0, "Attempt to read and extract tag data"},
 	{"clone",	CmdFdxClone,0, "Clone animal ID tag to T55x7"},
 	{"sim",		CmdFdxSim,	0, "Animal ID tag simulator"},