From 801cb959677d38a2f6edf57bc7e021e912c7d49f Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 13 May 2019 13:36:54 +0200 Subject: [PATCH] fix: 'lf t55xx write' - wrong bitshift --- armsrc/lfops.c | 4 ++-- client/cmdlft55xx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/armsrc/lfops.c b/armsrc/lfops.c index c5b703b13..a49f205c4 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -1401,7 +1401,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl LED_A_ON(); bool pwd_mode = (flags & 0x1); uint8_t page = (flags & 0x2) >> 1; - bool test_mode = (flags & 0x4 >> 3); + bool test_mode = (flags & 0x4) >> 2; uint32_t i = 0; // Set up FPGA, 125kHz @@ -1415,7 +1415,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl WaitUS(t_config.start_gap); if (test_mode) { - Dbprintf("T55xx writing with ", _YELLOW_("test mode enabled")); + Dbprintf("T55xx writing with %s", _YELLOW_("test mode enabled")); // undocmented testmode opcode 01 T55xxWriteBit(0); T55xxWriteBit(1); diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index dfb087084..10654fb19 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -1103,7 +1103,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) { ng.flags = flags; SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng)); - if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 1500)) { + if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 2000)) { PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)"); return 0; }