Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 93a9f58667421d6884397e0d25d8502ee284b6dd..f268eaa23579364430f0e243f18b7441b7e04002 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -356,88 +356,151 @@ int CmdIndalaClone(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-int CmdLFReadUsage()
+int usage_lf_read()

 {
 {

-       PrintAndLog("Usage: lf read [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+       PrintAndLog("Usage: lf read");

        PrintAndLog("Options:        ");
        PrintAndLog("       h            This help");
        PrintAndLog("Options:        ");
        PrintAndLog("       h            This help");

-       PrintAndLog("       H            High frequency (134 KHz). Defaults to 125 KHz");
-       PrintAndLog("       <divisor>    Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
-       PrintAndLog("       b <bps>      Sets resolution of bits per sample. Default (max): 8");
-       PrintAndLog("       d <decim>    Sets decimation. A value of N saves only 1 in N samples. Default: 1");
-       PrintAndLog("       a [0|1]      Averaging - if set, will average the stored sample value when decimating. Default: 1");
+       PrintAndLog("This function takes no arguments. ");
+       PrintAndLog("Use 'lf config' to set parameters.");
+       return 0;
+}
+int usage_lf_snoop()
+{
+       PrintAndLog("Usage: lf snoop");
+       PrintAndLog("Options:        ");
+       PrintAndLog("       h            This help");
+       PrintAndLog("This function takes no arguments. ");
+       PrintAndLog("Use 'lf config' to set parameters.");
+       return 0;
+}
+
+int usage_lf_config()
+{
+       PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+       PrintAndLog("Options:        ");
+       PrintAndLog("       h             This help");
+       PrintAndLog("       L             Low frequency (125 KHz)");
+       PrintAndLog("       H             High frequency (134 KHz)");
+       PrintAndLog("       q <divisor>   Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
+       PrintAndLog("       b <bps>       Sets resolution of bits per sample. Default (max): 8");
+       PrintAndLog("       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
+       PrintAndLog("       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
+       PrintAndLog("       t <threshold> Sets trigger threshold. 0 means no threshold");

        PrintAndLog("Examples:");
        PrintAndLog("Examples:");

-       PrintAndLog("      lf read");
+       PrintAndLog("      lf config b 8 L");

        PrintAndLog("                    Samples at 125KHz, 8bps.");
        PrintAndLog("                    Samples at 125KHz, 8bps.");

-       PrintAndLog("      lf read h b 4 d 3");
+       PrintAndLog("      lf config H b 4 d 3");

        PrintAndLog("                    Samples at 134KHz, averages three samples into one, stored with ");
        PrintAndLog("                    a resolution of 4 bits per sample.");
        PrintAndLog("                    Samples at 134KHz, averages three samples into one, stored with ");
        PrintAndLog("                    a resolution of 4 bits per sample.");

+       PrintAndLog("      lf read");
+       PrintAndLog("                    Performs a read (active field)");
+       PrintAndLog("      lf snoop");
+       PrintAndLog("                    Performs a snoop (no active field)");

        return 0;
 }
        return 0;
 }

-int CmdLFRead(const char *Cmd)
+
+int CmdLFSetConfig(const char *Cmd)

 {
 {

-       uint8_t divisor =  95;//Frequency divisor
-       uint8_t bps = 8; // Bits per sample
-       uint8_t decimation = 1; //How many to keep
-       bool averaging = 1; // Should we use averaging when discarding samples?
+
+       uint8_t divisor =  0;//Frequency divisor
+       uint8_t bps = 0; // Bits per sample
+       uint8_t decimation = 0; //How many to keep
+       bool averaging = 1; // Defaults to true

        bool errors = FALSE;
        bool errors = FALSE;

+       int trigger_threshold =-1;//Means no change
+       uint8_t unsigned_trigg = 0;

 
        uint8_t cmdp =0;
 
        uint8_t cmdp =0;

-       if(param_getchar(Cmd, cmdp) == 'h')
-       {
-               return CmdLFReadUsage();
-       }
-
-       // Divisor
-       if(param_getchar(Cmd, cmdp) == 'H') {
-               divisor = 88;
-               cmdp++;
-       }else if(param_isdec(Cmd,cmdp) )
-       {
-               errors |= param_getdec(Cmd,cmdp, &divisor);
-       }
-       //BPS
-       if(param_getchar(Cmd, cmdp) == 'b') {
-               errors |= param_getdec(Cmd,cmdp+1,&bps);
-               cmdp+=2;
-       }
-       //Decimation
-       if(param_getchar(Cmd, cmdp) == 'd')
+       while(param_getchar(Cmd, cmdp) != 0x00)

        {
        {

-               errors |= param_getdec(Cmd,cmdp+1,&decimation);
-               cmdp+=2;
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+                       return usage_lf_config();
+               case 'H':
+                       divisor = 88;
+                       cmdp++;
+                       break;
+               case 'L':
+                       divisor = 95;
+                       cmdp++;
+                       break;
+               case 'q':
+                       errors |= param_getdec(Cmd,cmdp+1,&divisor);
+                       cmdp+=2;
+                       break;
+               case 't':
+                       errors |= param_getdec(Cmd,cmdp+1,&unsigned_trigg);
+                       cmdp+=2;
+                       if(!errors) trigger_threshold = unsigned_trigg;
+                       break;
+               case 'b':
+                       errors |= param_getdec(Cmd,cmdp+1,&bps);
+                       cmdp+=2;
+                       break;
+               case 'd':
+                       errors |= param_getdec(Cmd,cmdp+1,&decimation);
+                       cmdp+=2;
+                       break;
+               case 'a':
+                       averaging = param_getchar(Cmd,cmdp+1) == '1';
+                       cmdp+=2;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = 1;
+                       break;
+               }
+               if(errors) break;

        }
        }

-       //Averaging
-       if(param_getchar(Cmd, cmdp) == 'a')
+       if(cmdp == 0)

        {
        {

-               averaging = param_getchar(Cmd,cmdp+1) == '1';
-               cmdp+=2;
+               errors = 1;// No args

        }
        }

+

        //Validations
        if(errors)
        {
        //Validations
        if(errors)
        {

-               return CmdLFReadUsage();
+               return usage_lf_config();

        }
        }

-

        //Bps is limited to 8, so fits in lower half of arg1
        //Bps is limited to 8, so fits in lower half of arg1

-       if(bps > 8) bps = 8;
+       if(bps >> 8) bps = 8;
+
+       sample_config config = {
+               decimation,bps,averaging,divisor,trigger_threshold
+       };
+       //Averaging is a flag on high-bit of arg[1]
+       UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG};
+       memcpy(c.d.asBytes,&config,sizeof(sample_config));
+       SendCommand(&c);
+       return 0;
+}

 
 

-       //Feedback
-       PrintAndLog("Sampling config: ");
-       PrintAndLog("   divisor:    %d ", divisor);
-       PrintAndLog("   bps:        %d ", bps);
-       PrintAndLog("   decimation: %d ", decimation);
-       PrintAndLog("   averaging:  %d ", averaging);
-       PrintAndLog("OBS, this is sticky on the device and affects all LF listening operations");
-       PrintAndLog("To reset, issue 'lf read'");
+int CmdLFRead(const char *Cmd)
+{

 
 

+       uint8_t cmdp =0;
+       if(param_getchar(Cmd, cmdp) == 'h')
+       {
+               return usage_lf_read();
+       }

        //And ship it to device
        //And ship it to device

-       //Averaging is a flag on high-bit of arg[1]

        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};

-       c.arg[0] = divisor;
-       c.arg[1] = bps | (averaging << 7) ;
-       c.arg[2] = decimation;
+       SendCommand(&c);
+       WaitForResponse(CMD_ACK,NULL);
+       return 0;
+}

 
 

+int CmdLFSnoop(const char *Cmd)
+{
+       uint8_t cmdp =0;
+       if(param_getchar(Cmd, cmdp) == 'h')
+       {
+               return usage_lf_snoop();
+       }
+
+       UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};

        SendCommand(&c);
        WaitForResponse(CMD_ACK,NULL);
        return 0;
        SendCommand(&c);
        WaitForResponse(CMD_ACK,NULL);
        return 0;


@@ -455,7 +518,7 @@ static void ChkBitstream(const char *str)
     }
   }
 }
     }
   }
 }

