Added a lf acquisition-mode which can do decimation and quantization, in order to...

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index d9fe5fa9e1af8be96890d45c049da59546b7da53..e3361cb50b3b33e38aebd540dbe505405d543173 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -19,6 +19,7 @@
 #include "cmdparser.h"
 #include "cmdmain.h"
 #include "cmddata.h"
+#include "util.h"
 #include "cmdlf.h"
 #include "cmdlfhid.h"
 #include "cmdlfti.h"
@@ -110,9 +111,9 @@ int CmdFlexdemod(const char *Cmd)
   i = 0;
   int phase = 0;
   for (bit = 0; bit < 64; bit++) {
-
+       
                phase = (bits[bit] == 0) ? 0 : 1;
-
+               
     int j;
     for (j = 0; j < 32; j++) {
       GraphBuffer[i++] = phase;
@@ -123,7 +124,7 @@ int CmdFlexdemod(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
-
+  
 int CmdIndalaDemod(const char *Cmd)
 {
   // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
@@ -167,7 +168,7 @@ int CmdIndalaDemod(const char *Cmd)
       count = 0;
     }
   }
-
+  
   if (rawbit>0){
     PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
     PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
@@ -198,7 +199,7 @@ int CmdIndalaDemod(const char *Cmd)
       break;
     }
   }
-
+  
   if (start == rawbit - uidlen + 1) {
     PrintAndLog("nothing to wait for");
     return 0;
@@ -217,7 +218,7 @@ int CmdIndalaDemod(const char *Cmd)
   int bit;
   i = start;
   int times = 0;
-
+       
   if (uidlen > rawbit) {
     PrintAndLog("Warning: not enough raw bits to get a full UID");
     for (bit = 0; bit < rawbit; bit++) {
@@ -235,12 +236,12 @@ int CmdIndalaDemod(const char *Cmd)
     }
     times = 1;
   }
-
+  
   //convert UID to HEX
   uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
   int idx;
        uid1 = uid2 = 0;
-
+       
   if (uidlen==64){
     for( idx=0; idx<64; idx++) {
         if (showbits[idx] == '0') {
@@ -249,7 +250,7 @@ int CmdIndalaDemod(const char *Cmd)
         } else {
         uid1=(uid1<<1)|(uid2>>31);
         uid2=(uid2<<1)|1;
-        }
+        } 
       }
     PrintAndLog("UID=%s (%x%08x)", showbits, uid1, uid2);
   }
@@ -263,10 +264,10 @@ int CmdIndalaDemod(const char *Cmd)
         uid4=(uid4<<1)|(uid5>>31);
         uid5=(uid5<<1)|(uid6>>31);
         uid6=(uid6<<1)|(uid7>>31);
-
-                       if (showbits[idx] == '0')
+                       
+                       if (showbits[idx] == '0') 
                                uid7 = (uid7<<1) | 0;
-                       else
+                       else 
                                uid7 = (uid7<<1) | 1;
       }
     PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
@@ -291,7 +292,7 @@ int CmdIndalaDemod(const char *Cmd)
   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)
+       // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
        // since this changes graphbuffer data.
   GraphTraceLen = 32*uidlen;
   i = 0;
@@ -380,10 +381,8 @@ static void ChkBitstream(const char *str)
   int i;
 
   /* convert to bitstream if necessary */
-  for (i = 0; i < (int)(GraphTraceLen / 2); i++)
-  {
-    if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0)
-    {
+       for (i = 0; i < (int)(GraphTraceLen / 2); i++){
+               if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
       CmdBitstream(str);
       break;
     }
@@ -392,7 +391,7 @@ static void ChkBitstream(const char *str)
 
 int CmdLFSim(const char *Cmd)
 {
-  int i;
+       int i,j;
   static int gap;
 
   sscanf(Cmd, "%i", &gap);
@@ -400,18 +399,20 @@ int CmdLFSim(const char *Cmd)
   /* convert to bitstream if necessary */
   ChkBitstream(Cmd);
 
-  PrintAndLog("Sending data, please wait...");
-  for (i = 0; i < GraphTraceLen; i += 48) {
+       printf("Sending [%d bytes]", GraphTraceLen);
+       for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
     UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
-    int j;
-    for (j = 0; j < 48; j++) {
+
+               for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
       c.d.asBytes[j] = GraphBuffer[i+j];
     }
     SendCommand(&c);
     WaitForResponse(CMD_ACK,NULL);
+               printf(".");
   }
 
-  PrintAndLog("Starting simulator...");
+       printf("\n");
+       PrintAndLog("Starting to simulate");
   UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
   SendCommand(&c);
   return 0;
@@ -554,17 +555,30 @@ int CmdVchDemod(const char *Cmd)
 int CmdLFfind(const char *Cmd)
 {
   int ans=0;
-  if (!offline){
+       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;
+       }
+
+       if (!offline && (cmdp != '1')){
     ans=CmdLFRead("");
     ans=CmdSamples("20000");
+       } else if (GraphTraceLen < 1000) {
+               PrintAndLog("Data in Graphbuffer was too small.");
+               return 0;
   }
-  if (GraphTraceLen<1000) return 0;
+
   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
   PrintAndLog("Checking for known tags:");
-
-  ans=Cmdaskmandemod("");
+  ans=CmdFSKdemodIO("");
   if (ans>0) {
-    PrintAndLog("Valid EM410x ID Found!");
+    PrintAndLog("Valid IO Prox ID Found!");
     return 1;
   }
   ans=CmdFSKdemodHID("");
@@ -572,24 +586,22 @@ int CmdLFfind(const char *Cmd)
     PrintAndLog("Valid HID Prox ID Found!");
     return 1;
   }
-  ans=CmdFSKdemodIO("");
+  //add psk and indala
+  ans=CmdIndalaDecode("0");
   if (ans>0) {
-    PrintAndLog("Valid IO Prox ID Found!");
+    PrintAndLog("Valid Indala ID Found!");
     return 1;
   }
-  //add psk and indala
-  ans=CmdIndalaDecode("");
+  ans=Cmdaskmandemod("");
   if (ans>0) {
-    PrintAndLog("Valid Indala ID Found!");
+    PrintAndLog("Valid EM410x ID Found!");
     return 1;
   }
- // ans=CmdIndalaDemod("224");
- // if (ans>0) return 1;
   PrintAndLog("No Known Tags Found!\n");
   return 0;
 }
 
-static command_t CommandTable[] =
+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)"},
@@ -616,7 +628,7 @@ static command_t CommandTable[] =
 int CmdLF(const char *Cmd)
 {
   CmdsParse(CommandTable, Cmd);
-  return 0;
+  return 0; 
 }
 
 int CmdHelp(const char *Cmd)