X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8d183c53b6f6d65593c06d4d40a0c5641798aaf9..fffad860fc457cfe5636fddc78a6a485ae9a7329:/client/cmddata.c diff --git a/client/cmddata.c b/client/cmddata.c index 71ef6752..561132bf 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -476,9 +476,9 @@ int CmdSamples(const char *Cmd) int CmdLoad(const char *Cmd) { - FILE *f = fopen(Cmd, "r"); + FILE *f = fopen(Cmd + 1, "r"); if (!f) { - PrintAndLog("couldn't open '%s'", Cmd); + PrintAndLog("couldn't open '%s'", Cmd + 1); return 0; } @@ -534,10 +534,11 @@ int CmdManchesterDemod(const char *Cmd) int warnings = 0; /* check if we're inverting output */ - if (*Cmd == 'i') + if (*(Cmd + 1) == 'i') { PrintAndLog("Inverting output"); invert = 1; + ++Cmd; do ++Cmd; while(*Cmd == ' '); // in case a 2nd argument was given @@ -858,16 +859,16 @@ static command_t CommandTable[] = {"hexsamples", CmdHexsamples, 0, " [] -- Dump big buffer as hex bytes"}, {"hide", CmdHide, 1, "Hide graph window"}, {"hpf", CmdHpf, 1, "Remove DC offset from trace"}, - {"samples", CmdSamples, 0, "[128 - 16000] -- Get raw samples for graph window"}, {"load", CmdLoad, 1, " -- Load trace (to graph window"}, {"ltrim", CmdLtrim, 1, " -- Trim samples from left of trace"}, {"mandemod", CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"}, {"manmod", CmdManchesterMod, 1, "[clock rate] -- Manchester modulate a binary stream"}, {"norm", CmdNorm, 1, "Normalize max/min to +/-500"}, {"plot", CmdPlot, 1, "Show graph window"}, + {"samples", CmdSamples, 0, "[128 - 16000] -- Get raw samples for graph window"}, {"save", CmdSave, 1, " -- Save trace (from graph window)"}, {"scale", CmdScale, 1, " -- Set cursor display scale"}, - {"threshold", CmdThreshold, 1, "Maximize/minimize every value in the graph window depending on threshold"}, + {"threshold", CmdThreshold, 1, " -- Maximize/minimize every value in the graph window depending on threshold"}, {"zerocrossings", CmdZerocrossings, 1, "Count time between zero-crossings"}, {NULL, NULL, 0, NULL} };