github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves the same.

Browse source 
CHG:  removed some "DONE!" device prints..
CHG:  unified some "clone" commands output.
This commit is contained in:
iceman1001 2017-01-18 22:54:27 +01:00
commit 42c235e7ef
13 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdlfguard.c
View file

@ -6,8 +6,7 @@
//-----------------------------------------------------------------------------
// Low frequency Farpoint / Pyramid tag commands
//-----------------------------------------------------------------------------
#include <string.h>
#include <inttypes.h>
#include "cmdlfguard.h"
static int CmdHelp(const char *Cmd);
@ -40,7 +39,6 @@ int usage_lf_guard_sim(void) {
return 0;
}
// Works for 26bits.
int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) {
@ -50,8 +48,6 @@ int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) {
//uint8_t xorKey = rand() % 0xFF;
uint8_t xorKey = 0x66;
uint8_t i;
uint8_t pre[96];
memset(pre, 0x00, sizeof(pre));
@ -122,7 +118,7 @@ int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) {
int CmdGuardRead(const char *Cmd) {
CmdLFRead("s");
getSamples("20000", TRUE);
getSamples("12000", TRUE);
return CmdG_Prox_II_Demod("");
}
@ -161,7 +157,7 @@ int CmdGuardClone(const char *Cmd) {
PrintAndLog("Blk | Data ");
PrintAndLog("----+------------");
for ( i = 0; i<4; ++i )
PrintAndLog(" %02d | %08x", i, blocks[i]);
PrintAndLog(" %02d | 0x%08x", i, blocks[i]);
UsbCommand resp;
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
@ -171,7 +167,7 @@ int CmdGuardClone(const char *Cmd) {
c.arg[1] = i;
clearCommandBuffer();
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
PrintAndLog("Error occurred, device did not respond during write operation.");
return -1;
}