mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-23 22:55:37 -07:00
fix loop logic. thanks @jump
This commit is contained in:
parent
85d4e99ae9
commit
bf8ac54c38
1 changed files with 6 additions and 5 deletions
|
@ -2231,30 +2231,31 @@ int infoHF14B(bool verbose, bool do_aid_search) {
|
||||||
int readHF14B(bool loop, bool verbose) {
|
int readHF14B(bool loop, bool verbose) {
|
||||||
bool found = false;
|
bool found = false;
|
||||||
do {
|
do {
|
||||||
|
found = false;
|
||||||
|
|
||||||
// try std 14b (atqb)
|
// try std 14b (atqb)
|
||||||
found = HF14B_std_reader(verbose);
|
found |= HF14B_std_reader(verbose);
|
||||||
if (found && loop)
|
if (found && loop)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// try ST Microelectronics 14b
|
// try ST Microelectronics 14b
|
||||||
found = HF14B_st_reader(verbose);
|
found |= HF14B_st_reader(verbose);
|
||||||
if (found && loop)
|
if (found && loop)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// try ASK CT 14b
|
// try ASK CT 14b
|
||||||
found = HF14B_ask_ct_reader(verbose);
|
found |= HF14B_ask_ct_reader(verbose);
|
||||||
if (found && loop)
|
if (found && loop)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// try unknown 14b read commands (to be identified later)
|
// try unknown 14b read commands (to be identified later)
|
||||||
// could be read of calypso, CEPAS, moneo, or pico pass.
|
// could be read of calypso, CEPAS, moneo, or pico pass.
|
||||||
found = HF14B_other_reader(verbose);
|
found |= HF14B_other_reader(verbose);
|
||||||
if (found && loop)
|
if (found && loop)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
} while (loop && kbd_enter_pressed() == false);
|
} while (loop && kbd_enter_pressed() == false);
|
||||||
|
|
||||||
|
|
||||||
if (verbose && found == false) {
|
if (verbose && found == false) {
|
||||||
PrintAndLogEx(FAILED, "no ISO 14443-B tag found");
|
PrintAndLogEx(FAILED, "no ISO 14443-B tag found");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue