Added a lf acquisition-mode which can do decimation and quantization, in order to...

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 65d6fdd5f92064576b4209b2c1afd4f42b69d715..e3361cb50b3b33e38aebd540dbe505405d543173 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -566,26 +566,37 @@ int CmdLFfind(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       if (!offline || (cmdp != '1') ){
+       if (!offline && (cmdp != '1')){

     ans=CmdLFRead("");
     ans=CmdLFRead("");

-       ans=CmdSamples("20000");
+    ans=CmdSamples("20000");

        } else if (GraphTraceLen < 1000) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
   }
 
        } else if (GraphTraceLen < 1000) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
   }
 

+  PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");

   PrintAndLog("Checking for known tags:");
   PrintAndLog("Checking for known tags:");

-  ans=Cmdaskmandemod("");
-  if (ans>0) return 1;
-  ans=CmdFSKdemodHID("");
-  if (ans>0) return 1;

   ans=CmdFSKdemodIO("");
   ans=CmdFSKdemodIO("");

-  if (ans>0) return 1;
+  if (ans>0) {
+    PrintAndLog("Valid IO Prox ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodHID("");
+  if (ans>0) {
+    PrintAndLog("Valid HID Prox ID Found!");
+    return 1;
+  }

   //add psk and indala
   //add psk and indala

-  ans=CmdIndalaDemod("");
-  if (ans>0) return 1;
-  ans=CmdIndalaDemod("224");
-  if (ans>0) return 1;
+  ans=CmdIndalaDecode("0");
+  if (ans>0) {
+    PrintAndLog("Valid Indala ID Found!");
+    return 1;
+  }
+  ans=Cmdaskmandemod("");
+  if (ans>0) {
+    PrintAndLog("Valid EM410x ID Found!");
+    return 1;
+  }

   PrintAndLog("No Known Tags Found!\n");
   return 0;
 }
   PrintAndLog("No Known Tags Found!\n");
   return 0;
 }