the timeout on lf read makes the threshold ...

option not work as expected..  need to find a more robust option...

+ added iceman's lf_em410x_sim help text..
This commit is contained in:
marshmellow42 2017-02-24 01:02:25 -05:00
parent e88c04f924
commit c85189135e
2 changed files with 20 additions and 11 deletions

View file

@ -569,11 +569,11 @@ int CmdLFRead(const char *Cmd)
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
clearCommandBuffer();
SendCommand(&c);
//WaitForResponse(CMD_ACK,NULL);
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
PrintAndLog("command execution time out");
return 1;
}
WaitForResponse(CMD_ACK,NULL);
//if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
// PrintAndLog("command execution time out");
// return 1;
//}
return 0;
}

View file

@ -63,6 +63,20 @@ int CmdEM410xRead(const char *Cmd)
return 1;
}
int usage_lf_em410x_sim(void) {
PrintAndLog("Simulating EM410x tag");
PrintAndLog("");
PrintAndLog("Usage: lf em 410xsim [h] <uid> <clock>");
PrintAndLog("Options:");
PrintAndLog(" h - this help");
PrintAndLog(" uid - uid (10 HEX symbols)");
PrintAndLog(" clock - clock (32|64) (optional)");
PrintAndLog("samples:");
PrintAndLog(" lf em 410xsim 0F0368568B");
PrintAndLog(" lf em 410xsim 0F0368568B 32");
return 0;
}
// emulate an EM410X tag
int CmdEM410xSim(const char *Cmd)
{
@ -71,12 +85,7 @@ int CmdEM410xSim(const char *Cmd)
char cmdp = param_getchar(Cmd, 0);
uint8_t uid[5] = {0x00};
if (cmdp == 'h' || cmdp == 'H') {
PrintAndLog("Usage: lf em 410xsim <UID> <clock>");
PrintAndLog("");
PrintAndLog(" sample: lf em 410xsim 0F0368568B");
return 0;
}
if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
/* clock is 64 in EM410x tags */
uint8_t clock = 64;