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

chg: add some helptexts

Browse source
This commit is contained in:
iceman1001 2019-05-06 14:38:56 +02:00
commit 3a902a7a4c
1 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

48
client/cmdhw.c
View file

@ -23,6 +23,32 @@
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int usage_hw_detectreader(void) {
PrintAndLogEx(NORMAL, "Start to detect presences of reader field");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Usage: hw detectreader [h] <L|H>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help");
PrintAndLogEx(NORMAL, " <type> L = 125/134 kHz, H = 13.56 mHz");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, " hw detectreader L");
return PM3_SUCCESS;
}
static int usage_hw_setmux(void) {
PrintAndLogEx(NORMAL, "Set mux mode");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Usage: hw setmux [h] <lopkd | loraw | hipkd | hiraw>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help");
PrintAndLogEx(NORMAL, " <type> Low peak, Low raw, Hi peak, Hi raw");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, " hw setmux lopkd");
return PM3_SUCCESS;
}
static void lookupChipID(uint32_t iChipID, uint32_t mem_used) { static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
char asBuff[120]; char asBuff[120];
memset(asBuff, 0, sizeof(asBuff)); memset(asBuff, 0, sizeof(asBuff));
@ -309,18 +335,16 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
static int CmdDetectReader(const char *Cmd) { static int CmdDetectReader(const char *Cmd) {
uint16_t arg = 0; uint16_t arg = 0;
char c = tolower(Cmd[0]); char c = toupper(Cmd[0]);
switch (c) { switch (c) {
case 'l': case 'L':
arg = 1; arg = 1;
break; break;
case 'h': case 'H':
arg = 2; arg = 2;
break; break;
default: { default: {
PrintAndLogEx(NORMAL, "use 'detectreader'"); usage_hw_detectreader();
PrintAndLogEx(NORMAL, " 'detectreader l' -- 125/134 kHz");
PrintAndLogEx(NORMAL, " 'detectreader h' -- 13.56 mHz");
return PM3_EINVARG; return PM3_EINVARG;
} }
} }
@ -388,17 +412,19 @@ static int CmdSetDivisor(const char *Cmd) {
static int CmdSetMux(const char *Cmd) { static int CmdSetMux(const char *Cmd) {
if (strlen(Cmd) < 5) { if (strlen(Cmd) < 5) {
PrintAndLogEx(NORMAL, "expected: lopkd | loraw | hipkd | hiraw"); usage_hw_setmux();
return PM3_EINVARG; return PM3_EINVARG;
} }
uint16_t arg = 0; str_lower((char *)Cmd);
uint8_t arg = 0;
if (strcmp(Cmd, "lopkd") == 0) arg = 0; if (strcmp(Cmd, "lopkd") == 0) arg = 0;
else if (strcmp(Cmd, "loraw") == 0) arg = 1; else if (strcmp(Cmd, "loraw") == 0) arg = 1;
else if (strcmp(Cmd, "hipkd") == 0) arg = 2; else if (strcmp(Cmd, "hipkd") == 0) arg = 2;
else if (strcmp(Cmd, "hiraw") == 0) arg = 3; else if (strcmp(Cmd, "hiraw") == 0) arg = 3;
else { else {
PrintAndLogEx(NORMAL, "expected: lopkd | loraw | hipkd | hiraw"); usage_hw_setmux();
return PM3_EINVARG; return PM3_EINVARG;
} }
clearCommandBuffer(); clearCommandBuffer();
@ -421,8 +447,8 @@ static int CmdStatus(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
PacketResponseNG resp; PacketResponseNG resp;
SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0); SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900)) if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out"); PrintAndLogEx(NORMAL, "Status command failed. Communication speed test timed out");
return PM3_SUCCESS; return PM3_SUCCESS;
} }