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

use handle

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-15 20:06:27 +02:00
commit e4967ac654
1 changed files with 4 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
client/src/cmdhw.c
View file

@ -539,7 +539,8 @@ int handle_tearoff(tearoff_params_t *params, bool verbose) {
if (params->off && verbose) if (params->off && verbose)
PrintAndLogEx(INFO, "Tear-off hook " _RED_("disabled")); PrintAndLogEx(INFO, "Tear-off hook " _RED_("disabled"));
} } else if (verbose)
PrintAndLogEx(WARNING, "Tear-off command failed.");
return resp.status; return resp.status;
} }
@ -563,11 +564,7 @@ static int CmdTearoff(const char *Cmd) {
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
struct { tearoff_params_t params;
uint16_t delay_us;
bool on;
bool off;
} PACKED params;
int delay = arg_get_int_def(ctx, 1, -1); int delay = arg_get_int_def(ctx, 1, -1);
params.on = arg_get_lit(ctx, 2); params.on = arg_get_lit(ctx, 2);
params.off = arg_get_lit(ctx, 3); params.off = arg_get_lit(ctx, 3);
@ -589,29 +586,7 @@ static int CmdTearoff(const char *Cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
clearCommandBuffer(); return handle_tearoff(&params, !silent);
SendCommandNG(CMD_SET_TEAROFF, (uint8_t *)&params, sizeof(params));
PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_SET_TEAROFF, &resp, 500) == false) {
PrintAndLogEx(WARNING, "Tear-off command timeout.");
return PM3_ETIMEOUT;
}
if (resp.status == PM3_SUCCESS) {
if (params.delay_us > 0)
PrintAndLogEx(INFO, "Tear-off hook configured with delay of " _GREEN_("%i us"), params.delay_us);
if (params.on && silent == false)
PrintAndLogEx(INFO, "Tear-off hook " _GREEN_("enabled"));
if (params.off && silent == false)
PrintAndLogEx(INFO, "Tear-off hook " _RED_("disabled"));
return PM3_SUCCESS;
}
if (silent == false)
PrintAndLogEx(WARNING, "Tear-off command failed.");
return resp.status;
} }
static int CmdTia(const char *Cmd) { static int CmdTia(const char *Cmd) {