From 8ae9b358f85bdfc60e269c0e93c8fa911869706a Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 29 Jul 2016 13:46:05 +0200 Subject: [PATCH] CHG: textual changes to help text. CHG: removed the 'd' as input, the clone/sim commands is simpler. CHG: printing of card ID is now zero padded. --- client/cmdlfjablotron.c | 43 +++++++++++++++++++---------------------- client/cmdlfnedap.c | 24 +++++++++++------------ 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index a97bb770..1401f11e 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -12,26 +12,26 @@ static int CmdHelp(const char *Cmd); int usage_lf_jablotron_clone(void){ PrintAndLog("clone a Jablotron tag to a T55x7 tag."); - PrintAndLog("Usage: lf jablotron clone d "); - PrintAndLog("Options :"); - PrintAndLog(" d : jablotron card ID"); - PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); + PrintAndLog("Usage: lf jablotron clone [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : jablotron card ID"); + PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); PrintAndLog(""); - PrintAndLog("Sample : lf jablotron clone d 123456789"); + PrintAndLog("Sample: lf jablotron clone d 112233"); return 0; } int usage_lf_jablotron_sim(void) { PrintAndLog("Enables simulation of jablotron card with specified card number."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); - PrintAndLog("Per jablotron format, the card number is 9 digit number and can contain *# chars. Larger values are truncated."); PrintAndLog(""); - PrintAndLog("Usage: lf jablotron sim d or H "); - PrintAndLog("Options :"); - PrintAndLog(" d : jablotron card number"); -// PrintAndLog(" H : 8 digit hex card number"); + PrintAndLog("Usage: lf jablotron sim [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : jablotron card ID"); PrintAndLog(""); - PrintAndLog("Sample : lf jablotron sim d 123456789"); + PrintAndLog("Sample: lf jablotron sim d 112233"); return 0; } @@ -88,7 +88,7 @@ int CmdJablotronDemod(const char *Cmd) { cardid <<= 32; cardid |= (raw2 >> 8); - PrintAndLog("Jablotron Tag Found: Card ID %12X", cardid); + PrintAndLog("Jablotron Tag Found: Card ID %012X", cardid); PrintAndLog("Raw: %08X%08X", raw1 ,raw2); setDemodBuf(DemodBuffer+ans, 64, 0); @@ -98,11 +98,8 @@ int CmdJablotronDemod(const char *Cmd) { } int CmdJablotronRead(const char *Cmd) { - // read lf silently CmdLFRead("s"); - // get samples silently getSamples("30000",false); - // demod and output Presco ID return CmdJablotronDemod(Cmd); } @@ -118,10 +115,10 @@ int CmdJablotronClone(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_clone(); - fullcode = param_get64ex(Cmd, 1, 0, 16); + fullcode = param_get64ex(Cmd, 0, 0, 16); //Q5 - if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') { + if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') { //t5555 (Q5) BITRATE = (RF-2)/2 (iceman) blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64< [Q5] clone jablotron tag"}, - {"sim", CmdJablotronSim, 0, "h simulate jablotron tag"}, + {"read", CmdJablotronRead, 0, "Attempt to read and extract tag data"}, + {"clone", CmdJablotronClone, 0, "clone jablotron tag"}, + {"sim", CmdJablotronSim, 0, "simulate jablotron tag"}, {NULL, NULL, 0, NULL} }; diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c index 9e6a624b..0c56c8e2 100644 --- a/client/cmdlfnedap.c +++ b/client/cmdlfnedap.c @@ -14,12 +14,13 @@ static int CmdHelp(const char *Cmd); int usage_lf_nedap_clone(void){ PrintAndLog("clone a NEDAP tag to a T55x7 tag."); PrintAndLog(""); - PrintAndLog("Usage: lf nedap clone "); - PrintAndLog("Options :"); - PrintAndLog(" : 24-bit value card number"); -// PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); + PrintAndLog("Usage: lf nedap clone [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : 24-bit value card number"); +// PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); PrintAndLog(""); - PrintAndLog("Sample : lf nedap clone 112233"); + PrintAndLog("Sample: lf nedap clone 112233"); return 0; } @@ -27,11 +28,12 @@ int usage_lf_nedap_sim(void) { PrintAndLog("Enables simulation of NEDAP card with specified card number."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); PrintAndLog(""); - PrintAndLog("Usage: lf nedap sim "); - PrintAndLog("Options :"); - PrintAndLog(" : 24-bit value card number"); + PrintAndLog("Usage: lf nedap sim [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : 24-bit value card number"); PrintAndLog(""); - PrintAndLog("Sample : lf nedap sim 112233"); + PrintAndLog("Sample: lf nedap sim 112233"); return 0; } @@ -277,7 +279,7 @@ int CmdLFNedapSim(const char *Cmd) { arg1 = clk << 8 | encoding; arg2 = invert << 8 | separator; - if (sscanf(Cmd, "%u", &cn ) != 2) return usage_lf_nedap_sim(); + if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim(); cardnumber = (cn & 0x00FFFFFF); if ( !GetNedapBits(cardnumber, bs)) { @@ -294,8 +296,6 @@ int CmdLFNedapSim(const char *Cmd) { return 0; } - - int CmdLFNedapChk(const char *Cmd){ uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE}; -- 2.39.5