]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdlf.c
Inclusion of unused oem variable
[proxmark3-svn] / client / cmdlf.c
index ebf8242baaa6e6c8aba2abad0b284f587c2f3c15..0ab24dba5338a38a15c6ace04d77f77c52bcbf10 100644 (file)
@@ -7,37 +7,15 @@
 //-----------------------------------------------------------------------------
 // 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 "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");
-       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)");
@@ -89,43 +67,43 @@ int usage_lf_config(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) {
-  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) {
-  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]");
@@ -192,7 +170,6 @@ int CmdLFCommandRead(const char *Cmd)
        if (errors) return usage_lf_cmdread();
        
        // in case they specified 'H'
-       // added to the end..  
        strcpy((char *)&c.d.asBytes + strLength, dummy);
 
        clearCommandBuffer();
@@ -505,22 +482,22 @@ int CmdIndalaClone(const char *Cmd)
     c.arg[1] = uid2;
   }
 
+       clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
 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;
-       int trigger_threshold =-1;//Means no change
+       int trigger_threshold = -1;//Means no change
        uint8_t unsigned_trigg = 0;
 
-       uint8_t cmdp =0;
+       uint8_t cmdp = 0;
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
@@ -563,25 +540,22 @@ int CmdLFSetConfig(const char *Cmd)
                }
                if(errors) break;
        }
-       if(cmdp == 0)
-       {
-               errors = 1;// No args
-       }
+
+       // No args
+       if (cmdp == 0) errors = 1;
 
        //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
-       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));
+       clearCommandBuffer();
        SendCommand(&c);
        return 0;
 }
@@ -760,6 +734,7 @@ int CmdLFfskSim(const char *Cmd)
   UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 
   memcpy(c.d.asBytes, DemodBuffer, size);
+       clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
@@ -768,93 +743,94 @@ int CmdLFfskSim(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
-  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);
-  SendCommand(&c);
-  return 0;
+       //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();
+       SendCommand(&c);
+       return 0;
 }
 
 // by marshmellow - sim psk data given carrier, clock, invert 
@@ -960,6 +936,7 @@ int CmdLFpskSim(const char *Cmd)
   UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
   PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
   memcpy(c.d.asBytes, DemodBuffer, size);
+       clearCommandBuffer();
   SendCommand(&c);
   
   return 0;
@@ -1052,67 +1029,66 @@ int CmdVchDemod(const char *Cmd)
 }
 
 //by marshmellow
