updates to lf t55xx commands

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 5d841ae12ace3fd60ff02c5611f73fb2a27a2a89..4e103f1ad468e5555916330603c8758566f78fbf 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

-//#include "proxusb.h"

 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"


@@ -18,7 +17,7 @@
 #include "cmdlfhid.h"
 
 static int CmdHelp(const char *Cmd);
 #include "cmdlfhid.h"
 
 static int CmdHelp(const char *Cmd);

-
+/*

 int CmdHIDDemod(const char *Cmd)
 {
   if (GraphTraceLen < 4800) {
 int CmdHIDDemod(const char *Cmd)
 {
   if (GraphTraceLen < 4800) {


@@ -37,12 +36,12 @@ int CmdHIDDemod(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
   RepaintGraphWindow();
   return 0;
 }

-
+*/

 int CmdHIDDemodFSK(const char *Cmd)
 {
   int findone=0;
 int CmdHIDDemodFSK(const char *Cmd)
 {
   int findone=0;

+       if(Cmd[0]=='1') findone=1;

   UsbCommand c={CMD_HID_DEMOD_FSK};
   UsbCommand c={CMD_HID_DEMOD_FSK};

-  if(Cmd[0]=='1') findone=1;

   c.arg[0]=findone;
   SendCommand(&c);
   return 0;
   c.arg[0]=findone;
   SendCommand(&c);
   return 0;


@@ -59,6 +58,7 @@ int CmdHIDSim(const char *Cmd)
   }
 
   PrintAndLog("Emulating tag with ID %x%16x", hi, lo);
   }
 
   PrintAndLog("Emulating tag with ID %x%16x", hi, lo);

+  PrintAndLog("Press pm3-button to abort simulation");

 
   UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
   SendCommand(&c);
 
   UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
   SendCommand(&c);


@@ -106,7 +106,7 @@ int CmdHIDClone(const char *Cmd)
 static command_t CommandTable[] = 
 {
   {"help",      CmdHelp,        1, "This help"},
 static command_t CommandTable[] = 
 {
   {"help",      CmdHelp,        1, "This help"},

-  {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
+  //{"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},

   {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
   {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
   {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
   {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
   {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
   {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},