added sketch for command `hf 14a apdu`

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index dcfb1bdd38d98af1b1b8504c386feb5883ea8f12..6aa5ae4e5e2d5809e9701ebaa5c447dcb9369baf 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -546,7 +546,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        
        if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
                uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
        
        if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
                uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));

-               PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",
+               PrintAndLog(" %10d | %10d | %s | fdt (Frame Delay Time): %d",

                        (EndOfTransmissionTimestamp - first_timestamp),
                        (next_timestamp - first_timestamp),
                        "   ",
                        (EndOfTransmissionTimestamp - first_timestamp),
                        (next_timestamp - first_timestamp),
                        "   ",


@@ -673,14 +673,15 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
        }
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
        }

-       ans = HF14BInfo(false);
+       ans = HF15Reader("", false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");

                return ans;
        }
                return ans;
        }

-       ans = HF15Reader("", false);
+       //14b is longest test currently (and rarest chip type) ... put last
+       ans = HF14BInfo(false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");

                return ans;
        }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
                return ans;
        }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");