-
+//appears to attempt to simulate manchester

 int CmdLFSim(const char *Cmd)
 {
        int i,j;
 int CmdLFSim(const char *Cmd)
 {
        int i,j;


@@ -517,30 +580,6 @@ int CmdLFSimManchester(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-int CmdLFSnoop(const char *Cmd)
-{
-  UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};
-
-  // 'h' means higher-low-frequency, 134 kHz
-  c.arg[0] = 0;
-  c.arg[1] = -1;
-
-       if (*Cmd == 'l') {
-    sscanf(Cmd, "l %"lli, &c.arg[1]);
-  } else if(*Cmd == 'h') {
-    c.arg[0] = 1;
-    sscanf(Cmd, "h %"lli, &c.arg[1]);
-  } else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) {
-               PrintAndLog("usage 1:  snoop");
-               PrintAndLog("      2:  snoop {l,h} [trigger threshold]");
-               PrintAndLog("      3:  snoop <divisor> [trigger threshold]");
-    return 0;
-  }
-
-  SendCommand(&c);
-  WaitForResponse(CMD_ACK,NULL);
-  return 0;
-}

 
 int CmdVchDemod(const char *Cmd)
 {
 
 int CmdVchDemod(const char *Cmd)
 {


@@ -622,49 +661,94 @@ int CmdVchDemod(const char *Cmd)
 int CmdLFfind(const char *Cmd)
 {
   int ans=0;
 int CmdLFfind(const char *Cmd)
 {
   int ans=0;

-       char cmdp = param_getchar(Cmd, 0);
-       
-       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  lf search <0|1>");
-               PrintAndLog("     <use data from Graphbuffer>, if not set, try reading data from tag.");
-               PrintAndLog("");
-               PrintAndLog("    sample: lf search");
-               PrintAndLog("          : lf search 1");
-               return 0;
-       }
+  char cmdp = param_getchar(Cmd, 0);
+  char testRaw = param_getchar(Cmd, 1);
+  if (strlen(Cmd) > 2 || cmdp == 'h' || cmdp == 'H') {
+    PrintAndLog("Usage:  lf search <0|1> [u]");
+    PrintAndLog("     <use data from Graphbuffer> , if not set, try reading data from tag.");
+    PrintAndLog("     [Search for Unknown tags] , if not set, reads only known tags.");
+    PrintAndLog("");
+    PrintAndLog("    sample: lf search     = try reading data from tag & search for known tags");
+    PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
+    PrintAndLog("          : lf search u   = try reading data from tag & search for known and unknown tags");
+    PrintAndLog("          : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");

 
 

-       if (!offline && (cmdp != '1')){
+    return 0;
+  }
+
+  if (!offline && (cmdp != '1')){

     ans=CmdLFRead("");
     ans=CmdSamples("20000");
     ans=CmdLFRead("");
     ans=CmdSamples("20000");

-       } else if (GraphTraceLen < 1000) {
-               PrintAndLog("Data in Graphbuffer was too small.");
-               return 0;
+  } else if (GraphTraceLen < 1000) {
+    PrintAndLog("Data in Graphbuffer was too small.");
+    return 0;

   }
   }

-
+  if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';

   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");

-  PrintAndLog("Checking for known tags:");
+  PrintAndLog("False Positives ARE possible\n");  
+  PrintAndLog("\nChecking for known tags:\n");

   ans=CmdFSKdemodIO("");
   if (ans>0) {
   ans=CmdFSKdemodIO("");
   if (ans>0) {

-    PrintAndLog("Valid IO Prox ID Found!");
+    PrintAndLog("\nValid IO Prox ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodPyramid("");
+  if (ans>0) {
+    PrintAndLog("\nValid Pyramid ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodParadox("");
+  if (ans>0) {
+    PrintAndLog("\nValid Paradox ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodAWID("");
+  if (ans>0) {
+    PrintAndLog("\nValid AWID ID Found!");

     return 1;
   }
   ans=CmdFSKdemodHID("");
   if (ans>0) {
     return 1;
   }
   ans=CmdFSKdemodHID("");
   if (ans>0) {

-    PrintAndLog("Valid HID Prox ID Found!");
+    PrintAndLog("\nValid HID Prox ID Found!");

     return 1;
   }
   //add psk and indala
     return 1;
   }
   //add psk and indala

-  ans=CmdIndalaDecode("0");
+  ans=CmdIndalaDecode("");

   if (ans>0) {
   if (ans>0) {

-    PrintAndLog("Valid Indala ID Found!");
+    PrintAndLog("\nValid Indala ID Found!");

     return 1;
   }
     return 1;
   }

-  ans=Cmdaskmandemod("");
+  ans=CmdAskEM410xDemod("");

   if (ans>0) {
   if (ans>0) {

-    PrintAndLog("Valid EM410x ID Found!");
+    PrintAndLog("\nValid EM410x ID Found!");

     return 1;
   }
     return 1;
   }

-  PrintAndLog("No Known Tags Found!\n");
+  PrintAndLog("\nNo Known Tags Found!\n");
+  if (testRaw=='u' || testRaw=='U'){
+    //test unknown tag formats (raw mode)
+    PrintAndLog("\nChecking for Unknown tags:\n");
+    ans=CmdDetectClockRate("f");
+    if (ans != 0){ //fsk
+      ans=CmdFSKrawdemod("");
+      if (ans>0) {
+        PrintAndLog("\nUnknown FSK Modulated Tag Found!");
+        return 1;
+      }
+    }
+    ans=Cmdaskmandemod("");
+    if (ans>0) {
+      PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
+      return 1;
+    }
+    ans=CmdPSK1rawDemod("");
+    if (ans>0) {
+      PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data psk2rawdemod'");
+      PrintAndLog("\nCould also be PSK3 - [currently not supported]");
+      PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");
+      return 1;
+    }
+    PrintAndLog("\nNo Data Found!\n");
+  }

   return 0;
 }
 
   return 0;
 }
 


@@ -673,13 +757,14 @@ static command_t CommandTable[] =
   {"help",        CmdHelp,            1, "This help"},
   {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
   {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
   {"help",        CmdHelp,            1, "This help"},
   {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
   {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},

+  {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},

   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
   {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
   {"io",                 CmdLFIO,                1, "{ ioProx tags... }"},
   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
   {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
   {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
   {"io",                 CmdLFIO,                1, "{ ioProx tags... }"},
   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
   {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},

-  {"read",        CmdLFRead,          0, "['h' or <divisor>] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134, alternatively: f=12MHz/(divisor+1))"},
-  {"search",      CmdLFfind,          1, "Read and Search for valid known tag (in offline mode it you can load first then search)"},
+  {"read",        CmdLFRead,          0, "Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
+  {"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) - 'u' to search for unknown tags"},

   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
   {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
   {"simman",      CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},
   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
   {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
   {"simman",      CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},