RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-14 12:08:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

-p refs - unify param

Browse source
This commit is contained in:
iceman1001 2020-10-01 00:31:27 +02:00
parent beadecf7eb
commit 6fc3b9a4a7
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
client/src/cmdhf15.c
View file

@ -315,10 +315,10 @@ static int usage_15_raw(void) {
{"-r", "do not read response" }, {"-r", "do not read response" },
{"-2", "use slower '1 out of 256' mode" }, {"-2", "use slower '1 out of 256' mode" },
{"-c", "calculate and append CRC" }, {"-c", "calculate and append CRC" },
{"-p", "leave the signal field ON" }, {"-k", "keep signal field ON after receive" },
{"", "Tip: turn on debugging for verbose output"}, {"", "Tip: turn on debugging for verbose output"},
}; };
PrintAndLogEx(NORMAL, "Usage: hf 15 raw [-r] [-2] [-c] <0A 0B 0C ... hex>\n"); PrintAndLogEx(NORMAL, "Usage: hf 15 raw [-r] [-2] [-k] [-c] <0A 0B 0C ... hex>\n");
PrintAndLogOptions(options, 4, 3); PrintAndLogOptions(options, 4, 3);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1353,7 +1353,7 @@ static int CmdHF15Raw(const char *Cmd) {
if (strlen(Cmd) < 3 || cmdp == 'h') return usage_15_raw(); if (strlen(Cmd) < 3 || cmdp == 'h') return usage_15_raw();
int reply = 1, fast = 1, i = 0; int reply = 1, fast = 1, i = 0;
bool crc = false, leaveSignalON = false; bool crc = false, keep_field_on = false;
char buf[5] = ""; char buf[5] = "";
uint8_t data[100]; uint8_t data[100];
uint32_t datalen = 0, temp; uint32_t datalen = 0, temp;
@ -1364,21 +1364,18 @@ static int CmdHF15Raw(const char *Cmd) {
while (Cmd[i] != '\0') { while (Cmd[i] != '\0') {
if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; } if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
if (Cmd[i] == '-') { if (Cmd[i] == '-') {
switch (Cmd[i + 1]) { switch (tolower(Cmd[i + 1])) {
case 'r': case 'r':
case 'R':
reply = 0; reply = 0;
break; break;
case '2': case '2':
fast = 0; fast = 0;
break; break;
case 'c': case 'c':
case 'C':
crc = true; crc = true;
break; break;
case 'p': case 'k':
case 'P': keep_field_on = true;
leaveSignalON = true;
break; break;
default: default:
PrintAndLogEx(WARNING, "Invalid option"); PrintAndLogEx(WARNING, "Invalid option");
@ -1429,7 +1426,7 @@ static int CmdHF15Raw(const char *Cmd) {
} }
} }
if (leaveSignalON == false) if (keep_field_on == false)
DropField(); DropField();
return PM3_SUCCESS; return PM3_SUCCESS;