From 32a1bb4c01f96ab60bef7f1f0b53a276da7245be Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 3 May 2018 21:54:53 +0200 Subject: [PATCH] fix: 'hf mfu dump' - increased timeout in order to read ntag216 tags --- client/cmdhfmfu.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 677490ec4..0e0108322 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -53,23 +53,17 @@ uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = { #define MAX_UL_TYPES 22 uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = { - UNKNOWN, UL, UL_C, - UL_EV1_48, UL_EV1_128, NTAG, - NTAG_203, NTAG_210, NTAG_212, - NTAG_213, NTAG_215, NTAG_216, - MY_D, MY_D_NFC, MY_D_MOVE, - MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL, - UL_EV1, NTAG_213_F, NTAG_216_F, UL_NANO_40 + UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, NTAG, + NTAG_203, NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216, + MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL, + UL_EV1, NTAG_213_F, NTAG_216_F, UL_NANO_40 }; uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = { - MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, - MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203, - MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, - MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216, - MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, - MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS, - MAX_ULEV1a_BLOCKS, MAX_NTAG_213, MAX_NTAG_216, MAX_UL_NANO_40 + MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203, + MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216, + MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS, + MAX_ULEV1a_BLOCKS, MAX_NTAG_213, MAX_NTAG_216, MAX_UL_NANO_40 }; //------------------------------------ @@ -1766,7 +1760,7 @@ int CmdHF14AMfUDump(const char *Cmd){ clearCommandBuffer(); SendCommand(&c); UsbCommand resp; - if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { + if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) { PrintAndLogEx(WARNING, "Command execute time-out"); return 1; }