-int CmdLFfind(const char *Cmd)
-{
-  int ans = 0;
-  char cmdp = param_getchar(Cmd, 0);
-  char testRaw = param_getchar(Cmd, 1);
-  if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_lf_find();
-
-  if (!offline && (cmdp != '1')){
-       CmdLFRead("s");
-       getSamples("30000",false);
-  } else if (GraphTraceLen < 1000) {
-    PrintAndLog("Data in Graphbuffer was too small.");
-    return 0;
-  }
-  if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
+int CmdLFfind(const char *Cmd) {
+       int ans = 0;
+       char cmdp = param_getchar(Cmd, 0);
+       char testRaw = param_getchar(Cmd, 1);
+       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_lf_find();
+
+       if (!offline && (cmdp != '1')){
+               CmdLFRead("s");
+               getSamples("30000",false);
+       } 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("False Positives ARE possible\n");  
-  PrintAndLog("\nChecking for known tags:\n");
+       PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
+       PrintAndLog("False Positives ARE possible\n");  
+       PrintAndLog("\nChecking for known tags:\n");
 
-  ans=CmdFSKdemodIO("");
-  if (ans>0) {
-    PrintAndLog("\nValid IO Prox ID Found!");
-    return 1;
-  }
+       ans=CmdFSKdemodIO("");
+       if (ans>0) {
+       PrintAndLog("\nValid IO Prox ID Found!");
+       return 1;
+       }
 
-  ans=CmdFSKdemodPyramid("");
-  if (ans>0) {
-    PrintAndLog("\nValid Pyramid 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=CmdFSKdemodParadox("");
+       if (ans>0) {
+       PrintAndLog("\nValid Paradox ID Found!");
+       return 1;
+       }
 
-  ans=CmdFSKdemodAWID("");
-  if (ans>0) {
-    PrintAndLog("\nValid AWID ID Found!");
-    return 1;
-  }
+       ans=CmdFSKdemodAWID("");
+       if (ans>0) {
+       PrintAndLog("\nValid AWID ID Found!");
+       return 1;
+       }
 
-  ans=CmdFSKdemodHID("");
-  if (ans>0) {
-    PrintAndLog("\nValid HID Prox ID Found!");
-    return 1;
-  }
+       ans=CmdFSKdemodHID("");
+       if (ans>0) {
+       PrintAndLog("\nValid HID Prox ID Found!");
+       return 1;
+       }
 
-  ans=CmdAskEM410xDemod("");
-  if (ans>0) {
-    PrintAndLog("\nValid EM410x ID Found!");
-    return 1;
-  }
+       ans=CmdAskEM410xDemod("");
+       if (ans>0) {
+       PrintAndLog("\nValid EM410x ID Found!");
+       return 1;
+       }
 
-  ans=CmdG_Prox_II_Demod("");
-  if (ans>0) {
-    PrintAndLog("\nValid Guardall G-Prox II ID Found!");
-    return 1;
-  }
+       ans=CmdG_Prox_II_Demod("");
+       if (ans>0) {
+       PrintAndLog("\nValid Guardall G-Prox II ID Found!");
+       return 1;
+       }
 
        ans=CmdFDXBdemodBI("");
        if (ans>0) {
@@ -1143,63 +1119,73 @@ int CmdLFfind(const char *Cmd)
                PrintAndLog("\nValid NexWatch ID Found!");
                return 1;
        }
+       ans=CmdLFNedapDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid NEDAP ID Found!");
+               return 1;
+       }
+       // TIdemod?
+       
 
-  PrintAndLog("\nNo Known Tags Found!\n");
-  if (testRaw=='u' || testRaw=='U'){
-    //test unknown tag formats (raw mode)
-    PrintAndLog("\nChecking for Unknown tags:\n");
-    ans=AutoCorrelate(4000, FALSE, FALSE);
+       PrintAndLog("\nNo Known Tags Found!\n");
+       if (testRaw=='u' || testRaw=='U'){
+               //test unknown tag formats (raw mode)
+               PrintAndLog("\nChecking for Unknown tags:\n");
+               ans=AutoCorrelate(4000, FALSE, FALSE);
        
-    if (ans > 0) {
+               if (ans > 0) {
 
-               PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);
+                       PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);
 
-               if ( ans % 8 == 0)  {
-                       int bytes = (ans / 8);
-                       PrintAndLog("Possible %d bytes", bytes);
-                       int blocks = 0;
-                       if ( bytes % 2 == 0) {
-                               blocks = (bytes / 2);   
-                               PrintAndLog("Possible  2 blocks, width %d", blocks);
-                       }
-                       if ( bytes % 4 == 0) {
-                               blocks = (bytes / 4);   
-                               PrintAndLog("Possible  4 blocks, width %d", blocks);
-                       }
-                       if ( bytes % 8 == 0) {
-                               blocks = (bytes / 8);   
-                               PrintAndLog("Possible  8 blocks, width %d", blocks);
+                       if ( ans % 8 == 0)  {
+                               int bytes = (ans / 8);
+                               PrintAndLog("Possible %d bytes", bytes);
+                               int blocks = 0;
+                               if ( bytes % 2 == 0) {
+                                       blocks = (bytes / 2);   
+                                       PrintAndLog("Possible  2 blocks, width %d", blocks);
+                               }
+                               if ( bytes % 4 == 0) {
+                                       blocks = (bytes / 4);   
+                                       PrintAndLog("Possible  4 blocks, width %d", blocks);
+                               }
+                               if ( bytes % 8 == 0) {
+                                       blocks = (bytes / 8);   
+                                       PrintAndLog("Possible  8 blocks, width %d", blocks);
+                               }
+                               if ( bytes % 16 == 0) {
+                                       blocks = (bytes / 16);  
+                                       PrintAndLog("Possible 16 blocks, width %d", blocks);
+                               }
                        }
-                       if ( bytes % 16 == 0) {
-                               blocks = (bytes / 16);  
-                               PrintAndLog("Possible 16 blocks, width %d", blocks);
+               }
+
+               ans=GetFskClock("",FALSE,FALSE); 
+               if (ans != 0){ //fsk
+                       ans=FSKrawDemod("",TRUE);
+                       if (ans>0) {
+                               PrintAndLog("\nUnknown FSK Modulated Tag Found!");
+                               return 1;
                        }
                }
-       }
-       ans=GetFskClock("",FALSE,FALSE); 
-    if (ans != 0){ //fsk
-               ans=FSKrawDemod("",TRUE);
+               bool st = TRUE;
+               ans=ASKDemod_ext("0 0 0",TRUE,FALSE,1,&st);
                if (ans>0) {
-                       PrintAndLog("\nUnknown FSK Modulated Tag Found!");
+                 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'");
+                 return 1;
+               }
+               
+               ans=CmdPSK1rawDemod("");
+               if (ans>0) {
+                       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");
                        return 1;
                }
-    }
-       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'");
-      return 1;
-    }
-    ans=CmdPSK1rawDemod("");
-    if (ans>0) {
-               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");
-               return 1;
-    }
-    PrintAndLog("\nNo Data Found!\n");
-  }
-  return 0;
+               PrintAndLog("\nNo Data Found!\n");
+       }
+       return 0;
 }
 
 static command_t CommandTable[] = 
@@ -1207,15 +1193,18 @@ static command_t CommandTable[] =
        {"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... }"},
-       {"io",            CmdLFIO,                1, "{ IOPROX RFIDs... }"},
+       {"io",                  CmdLFIO,                        1, "{ IOPROX RFIDs... }"},
+       {"nedap",               CmdLFNedap,                     1, "{ NEDAP RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
+       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
+       {"pyramid",             CmdLFPyramid,       1, "{ Farpointe/Pyramid 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"},
-
        {"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)"},
@@ -1227,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)"},
-       {"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}
 };
 
-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;
 }
Impressum, Datenschutz