CHG: moved includes into header file where it belong

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 3f89e6efddb030e2ab7cb36afd96a7772dff7b4f..0ab24dba5338a38a15c6ace04d77f77c52bcbf10 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -7,37 +7,15 @@
 //-----------------------------------------------------------------------------
 // Low frequency commands
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Low frequency commands
 //-----------------------------------------------------------------------------

-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include "proxmark3.h"
-#include "data.h"
-#include "graph.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmdmain.h"
-#include "cmddata.h"
-#include "util.h"

 #include "cmdlf.h"
 #include "cmdlf.h"

-#include "cmdlfhid.h"
-#include "cmdlfawid.h"
-#include "cmdlfti.h"
-#include "cmdlfem4x.h"
-#include "cmdlfhitag.h"
-#include "cmdlft55xx.h"
-#include "cmdlfpcf7931.h"
-#include "cmdlfio.h"
-#include "lfdemod.h"
-#include "cmdlfviking.h"

 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
        PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H]");
        PrintAndLog("Options:        ");
        PrintAndLog("       h             This help");
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
        PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H]");
        PrintAndLog("Options:        ");
        PrintAndLog("       h             This help");

-       PrintAndLog("       H             Freqency High (134 KHz), default is 'Low (125KHz)'");
+       PrintAndLog("       L             Low frequency (125 KHz)");
+       PrintAndLog("       H             High frequency (134 KHz)");

        PrintAndLog("       d <delay>     delay OFF period, (dec)");
        PrintAndLog("       z <zero>      time period ZERO, (dec)");
        PrintAndLog("       o <one>       time period ONE, (dec)");
        PrintAndLog("       d <delay>     delay OFF period, (dec)");
        PrintAndLog("       z <zero>      time period ZERO, (dec)");
        PrintAndLog("       o <one>       time period ONE, (dec)");


