From 71fa4614036ed08e5bda3fcb7920d466512e7bc1 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 10 Dec 2017 11:38:26 +0100 Subject: [PATCH] fix: timeout issues with checkkeys etc --- armsrc/iso14443a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index c4cebea7b..adaf3fbd8 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -1723,6 +1723,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive // clear RXRDY: uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; + uint32_t timeout = iso14a_get_timeout(); for(;;) { WDT_HIT(); @@ -1731,7 +1732,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive if (ManchesterDecoding(b, offset, 0)) { NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD); return true; - } else if (c++ > iso14a_timeout && Demod.state == DEMOD_UNSYNCD) { + } else if (c++ > timeout && Demod.state == DEMOD_UNSYNCD) { return false; } }