CHG: `lf em` - some minor refactoring in 4x50 commands

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 31e747d332aba32b6d3cfb1bdd5100db36010434..f2a9bb386220e543886ef1cf56467b1cb9a95404 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -1004,6 +1004,7 @@ int CmdVchDemod(const char *Cmd) {
 //by marshmellow
 int CmdLFfind(const char *Cmd) {
        int ans = 0;
+       size_t minLength = 1000;
        char cmdp = param_getchar(Cmd, 0);
        char testRaw = param_getchar(Cmd, 1);
        if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_lf_find();
@@ -1011,21 +1012,38 @@ int CmdLFfind(const char *Cmd) {
        if (!offline && (cmdp != '1')){
                CmdLFRead("s");
                getSamples("30000", false);
-       } else if (GraphTraceLen < 1000) {
+       } else if (GraphTraceLen < minLength) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
        }
        if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
 
-       // if ( justNoise(GraphBuffer, GraphTraceLen) ) {
-               // PrintAndLog("Signal looks just like noise. Quitting.");
-               // return 0;
-       // }
-       
        PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
        PrintAndLog("False Positives ARE possible\n");  
        PrintAndLog("\nChecking for known tags:\n");
 
+       size_t testLen = minLength;
+       
+       // only run these tests if device is online
+       if (!offline && (cmdp != '1')){
+
+               // only run if graphbuffer is just noise as it should be for hitag/cotag
+               if (graphJustNoise(GraphBuffer, testLen)) {
+                       
+                       ans=CmdLFHitagReader("26");
+                       if (ans==0)
+                               return 1;
+
+                       ans=CmdCOTAGRead("");
+                       if (ans>0){
+                               PrintAndLog("\nValid COTAG ID Found!");
+                               return 1;
+                       }
+                       PrintAndLog("Signal looks just like noise. Quitting.");
+                   return 0;
+               }
+       }
+
        ans=CmdFSKdemodIO("");
        if (ans>0) {
                PrintAndLog("\nValid IO Prox ID Found!");
@@ -1116,17 +1134,8 @@ int CmdLFfind(const char *Cmd) {
                PrintAndLog("\nValid Presco ID Found!");
                return 1;
        }
-       // TIdemod?
-
-/*     
-       if (!offline && (cmdp != '1')){
-               ans=CmdLFHitagReader("26");
-               if (ans==0) {
-                       return 1;
-               }
-       }
-*/
 
+       // TIdemod?
        PrintAndLog("\nNo Known Tags Found!\n");
        if (testRaw=='u' || testRaw=='U'){
                //test unknown tag formats (raw mode)