ADD: `analyse nuid` - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1...

[proxmark3-svn] / client / cmdlffdx.c

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 292ebad6617e1a5472b5d7638688051121ace189..da22a8333729c99441245be216a198df3bacb164 100644 (file)
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -149,6 +149,7 @@ int CmdFdxDemod(const char *Cmd) {
        }
 
        setDemodBuf(DemodBuffer, 128, ans);
        }
 
        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 ) {
        // 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));
        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("");
        PrintAndLog("Country Code       %04u", countryCode);
        PrintAndLog("Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
        PrintAndLog("");