Added a visa2000 trace.

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 63e8a2b5012dbde937055476ae2e1de23301036f..e1cb1bdf865c08dc33f3123d29a6fac10d60a87d 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -294,12 +294,11 @@ int CmdIndalaDemod(const char *Cmd)
                        count = 0;
                }
        }
                        count = 0;
                }
        }

+       if ( rawbit<1 ) return 0;

 
 

-       if ( rawbit>0 ){
+       if (g_debugMode) {

                PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
                PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
                PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
                PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);

-       } else {
-               return 0;

        }
 
        // Finding the start of a UID
        }
 
        // Finding the start of a UID


@@ -327,15 +326,14 @@ int CmdIndalaDemod(const char *Cmd)
        }
   
        if (start == rawbit - uidlen + 1) {
        }
   
        if (start == rawbit - uidlen + 1) {

-               PrintAndLog("nothing to wait for");
+               if (g_debugMode) PrintAndLog("nothing to wait for");

                return 0;
        }
 
        // Inverting signal if needed
        if (first == 1) {
                return 0;
        }
 
        // Inverting signal if needed
        if (first == 1) {

-               for (i = start; i < rawbit; i++) {
+               for (i = start; i < rawbit; i++)

                        rawbits[i] = !rawbits[i];
                        rawbits[i] = !rawbits[i];

-               }

        }
 
        // Dumping UID
        }
 
        // Dumping UID


@@ -414,7 +412,7 @@ int CmdIndalaDemod(const char *Cmd)
                times += 1;
        }
 
                times += 1;
        }
 

-       PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
+       if (g_debugMode) PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);

 
        // Remodulating for tag cloning
        // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
 
        // Remodulating for tag cloning
        // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 


@@ -1104,6 +1102,16 @@ int CmdLFfind(const char *Cmd) {
                PrintAndLog("\nValid Visa2000 ID Found!");
                return 1;
        }
                PrintAndLog("\nValid Visa2000 ID Found!");
                return 1;
        }

+       ans=CmdNoralsyDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Noralsy ID Found!");
+               return 1;
+       }
+       ans=CmdPrescoDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Presco ID Found!");
+               return 1;
+       }

        // TIdemod?
        
 
        // TIdemod?
        
 


@@ -1171,6 +1179,7 @@ int CmdLFfind(const char *Cmd) {
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},

+       {"animal",      CmdLFFdx,           1, "{ Animal RFIDs... }"},

        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
        {"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},
        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
        {"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},


@@ -1178,8 +1187,9 @@ static command_t CommandTable[] =
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
 //     {"indala",              CmdLFIndala,            1, "{ Indala RFIDs... }"},
        {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
 //     {"indala",              CmdLFIndala,            1, "{ Indala RFIDs... }"},
        {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},

-       {"jablotron",   CmdLFJablotron,         1, "{ JABLOTRON RFIDs... }"},
-       {"nedap",               CmdLFNedap,                     1, "{ NEDAP RFIDs... }"},
+       {"jablotron",   CmdLFJablotron,         1, "{ Jablotron RFIDs... }"},
+       {"nedap",               CmdLFNedap,                     1, "{ Nedap RFIDs... }"},
+       {"noralsy",             CmdLFNoralsy,           1, "{ Noralsy RFIDs... }"},     

        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
        {"pyramid",             CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},       
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
        {"pyramid",             CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},