@@ -89,43 +67,43 @@ int usage_lf_config(void) {
        return 0;
 }
 int usage_lf_simfsk(void) {
        return 0;
 }
 int usage_lf_simfsk(void) {

-  PrintAndLog("Usage: lf simfsk [c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
-  PrintAndLog("Options:        ");
-  PrintAndLog("       h              This help");
-  PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-  PrintAndLog("       i              invert data");
-  PrintAndLog("       H <fcHigh>     Manually set the larger Field Clock");
-  PrintAndLog("       L <fcLow>      Manually set the smaller Field Clock");
-  //PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
-  PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-  PrintAndLog("\n  NOTE: if you set one clock manually set them all manually");
-  return 0;
+       PrintAndLog("Usage: lf simfsk [c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
+       PrintAndLog("Options:        ");
+       PrintAndLog("       h              This help");
+       PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+       PrintAndLog("       i              invert data");
+       PrintAndLog("       H <fcHigh>     Manually set the larger Field Clock");
+       PrintAndLog("       L <fcLow>      Manually set the smaller Field Clock");
+       //PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
+       PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+       PrintAndLog("\n  NOTE: if you set one clock manually set them all manually");
+       return 0;

 }
 int usage_lf_simask(void) {
 }
 int usage_lf_simask(void) {

-  PrintAndLog("Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
-  PrintAndLog("Options:        ");
-  PrintAndLog("       h              This help");
-  PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-  PrintAndLog("       i              invert data");
-  PrintAndLog("       b              sim ask/biphase");
-  PrintAndLog("       m              sim ask/manchester - Default");
-  PrintAndLog("       r              sim ask/raw");
-  PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
-  PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-  return 0;
+       PrintAndLog("Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
+       PrintAndLog("Options:        ");
+       PrintAndLog("       h              This help");
+       PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+       PrintAndLog("       i              invert data");
+       PrintAndLog("       b              sim ask/biphase");
+       PrintAndLog("       m              sim ask/manchester - Default");
+       PrintAndLog("       r              sim ask/raw");
+       PrintAndLog("       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
+       PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+       return 0;

 }
 int usage_lf_simpsk(void) {
 }
 int usage_lf_simpsk(void) {

-  PrintAndLog("Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
-  PrintAndLog("Options:        ");
-  PrintAndLog("       h              This help");
-  PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-  PrintAndLog("       i              invert data");
-  PrintAndLog("       1              set PSK1 (default)");
-  PrintAndLog("       2              set PSK2");
-  PrintAndLog("       3              set PSK3");
-  PrintAndLog("       r <carrier>    2|4|8 are valid carriers: default = 2");
-  PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-  return 0;
+       PrintAndLog("Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
+       PrintAndLog("Options:        ");
+       PrintAndLog("       h              This help");
+       PrintAndLog("       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+       PrintAndLog("       i              invert data");
+       PrintAndLog("       1              set PSK1 (default)");
+       PrintAndLog("       2              set PSK2");
+       PrintAndLog("       3              set PSK3");
+       PrintAndLog("       r <carrier>    2|4|8 are valid carriers: default = 2");
+       PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+       return 0;

 }
 int usage_lf_find(void){
     PrintAndLog("Usage:  lf search <0|1> [u]");
 }
 int usage_lf_find(void){
     PrintAndLog("Usage:  lf search <0|1> [u]");


@@ -511,16 +489,15 @@ int CmdIndalaClone(const char *Cmd)
 
 int CmdLFSetConfig(const char *Cmd)
 {
 
 int CmdLFSetConfig(const char *Cmd)
 {

-

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

-       int trigger_threshold =-1;//Means no change
+       int trigger_threshold = -1;//Means no change

        uint8_t unsigned_trigg = 0;
 
        uint8_t unsigned_trigg = 0;
 

-       uint8_t cmdp =0;
+       uint8_t cmdp = 0;

        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))


@@ -563,22 +540,18 @@ int CmdLFSetConfig(const char *Cmd)
                }
                if(errors) break;
        }
                }
                if(errors) break;
        }

-       if(cmdp == 0)
-       {
-               errors = 1;// No args
-       }
+
+       // No args
+       if (cmdp == 0) errors = 1;

 
        //Validations
 
        //Validations

-       if(errors)
-       {
-               return usage_lf_config();
-       }
+       if (errors) 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 >> 4) bps = 8;
+
+       sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };

 
 

-       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));
        //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));


@@ -770,94 +743,94 @@ int CmdLFfskSim(const char *Cmd)
 // - allow pull data from DemodBuffer
 int CmdLFaskSim(const char *Cmd)
 {
 // - allow pull data from DemodBuffer
 int CmdLFaskSim(const char *Cmd)
 {

-  //autodetect clock from Graphbuffer if using demod buffer
+       //autodetect clock from Graphbuffer if using demod buffer

        // needs 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 clk=0, invert=0;
-  bool errors = FALSE;
-  char hexData[32] = {0x00}; 
-  uint8_t data[255]= {0x00}; // store entered hex data
-  int dataLen = 0;
-  uint8_t cmdp = 0;
-  while(param_getchar(Cmd, cmdp) != 0x00)
-  {
-    switch(param_getchar(Cmd, cmdp))
-    {
-    case 'h':
-      return usage_lf_simask();
-    case 'i':
-      invert = 1;
-      cmdp++;
-      break;
-    case 'c':
-      errors |= param_getdec(Cmd,cmdp+1,&clk);
-      cmdp+=2;
-      break;
-    case 'b':
-      encoding=2; //biphase
-      cmdp++;
-      break;
-    case 'm':
-      encoding=1;
-      cmdp++;
-      break;
-    case 'r':
-      encoding=0;
-      cmdp++;
-      break;
-    case 's':
-      separator=1;
-      cmdp++;
-      break;
-    case 'd':
-      dataLen = param_getstr(Cmd, cmdp+1, hexData);
-      if (dataLen==0) {
-        errors=TRUE; 
-      } else {
-        dataLen = hextobinarray((char *)data, hexData);
-      }
-      if (dataLen==0) errors=TRUE; 
-      if (errors) PrintAndLog ("Error getting hex data, datalen: %d",dataLen);
-        cmdp+=2;
-      break;
-    default:
-      PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-      errors = TRUE;
-      break;
-    }
-    if(errors) break;
-  }
-  if(cmdp == 0 && DemodBufferLen == 0)
-  {
-    errors = TRUE;// No args
-  }
+       uint8_t encoding = 1, separator = 0, clk=0, invert=0;
+       bool errors = FALSE;
+       char hexData[32] = {0x00}; 
+       uint8_t data[255]= {0x00}; // store entered hex data
+       int dataLen = 0;
+       uint8_t cmdp = 0;
+       
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+                       case 'h': return usage_lf_simask();
+                       case 'i':
+                               invert = 1;
+                               cmdp++;
+                               break;
+                       case 'c':
+                               errors |= param_getdec(Cmd,cmdp+1,&clk);
+                               cmdp+=2;
+                               break;
+                       case 'b':
+                               encoding=2; //biphase
+                               cmdp++;
+                               break;
+                       case 'm':
+                               encoding=1;
+                               cmdp++;
+                               break;
+                       case 'r':
+                               encoding=0;
+                               cmdp++;
+                               break;
+                       case 's':
+                               separator=1;
+                               cmdp++;
+                               break;
+                       case 'd':
+                               dataLen = param_getstr(Cmd, cmdp+1, hexData);
+                               if (dataLen==0)
+                                       errors = TRUE; 
+                               else
+                                       dataLen = hextobinarray((char *)data, hexData);
+                               
+                               if (dataLen==0) errors = TRUE; 
+                               if (errors) PrintAndLog ("Error getting hex data, datalen: %d", dataLen);
+                               cmdp+=2;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = TRUE;
+                               break;
+               }
+               if(errors) break;
+       }
+  
+       if(cmdp == 0 && DemodBufferLen == 0)
+               errors = TRUE;// No args

 
 

-  //Validations
-  if(errors)
-  {
-    return usage_lf_simask();
-  }
-  if (dataLen == 0){ //using DemodBuffer
-    if (clk == 0) clk = GetAskClock("0", false, false);
-  } else {
-    setDemodBuf(data, dataLen, 0);
-  }
-  if (clk == 0) clk = 64;
-  if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
-  uint16_t arg1, arg2;
-  size_t size=DemodBufferLen;
-  arg1 = clk << 8 | encoding;
-  arg2 = invert << 8 | separator;
-  if (size > USB_CMD_DATA_SIZE) {
-    PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-    size = USB_CMD_DATA_SIZE;
-  }
-  UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-  PrintAndLog("preparing to sim ask data: %d bits", size);
-  memcpy(c.d.asBytes, DemodBuffer, size);
+       //Validations
+       if(errors) return usage_lf_simask();
+       
+       if (dataLen == 0){ //using DemodBuffer
+               if (clk == 0) 
+                       clk = GetAskClock("0", false, false);
+       } else {
+               setDemodBuf(data, dataLen, 0);
+       }
+       if (clk == 0) clk = 64;
+       if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
+       
+       size_t size = DemodBufferLen;
+
+       if (size > USB_CMD_DATA_SIZE) {
+               PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+               size = USB_CMD_DATA_SIZE;
+       }
+       
+       PrintAndLog("preparing to sim ask data: %d bits", size);        
+
+       uint16_t arg1, arg2;    
+       arg1 = clk << 8 | encoding;
+       arg2 = invert << 8 | separator;
+
+       UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+       memcpy(c.d.asBytes, DemodBuffer, size);

        clearCommandBuffer();
        clearCommandBuffer();

-  SendCommand(&c);
-  return 0;
+       SendCommand(&c);
+       return 0;

 }
 
 // by marshmellow - sim psk data given carrier, clock, invert 
 }
 
 // by marshmellow - sim psk data given carrier, clock, invert 


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

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

        // TIdemod?
        
 
        // TIdemod?
        
 


