Syntax suger

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index dde05cb3d7b49be0acd14d07f463908cfa7dafff..63e8a2b5012dbde937055476ae2e1de23301036f 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -249,8 +249,9 @@ int CmdFlexdemod(const char *Cmd)
   
 int CmdIndalaDemod(const char *Cmd)
 {
   
 int CmdIndalaDemod(const char *Cmd)
 {

+       // PSK1, Bitrate 32, 
+       

        // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
        // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID

-

        int state = -1;
        int count = 0;
        int i, j;
        int state = -1;
        int count = 0;
        int i, j;


@@ -1012,13 +1013,18 @@ int CmdLFfind(const char *Cmd) {
 
        if (!offline && (cmdp != '1')){
                CmdLFRead("s");
 
        if (!offline && (cmdp != '1')){
                CmdLFRead("s");

-               getSamples("30000",false);
+               getSamples("30000", TRUE);

        } else if (GraphTraceLen < 1000) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
        }
        if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
 
        } else if (GraphTraceLen < 1000) {
                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");
        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");


@@ -1093,6 +1099,11 @@ int CmdLFfind(const char *Cmd) {
                PrintAndLog("\nValid NEDAP ID Found!");
                return 1;
        }
                PrintAndLog("\nValid NEDAP ID Found!");
                return 1;
        }

+       ans=CmdVisa2kDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Visa2000 ID Found!");
+               return 1;
+       }

        // TIdemod?
        
 
        // TIdemod?
        
 


@@ -1165,6 +1176,7 @@ static command_t CommandTable[] =
        {"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
        {"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},
        {"hid",         CmdLFHID,           1, "{ HID 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... }"},
        {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
        {"jablotron",   CmdLFJablotron,         1, "{ JABLOTRON RFIDs... }"},
        {"nedap",               CmdLFNedap,                     1, "{ NEDAP RFIDs... }"},


@@ -1174,6 +1186,7 @@ static command_t CommandTable[] =
        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},
        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},

+       {"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs... }"},

        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},