Merge branch 'master' into topaz

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index a52e142380f4c41505615b917a33ad68f9d02768..edf029325ddbe8e353197cdbc667681e14acadc2 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -1072,11 +1072,24 @@ int CmdLFfind(const char *Cmd)
                return 1;
        }
 
+       ans=CmdFDXBdemodBI("");
+       if (ans>0) {
+               PrintAndLog("\nValid FDX-B ID Found!");
+               return 1;
+       }
+
        ans=EM4x50Read("", false);
        if (ans>0) {
                PrintAndLog("\nValid EM4x50 ID Found!");
                return 1;
        }       
+
+       ans=CmdPSKNexWatch("");
+       if (ans>0) {
+               PrintAndLog("\nValid NexWatch ID Found!");
+               return 1;
+       }
+
        PrintAndLog("\nNo Known Tags Found!\n");
        if (testRaw=='u' || testRaw=='U'){
                //test unknown tag formats (raw mode)
@@ -1091,7 +1104,7 @@ int CmdLFfind(const char *Cmd)
                                return 1;
                        }
                }
-               ans=ASKmanDemod("0 0 0",TRUE,FALSE);
+               ans=ASKDemod("0 0 0",TRUE,FALSE,1);
                if (ans>0) {
                        PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
                        PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");