CHG: "script run emlu2dump" now can read old legic hex-ascii dumps. (with spaces...

[proxmark3-svn] / client / cmdhftopaz.c

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 462cbec51583ce6942fc8734b94e4ec10bc75fbf..2f9bc3dc0102ddf1bbbe4c199726eb3d3ccc7d04 100644 (file)
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -258,11 +258,15 @@ int CmdHFTopazReader(const char *Cmd) {
        uint8_t rid_response[8];
        uint8_t *uid_echo = &rid_response[2];
        uint8_t rall_response[130];
        uint8_t rid_response[8];
        uint8_t *uid_echo = &rid_response[2];
        uint8_t rall_response[130];

+       bool verbose = TRUE;
+
+       char ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'S' || ctmp == 's') verbose = FALSE;

        
        status = topaz_select(atqa, rid_response);
        
        status = topaz_select(atqa, rid_response);

-       
+

        if (status == -1) {
        if (status == -1) {

-               PrintAndLog("Error: couldn't receive ATQA");
+               if (verbose) PrintAndLog("Error: couldn't receive ATQA");

                return -1;
        }
 
                return -1;
        }
 


@@ -306,6 +310,7 @@ int CmdHFTopazReader(const char *Cmd) {
                        topaz_tag.uid[2], 
                        topaz_tag.uid[1], 
                        topaz_tag.uid[0]);
                        topaz_tag.uid[2], 
                        topaz_tag.uid[1], 
                        topaz_tag.uid[0]);

+                       

        PrintAndLog("       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
                        topaz_tag.uid[6], 
                        getTagInfo(topaz_tag.uid[6]));
        PrintAndLog("       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
                        topaz_tag.uid[6], 
                        getTagInfo(topaz_tag.uid[6]));