CHG: added some linebreaks for the help output in LF.

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 30c8bb229fa98b6ffe86f73cac00bfcce24b58f3..7c5d273ff175da047df06b0a06af48c67df4f679 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -527,7 +527,8 @@ static void ChkBitstream(const char *str)
     }
   }
 }
     }
   }
 }

-//appears to attempt to simulate manchester
+//Attempt to simulate any wave in buffer (one bit per output sample)
+// converts GraphBuffer to bitstream (based on zero crossings) if needed.

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


@@ -535,11 +536,11 @@ int CmdLFSim(const char *Cmd)
 
   sscanf(Cmd, "%i", &gap);
 
 
   sscanf(Cmd, "%i", &gap);
 

-  /* convert to bitstream if necessary */
+       // convert to bitstream if necessary 

 
   ChkBitstream(Cmd);
 
 
   ChkBitstream(Cmd);
 

-  //can send 512 bits at a time (1 byte sent per bit...)
+       //can send only 512 bits at a time (1 byte sent per bit...)

   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}};
   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}};


@@ -611,8 +612,8 @@ int usage_lf_simpsk(void)
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd)
 {
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd)
 {

-  //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
-  //will need FChigh, FClow, Clock, and bitstream
+       //might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
+       // otherwise will need FChigh, FClow, Clock, and bitstream

   uint8_t fcHigh=0, fcLow=0, clk=0;
   uint8_t invert=0;
   bool errors = FALSE;
   uint8_t fcHigh=0, fcLow=0, clk=0;
   uint8_t invert=0;
   bool errors = FALSE;


@@ -687,6 +688,8 @@ int CmdLFfskSim(const char *Cmd)
   } else {
     setDemodBuf(data, dataLen, 0);
   }
   } else {
     setDemodBuf(data, dataLen, 0);
   }

+
+       //default if not found

   if (clk == 0) clk = 50;
   if (fcHigh == 0) fcHigh = 10;
   if (fcLow == 0) fcLow = 8;
   if (clk == 0) clk = 50;
   if (fcHigh == 0) fcHigh = 10;
   if (fcLow == 0) fcLow = 8;


