Merge remote-tracking branch 'upstream/master'

This commit is contained in:
marshmellow42 2015-01-26 17:07:49 -05:00
commit 9c0f13d5dd
37 changed files with 3372 additions and 312 deletions

View file

@ -465,8 +465,11 @@ int CmdLFSnoop(const char *Cmd)
sscanf(Cmd, "h %"lli, &c.arg[1]);
} else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) {
PrintAndLog("usage 1: snoop");
PrintAndLog(" 2: snoop {l,h} [trigger threshold]");
PrintAndLog(" 2: snoop <l|h> [trigger threshold]");
PrintAndLog(" 3: snoop <divisor> [trigger threshold]");
PrintAndLog("");
PrintAndLog("Sample: lf snoop l 200");
PrintAndLog(" : lf snoop 95 200");
return 0;
}