X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/68541dddc2734755f4fd306e327dffa89640ecdd..0d2624a0cc13dbe34392da1f8495af6c64a84ddb:/client/cmdlfvisa2000.c diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c index b461d94d..33259794 100644 --- a/client/cmdlfvisa2000.c +++ b/client/cmdlfvisa2000.c @@ -13,7 +13,7 @@ #include #include -#include "proxmark3.h" +#include "comms.h" #include "ui.h" #include "util.h" #include "graph.h" @@ -29,26 +29,26 @@ static int CmdHelp(const char *Cmd); int usage_lf_visa2k_clone(void){ PrintAndLog("clone a Visa2000 tag to a T55x7 tag."); - PrintAndLog("Usage: lf visa2k clone [h] "); + PrintAndLog("Usage: lf visa2000 clone [h] "); PrintAndLog("Options:"); PrintAndLog(" h : This help"); - PrintAndLog(" : Visa2k card ID"); + PrintAndLog(" : Visa2000 card ID"); PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); PrintAndLog(""); - PrintAndLog("Sample: lf visa2k clone 112233"); + PrintAndLog("Sample: lf visa2000 clone 112233"); return 0; } int usage_lf_visa2k_sim(void) { - PrintAndLog("Enables simulation of visa2k card with specified card number."); + PrintAndLog("Enables simulation of visa2000 card with specified card number."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); PrintAndLog(""); - PrintAndLog("Usage: lf visa2k sim [h] "); + PrintAndLog("Usage: lf visa2000 sim [h] "); PrintAndLog("Options:"); PrintAndLog(" h : This help"); - PrintAndLog(" : Visa2k card ID"); + PrintAndLog(" : Visa2000 card ID"); PrintAndLog(""); - PrintAndLog("Sample: lf visa2k sim 112233"); + PrintAndLog("Sample: lf visa2000 sim 112233"); return 0; } @@ -100,7 +100,7 @@ int CmdVisa2kDemod(const char *Cmd) { //ASK / Manchester bool st = true; if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) { - if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2000: ASK/Manchester Demod failed"); return 0; } size_t size = DemodBufferLen; @@ -108,18 +108,18 @@ int CmdVisa2kDemod(const char *Cmd) { if (ans < 0){ if (g_debugMode){ if (ans == -1) - PrintAndLog("DEBUG: Error - Visa2k: too few bits found"); + PrintAndLog("DEBUG: Error - Visa2000: too few bits found"); else if (ans == -2) - PrintAndLog("DEBUG: Error - Visa2k: preamble not found"); + PrintAndLog("DEBUG: Error - Visa2000: preamble not found"); else if (ans == -3) - PrintAndLog("DEBUG: Error - Visa2k: Size not correct: %d", size); + PrintAndLog("DEBUG: Error - Visa2000: Size not correct: %d", size); else - PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans); + PrintAndLog("DEBUG: Error - Visa2000: ans: %d", ans); } return 0; } setDemodBuf(DemodBuffer, 96, ans); - //setGrid_Clock(64); + setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock)); //got a good demod uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);