Merge pull request #4 from gcohen55/ubuntu_makefile

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index aa7f63a9c0830fc6bdfcab57296fc5250529f30a..809602a39676d07a7004304f148c84d414cfdfaa 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -22,6 +22,7 @@
 #include "util.h"
 #include "cmdlf.h"
 #include "cmdlfhid.h"
 #include "util.h"
 #include "cmdlf.h"
 #include "cmdlfhid.h"

+#include "cmdlfawid.h"

 #include "cmdlfti.h"
 #include "cmdlfem4x.h"
 #include "cmdlfhitag.h"
 #include "cmdlfti.h"
 #include "cmdlfem4x.h"
 #include "cmdlfhitag.h"


@@ -388,7 +389,7 @@ int usage_lf_config()
        PrintAndLog("       b <bps>       Sets resolution of bits per sample. Default (max): 8");
        PrintAndLog("       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
        PrintAndLog("       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
        PrintAndLog("       b <bps>       Sets resolution of bits per sample. Default (max): 8");
        PrintAndLog("       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
        PrintAndLog("       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");

-       PrintAndLog("       t <threshold> Sets trigger threshold. 0 means no threshold");
+       PrintAndLog("       t <threshold> Sets trigger threshold. 0 means no threshold (range: 0-128)");

        PrintAndLog("Examples:");
        PrintAndLog("      lf config b 8 L");
        PrintAndLog("                    Samples at 125KHz, 8bps.");
        PrintAndLog("Examples:");
        PrintAndLog("      lf config b 8 L");
        PrintAndLog("                    Samples at 125KHz, 8bps.");


@@ -1011,6 +1012,7 @@ int CmdLFfind(const char *Cmd)
     PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
     PrintAndLog("          : lf search u   = try reading data from tag & search for known and unknown tags");
     PrintAndLog("          : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
     PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
     PrintAndLog("          : lf search u   = try reading data from tag & search for known and unknown tags");
     PrintAndLog("          : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");

+

     return 0;
   }
 
     return 0;
   }
 


@@ -1028,7 +1030,6 @@ int CmdLFfind(const char *Cmd)
   PrintAndLog("\nChecking for known tags:\n");
 
   ans=CmdFSKdemodIO("");
   PrintAndLog("\nChecking for known tags:\n");
 
   ans=CmdFSKdemodIO("");

-  

   if (ans>0) {
     PrintAndLog("\nValid IO Prox ID Found!");
     return 1;
   if (ans>0) {
     PrintAndLog("\nValid IO Prox ID Found!");
     return 1;


@@ -1157,6 +1158,7 @@ static command_t CommandTable[] =
 {
   {"help",        CmdHelp,            1, "This help"},
   {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
 {
   {"help",        CmdHelp,            1, "This help"},
   {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},

+  {"awid",             CmdLFAWID,                  1, "{ AWID RFIDs... }"},

   {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
   {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
   {"io",                 CmdLFIO,                1, "{ IOPROX RFIDs... }"},
   {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
   {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
   {"io",                 CmdLFIO,                1, "{ IOPROX RFIDs... }"},