@@ -1190,8 +1168,8 @@ int CmdLFfind(const char *Cmd) {
                                return 1;
                        }
                }
                                return 1;
                        }
                }

-
-               ans=ASKDemod("0 0 0",TRUE,FALSE,1);
+               bool st = TRUE;
+               ans=ASKDemod_ext("0 0 0",TRUE,FALSE,1,&st);

                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'");


@@ -1215,15 +1193,18 @@ static command_t CommandTable[] =
        {"help",        CmdHelp,            1, "This help"},
        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
        {"help",        CmdHelp,            1, "This help"},
        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},

+       {"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},

        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
        {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},

-       {"io",            CmdLFIO,                1, "{ IOPROX RFIDs... }"},
+       {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
+       {"nedap",               CmdLFNedap,                     1, "{ NEDAP RFIDs... }"},

        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},

+       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
+       {"pyramid",             CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},       

        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
        {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},

-       {"t55xx",       CmdLFT55XX,         1, "{ T55X7 RFIDs... }"},
+       {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},

        {"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"viking",      CmdLFViking,        1, "{ Viking 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"},
        {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
        {"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)"},


@@ -1235,19 +1216,18 @@ static command_t CommandTable[] =
        {"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)"},
        {"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)"},

-       {"snoop",       CmdLFSnoop,         0, "Snoop LF"},
+       {"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}
 };
 

-int CmdLF(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0; 
+int CmdLF(const char *Cmd) {
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0; 

 }
 
 }
 

-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd) {
+       CmdsHelp(CommandTable);
+       return 0;

 }
 }