@@ -711,9 +714,8 @@ int CmdLFfskSim(const char *Cmd)
 int CmdLFaskSim(const char *Cmd)
 {
   //autodetect clock from Graphbuffer if using demod buffer
 int CmdLFaskSim(const char *Cmd)
 {
   //autodetect clock from Graphbuffer if using demod buffer

-  //will need clock, invert, manchester/raw as m or r, separator as s, and bitstream
+       // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream

   uint8_t encoding = 1, separator = 0;
   uint8_t encoding = 1, separator = 0;

-  //char cmdp = Cmd[0], par3='m', par4=0;

   uint8_t clk=0, invert=0;
   bool errors = FALSE;
   char hexData[32] = {0x00}; 
   uint8_t clk=0, invert=0;
   bool errors = FALSE;
   char hexData[32] = {0x00}; 


@@ -918,30 +920,6 @@ int CmdLFSimBidir(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-/* simulate an LF Manchester encoded tag with specified bitstream, clock rate and inter-id gap */
-/*
-int CmdLFSimManchester(const char *Cmd)
-{
-  static int clock, gap;
-  static char data[1024], gapstring[8];
-
-  sscanf(Cmd, "%i %s %i", &clock, &data[0], &gap);
-
-  ClearGraph(0);
-
-  for (int i = 0; i < strlen(data) ; ++i)
-    AppendGraph(0, clock, data[i]- '0');
-
-  CmdManchesterMod("");
-
-  RepaintGraphWindow();
-
-  sprintf(&gapstring[0], "%i", gap);
-  CmdLFSim(gapstring);
-  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


@@ -1037,8 +1015,8 @@ int CmdLFfind(const char *Cmd)
   }
 
   if (!offline && (cmdp != '1')){
   }
 
   if (!offline && (cmdp != '1')){

-    ans=CmdLFRead("");
-    ans=CmdSamples("20000");
+               CmdLFRead("s");
+               getSamples("30000",false);

   } 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;


@@ -1099,6 +1077,18 @@ int CmdLFfind(const char *Cmd)
     return 1;
   }
 
     return 1;
   }
 

+       ans=EM4x50Read("", false);
+       if (ans>0) {
+               PrintAndLog("\nValid EM4x50 ID Found!");
+               return 1;
+       }       
+
+       ans=CmdPSKNexWatch("");
+       if (ans>0) {
+               PrintAndLog("\nValid NexWatch ID Found!");
+               return 1;
+       }
+

   PrintAndLog("\nNo Known Tags Found!\n");
   if (testRaw=='u' || testRaw=='U'){
     //test unknown tag formats (raw mode)
   PrintAndLog("\nNo Known Tags Found!\n");
   if (testRaw=='u' || testRaw=='U'){
     //test unknown tag formats (raw mode)


@@ -1131,20 +1121,18 @@ int CmdLFfind(const char *Cmd)
                        }
                }
        }
                        }
                }
        }

-    ans=GetFskClock("",FALSE,FALSE); //CmdDetectClockRate("F"); //
+               ans=GetFskClock("",FALSE,FALSE); 

     if (ans != 0){ //fsk
     if (ans != 0){ //fsk

-      ans=FSKrawDemod("",FALSE);
+                       ans=FSKrawDemod("",TRUE);

       if (ans>0) {
         PrintAndLog("\nUnknown FSK Modulated Tag Found!");
       if (ans>0) {
         PrintAndLog("\nUnknown FSK Modulated Tag Found!");

-        printDemodBuff();

         return 1;
       }
     }
         return 1;
       }
     }

-    ans=ASKmanDemod("",FALSE,FALSE);
+               ans=ASKDemod("0 0 0",TRUE,FALSE,1);

     if (ans>0) {
       PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
       PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
     if (ans>0) {
       PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
       PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");

-      printDemodBuff();

       return 1;
     }
     ans=CmdPSK1rawDemod("");
       return 1;
     }
     ans=CmdPSK1rawDemod("");


@@ -1152,7 +1140,6 @@ int CmdLFfind(const char *Cmd)
       PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
       PrintAndLog("\nCould also be PSK3 - [currently not supported]");
       PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");
       PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
       PrintAndLog("\nCould also be PSK3 - [currently not supported]");
       PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");

-      printDemodBuff();

       return 1;
     }
     PrintAndLog("\nNo Data Found!\n");
       return 1;
     }
     PrintAndLog("\nNo Data Found!\n");


@@ -1173,19 +1160,18 @@ static command_t CommandTable[] =
 
   {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
  
 
   {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
  

-  {"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)"},
+  {"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"},
   {"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, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
   {"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, "['s' silent] 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"},
+  {"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t- 'u' to search for unknown tags"},

   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},

-  {"simask",      CmdLFaskSim,        0, "[clock] [invert <1|0>] [manchester/raw <'m'|'r'>] [msg separator 's'] [d <hexdata>] -- Simulate LF ASK tag from demodbuffer or input"},
-  {"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] -- Simulate LF FSK tag from demodbuffer or input"},
-  {"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] -- Simulate LF PSK tag from demodbuffer or input"},
+  {"simask",      CmdLFaskSim,        0, "[clock] [invert <1|0>] [manchester/raw <'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
+  {"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
+  {"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},

   {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
   {"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"},
-  {"snoop",       CmdLFSnoop,         0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
+  {"snoop",       CmdLFSnoop,         0, "['l'|'h'|<divisor>] [trigger threshold] -- Snoop LF (l:125khz, h:134khz)"},

   {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
   {NULL, NULL, 0, NULL}
 };
   {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
   {NULL, NULL, 0, NULL}
 };