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

CHG: some of @marshmellow42 's ref: 2b11c7c750

Browse source 
CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it.
This commit is contained in:
iceman1001 2017-02-27 14:04:50 +01:00
commit 41611deef9
4 changed files with 125 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/cmdlf.c
View file

@ -8,6 +8,9 @@
// Low frequency commands
//-----------------------------------------------------------------------------
#include "cmdlf.h"
bool g_lf_threshold_set = FALSE;
static int CmdHelp(const char *Cmd);
int usage_lf_cmdread(void) {
@ -27,11 +30,10 @@ int usage_lf_cmdread(void) {
return 0;
}
int usage_lf_read(void){
PrintAndLog("Usage: lf read [h] [s] [t]");
PrintAndLog("Usage: lf read [h] [s]");
PrintAndLog("Options:");
PrintAndLog(" h This help");
PrintAndLog(" s silent run no printout");
PrintAndLog(" t waits for device to respond with no timeout");
PrintAndLog("Use 'lf config' to set parameters.");
return 0;
}
@ -503,7 +505,10 @@ int CmdLFSetConfig(const char *Cmd) {
case 't':
errors |= param_getdec(Cmd, cmdp+1, &unsigned_trigg);
cmdp+=2;
if(!errors) trigger_threshold = unsigned_trigg;
if(!errors) {
trigger_threshold = unsigned_trigg;
g_lf_threshold_set = (trigger_threshold > 0);
}
break;
case 'b':
errors |= param_getdec(Cmd, cmdp+1, &bps);
@ -544,9 +549,11 @@ int CmdLFSetConfig(const char *Cmd) {
}
int CmdLFRead(const char *Cmd) {
if (offline) return 0;
bool errors = FALSE;
bool arg1 = FALSE;
bool thresholdRead = FALSE;
uint8_t cmdp = 0;
while(param_getchar(Cmd, cmdp) != 0x00) {
switch(param_getchar(Cmd, cmdp)) {
@ -558,11 +565,6 @@ int CmdLFRead(const char *Cmd) {
arg1 = TRUE;
cmdp++;
break;
case 't':
case 'T':
thresholdRead = TRUE;
cmdp++;
break;
default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = 1;
@ -580,7 +582,7 @@ int CmdLFRead(const char *Cmd) {
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
clearCommandBuffer();
SendCommand(&c);
if ( thresholdRead ) {
if ( g_lf_threshold_set ) {
WaitForResponse(CMD_ACK,NULL);
} else {
if ( !WaitForResponseTimeout(CMD_ACK, NULL ,2500) ) {