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

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index e7bdb6cbbb8d2c5fb80bd420560fdf7454ebb7d0..5e2f74853f6130c42a32d3cb44482544fc9e9203 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -222,10 +222,11 @@ int CmdSetDivisor(const char *Cmd)
                PrintAndLog("divisor must be between 19 and 255");
                return 1;
        } 
                PrintAndLog("divisor must be between 19 and 255");
                return 1;
        } 

-       
+       // 12 000 000 (12Mhz)
+       // 

        clearCommandBuffer();
        SendCommand(&c);
        clearCommandBuffer();
        SendCommand(&c);

-       PrintAndLog("Divisor set, expected freq=%dHz", 12000000 / (c.arg[0]+1));
+       PrintAndLog("Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );

        return 0;
 }
 
        return 0;
 }
 


@@ -255,13 +256,13 @@ int CmdVersion(const char *Cmd)
        if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
                SendCommand(&c);
                if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
        if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
                SendCommand(&c);
                if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {

-                       PrintAndLog("Prox/RFID mark3 RFID instrument");
+                       PrintAndLog("Proxmark3 RFID instrument");

                        PrintAndLog((char*)resp.d.asBytes);
                        lookupChipID(resp.arg[0], resp.arg[1]);
                }
        } else {
                PrintAndLog("[[[ Cached information ]]]\n");
                        PrintAndLog((char*)resp.d.asBytes);
                        lookupChipID(resp.arg[0], resp.arg[1]);
                }
        } else {
                PrintAndLog("[[[ Cached information ]]]\n");

-               PrintAndLog("Prox/RFID mark3 RFID instrument");
+               PrintAndLog("Proxmark3 RFID instrument");

                PrintAndLog((char*)resp.d.asBytes);
                lookupChipID(resp.arg[0], resp.arg[1]);
                PrintAndLog("");
                PrintAndLog((char*)resp.d.asBytes);
                lookupChipID(resp.arg[0], resp.arg[1]);
                PrintAndLog("");


@@ -288,7 +289,7 @@ int CmdPing(const char *Cmd)
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
        if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
        if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))

-               PrintAndLog("Ping successfull");
+               PrintAndLog("Ping successful");

        else
                PrintAndLog("Ping failed");     
        return 0;
        else
                PrintAndLog("Ping failed");     
        return 0;