This commit is contained in:
iceman1001 2018-02-14 16:18:04 +01:00
parent 375648ca82
commit 8c5ab9cf18

View file

@ -981,40 +981,40 @@ int CmdHFSearch(const char *Cmd){
PrintAndLog("");
int ans = CmdHF14AInfo("s");
if (ans > 0) {
PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
PrintAndLog("\nValid ISO14443-A Tag Found\n");
return ans;
}
ans = HF15Reader("", false);
if (ans) {
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
PrintAndLog("\nValid ISO15693 Tag Found\n");
return ans;
}
ans = HFLegicReader("", false);
if ( ans == 0) {
PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
PrintAndLog("\nValid LEGIC Tag Found\n");
return 1;
}
ans = CmdHFTopazReader("s");
if (ans == 0) {
PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
PrintAndLog("\nValid Topaz Tag Found\n");
return 1;
}
// 14b and iclass is the longest test (put last)
ans = HF14BReader(false); //CmdHF14BReader("s");
if (ans) {
PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
PrintAndLog("\nValid ISO14443-B Tag Found\n");
return ans;
}
ans = HFiClassReader("", false, false);
if (ans) {
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found\n");
return ans;
}
/*
ans = CmdHFFelicaReader("s");
if (ans) {
PrintAndLog("\nValid ISO18092 / FeliCa Found - Quiting Search\n");
PrintAndLog("\nValid ISO18092 / FeliCa Found\n");
return ans;
}
*/