From aa711b2d921e27827b8d41cfae6c5b135563b819 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 9 Aug 2017 09:26:41 +0200 Subject: [PATCH] chg: 'hf 14a cuids' - now can be interrupted with keyboard press --- client/cmdhf14a.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 82a4c463e..5c7c2c2ef 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -411,10 +411,18 @@ int CmdHF14ACUIDs(const char *Cmd) { // collect at least 1 (e.g. if no parameter was given) n = n > 0 ? n : 1; + uint64_t t1 = msclock(); PrintAndLog("Collecting %d UIDs", n); - PrintAndLog("Start: %" PRIu64, msclock()/1000); + // repeat n times for (int i = 0; i < n; i++) { + + if (ukbhit()) { + int gc = getchar(); (void)gc; + printf("\naborted via keyboard!\n"); + break; + } + // execute anticollision procedure UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}}; SendCommand(&c); @@ -435,7 +443,7 @@ int CmdHF14ACUIDs(const char *Cmd) { PrintAndLog("%s", uid_string); } } - PrintAndLog("End: %" PRIu64, msclock()/1000); + PrintAndLog("End: %" PRIu64 " seconds", (msclock()-t1)/1000); return 1; }