FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field...

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 78e1f98869b919c97f09ee5cbd0bdd550ebc8d79..97dcf0bae25a5c2ab26aa3f82ac50cd2c351e3b7 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>

-#include "proxusb.h"
+#include "proxmark3.h"

 #include "data.h"
 #include "graph.h"
 #include "ui.h"
 #include "data.h"
 #include "graph.h"
 #include "ui.h"


@@ -20,10 +20,14 @@
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "cmdlf.h"

+#include "cmdlfawid26.h"

 #include "cmdlfhid.h"
 #include "cmdlfti.h"
 #include "cmdlfem4x.h"
 #include "cmdlfhitag.h"
 #include "cmdlfhid.h"
 #include "cmdlfti.h"
 #include "cmdlfem4x.h"
 #include "cmdlfhitag.h"

+#include "cmdlft55xx.h"
+#include "cmdlfpcf7931.h"
+#include "cmdlfio.h"

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -35,7 +39,7 @@ int CmdLFCommandRead(const char *Cmd)
   dummy[0]= ' ';
 
   UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};
   dummy[0]= ' ';
 
   UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};

-  sscanf(Cmd, "%i %i %i %s %s", &c.arg[0], &c.arg[1], &c.arg[2], (char *) &c.d.asBytes,(char *) &dummy+1);
+  sscanf(Cmd, "%"lli" %"lli" %"lli" %s %s", &c.arg[0], &c.arg[1], &c.arg[2],(char*)(&c.d.asBytes),(char*)(&dummy+1));

   // in case they specified 'h'
   strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);
   SendCommand(&c);
   // in case they specified 'h'
   strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);
   SendCommand(&c);


@@ -125,7 +129,7 @@ int CmdFlexdemod(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
   RepaintGraphWindow();
   return 0;
 }

-
+  

 int CmdIndalaDemod(const char *Cmd)
 {
   // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
 int CmdIndalaDemod(const char *Cmd)
 {
   // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID


@@ -265,7 +269,7 @@ int CmdIndalaDemod(const char *Cmd)
     PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
   }
 
     PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
   }
 

-  // Checking UID against next occurences
+  // Checking UID against next occurrences

   for (; i + uidlen <= rawbit;) {
     int failed = 0;
     for (bit = 0; bit < uidlen; bit++) {
   for (; i + uidlen <= rawbit;) {
     int failed = 0;
     for (bit = 0; bit < uidlen; bit++) {


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

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

 
   // Remodulating for tag cloning
   GraphTraceLen = 32*uidlen;
 
   // Remodulating for tag cloning
   GraphTraceLen = 32*uidlen;


@@ -359,12 +363,17 @@ int CmdLFRead(const char *Cmd)
     c.arg[0] = 1;
   } else if (*Cmd == '\0') {
     c.arg[0] = 0;
     c.arg[0] = 1;
   } else if (*Cmd == '\0') {
     c.arg[0] = 0;

-  } else {
-    PrintAndLog("use 'read' or 'read h'");
+  } else if (sscanf(Cmd, "%"lli, &c.arg[0]) != 1) {
+    PrintAndLog("Samples 1: 'lf read'");
+       PrintAndLog("        2: 'lf read h'");
+       PrintAndLog("        3: 'lf read <divisor>'");

     return 0;
   }
   SendCommand(&c);
     return 0;
   }
   SendCommand(&c);

-  WaitForResponse(CMD_ACK);
+  WaitForResponse(CMD_ACK,NULL);
+  
+  // load samples 
+  CmdSamples("");

   return 0;
 }
 
   return 0;
 }
 


@@ -385,7 +394,8 @@ static void ChkBitstream(const char *str)
 
 int CmdLFSim(const char *Cmd)
 {
 
 int CmdLFSim(const char *Cmd)
 {

-  int i;
+  int i,j;
+  

   static int gap;
 
   sscanf(Cmd, "%i", &gap);
   static int gap;
 
   sscanf(Cmd, "%i", &gap);


@@ -393,18 +403,19 @@ int CmdLFSim(const char *Cmd)
   /* convert to bitstream if necessary */
   ChkBitstream(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}};
     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);
       c.d.asBytes[j] = GraphBuffer[i+j];
     }
     SendCommand(&c);

-    WaitForResponse(CMD_ACK);
+    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;
   UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
   SendCommand(&c);
   return 0;


@@ -446,6 +457,40 @@ 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 == 0) {
+    // empty
+  } else 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("use 'snoop' or 'snoop {l,h} [trigger threshold]', or 'snoop <divisor> [trigger threshold]'");
+    return 0;
+  }
+  SendCommand(&c);
+  WaitForResponse(CMD_ACK,NULL);
+  
+  size_t BUFF_SIZE = 8000;
+  uint8_t data[BUFF_SIZE];
+
+  GetFromBigBuf(data,BUFF_SIZE,3560);  //3560 -- should be offset..
+  WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+       for (int j = 0; j < BUFF_SIZE; j++) {
+               GraphBuffer[j] = ((int)data[j]);
+       }
+       GraphTraceLen = BUFF_SIZE;
+  
+  return 0;
+}
+

 int CmdVchDemod(const char *Cmd)
 {
   // Is this the entire sync pattern, or does this also include some
 int CmdVchDemod(const char *Cmd)
 {
   // Is this the entire sync pattern, or does this also include some


@@ -526,18 +571,28 @@ 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)"},
 {
   {"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... }"},
+

   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},

-  {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},

   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},

-  {"indalaclone", CmdIndalaClone,     1, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
-  {"read",        CmdLFRead,          0, "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},
+  {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (UID in HEX)(option 'l' for 224 UID"},
+  {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
+
+  
+  {"read",        CmdLFRead,          0, "['h' or <divisor>] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134, alternatively: f=12MHz/(divisor+1))"},

   {"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"},

-  {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
-  {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
-  {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
+  {"snoop",       CmdLFSnoop,         0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
+  
+  {"awid26",        CmdLFAWID26,        1, "{ AWID26 tags }"},
+  {"em4x",        CmdLFEM4X,          1, "{ EM4X tags }"},      
+  {"hid",         CmdLFHID,           1, "{ HID tags }"},
+  {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders }"},
+  {"io",         CmdLFIO,                1, "{ ioProx tags }"},
+  {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 tags }"},
+  {"ti",          CmdLFTI,            1, "{ TI tags }"},
+  {"t55xx",       CmdLFT55XX,         1, "{ T55xx tags }"},
+ 

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };