diff --git a/client/cmddata.c b/client/cmddata.c index 16a1c9f10..c921f60bd 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -955,7 +955,7 @@ int CmdDetectClockRate(const char *Cmd) clock = GetPskClock("", true); break; default : - PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help"); + PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help"); break; } RepaintGraphWindow(); diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 59ab830fa..e88213e1a 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -553,9 +553,9 @@ bool HF14B_Other_Reader(){ // WaitForResponse(CMD_ACK,&resp); // if (datalen > 2 ) { - // printandlog ("\n14443-3b tag found:"); - // printandlog ("unknown tag type answered to a 0x000b3f80 command ans:"); - // //printandlog ("%s", sprint_hex(data, datalen)); + // PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "14443-3b tag found:"); + // PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:"); + // //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen)); // rawclose(); // return true; // } @@ -568,9 +568,9 @@ bool HF14B_Other_Reader(){ // WaitForResponse(CMD_ACK, &resp); // if (datalen > 0) { - // PrintAndLog ("\n14443-3b tag found:"); - // PrintAndLog ("Unknown tag type answered to a 0x0A command ans:"); - // // PrintAndLog ("%s", sprint_hex(data, datalen)); + // PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "14443-3b tag found:"); + // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:"); + // // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen)); // rawClose(); // return true; // } @@ -583,9 +583,9 @@ bool HF14B_Other_Reader(){ // WaitForResponse(CMD_ACK, &resp); // if (datalen > 0) { - // PrintAndLog ("\n14443-3b tag found:"); - // PrintAndLog ("Unknown tag type answered to a 0x0C command ans:"); - // PrintAndLog ("%s", sprint_hex(data, datalen)); + // PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "14443-3b tag found:"); + // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:"); + // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen)); // rawClose(); // return true; // } diff --git a/client/cmdhflist.c b/client/cmdhflist.c index b8ecc381d..19bfa5100 100644 --- a/client/cmdhflist.c +++ b/client/cmdhflist.c @@ -376,7 +376,6 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){ pos = pos + 1; if ( (cmd[0] & 0x04) == 0x04) // nad byte following pos = pos + 1; - switch ( cmd[pos] ){ case MFDES_CREATE_APPLICATION :snprintf(exp, size, "CREATE APPLICATION");break; case MFDES_DELETE_APPLICATION :snprintf(exp, size, "DELETE APPLICATION");break; diff --git a/client/cmdlf.c b/client/cmdlf.c index 6668f16ab..6bfd10a41 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -472,7 +472,7 @@ int CmdLFfskSim(const char *Cmd) { dataLen = hextobinarray((char *)data, hexData); if (dataLen == 0) errors = true; - if (errors) PrintAndLog ("Error getting hex data"); + if (errors) PrintAndLogEx(WARNING, "Error getting hex data"); cmdp+=2; break; default: @@ -573,7 +573,7 @@ int CmdLFaskSim(const char *Cmd) { dataLen = hextobinarray((char *)data, hexData); if (dataLen == 0) errors = true; - if (errors) PrintAndLog ("Error getting hex data, datalen: %d", dataLen); + if (errors) PrintAndLogEx(WARNING, "Error getting hex data, datalen: %d", dataLen); cmdp += 2; break; default: @@ -668,7 +668,7 @@ int CmdLFpskSim(const char *Cmd) { dataLen = hextobinarray((char *)data, hexData); if (dataLen == 0) errors = true; - if (errors) PrintAndLog ("Error getting hex data"); + if (errors) PrintAndLogEx(WARNING, "Error getting hex data"); cmdp+=2; break; default: