sync with master lf files to resolve conflicts

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 18bcf747e7c16f109a4c0220153bbf6bc9810db2..b398689733bdbbec3a2af7c920fc514ddd41ec42 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -56,7 +56,7 @@ int CmdFlexdemod(const char *Cmd)
     }
   }
 
-#define LONG_WAIT 100
+  #define LONG_WAIT 100
   int start;
   for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
     int first = GraphBuffer[start];
@@ -559,18 +559,32 @@ int CmdLFfind(const char *Cmd)
     ans=CmdSamples("20000");
   }
   if (GraphTraceLen<1000) return 0;
+  PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
   PrintAndLog("Checking for known tags:");
+
   ans=Cmdaskmandemod("");
-  if (ans>0) return 1;
+  if (ans>0) {
+    PrintAndLog("Valid EM410x ID Found!");
+    return 1;
+  }
   ans=CmdFSKdemodHID("");
-  if (ans>0) return 1;
+  if (ans>0) {
+    PrintAndLog("Valid HID Prox ID Found!");
+    return 1;
+  }
   ans=CmdFSKdemodIO("");
-  if (ans>0) return 1;
+  if (ans>0) {
+    PrintAndLog("Valid IO Prox ID Found!");
+    return 1;
+  }
   //add psk and indala
-  ans=CmdIndalaDemod("");
-  if (ans>0) return 1;
-  ans=CmdIndalaDemod("224");
-  if (ans>0) return 1;
+  ans=CmdIndalaDecode("");
+  if (ans>0) {
+    PrintAndLog("Valid Indala ID Found!");
+    return 1;
+  }
+ // ans=CmdIndalaDemod("224");
+ // if (ans>0) return 1;
   PrintAndLog("No Known Tags Found!\n");
   return 0;
 }