BUG: 'hf mf mifare'

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 892f70a903fa8e921a4a0f2368ca9597c74a78ae..fd8e214821b9985ead1a4cb692b10243ff10af5c 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -5,16 +5,16 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Low frequency HID commands
+// Low frequency HID commands (known)

 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 #include <string.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 #include <string.h>

+#include "cmdlfhid.h"

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

-//#include "cmdlfhid.h"

 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
 #include "lfdemod.h" // for HIDdemodFSK
 
 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
 #include "lfdemod.h" // for HIDdemodFSK
 


@@ -32,7 +32,8 @@ int CmdFSKdemodHID(const char *Cmd)
   size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return 0;
   //get binary from fsk wave
   size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return 0;
   //get binary from fsk wave

-  int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
+  int waveIdx = 0;
+  int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo, &waveIdx);

   if (idx<0){
     if (g_debugMode){
       if (idx==-1){
   if (idx<0){
     if (g_debugMode){
       if (idx==-1){


@@ -99,6 +100,7 @@ int CmdFSKdemodHID(const char *Cmd)
       (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
   }
   setDemodBuf(BitStream,BitLen,idx);
       (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
   }
   setDemodBuf(BitStream,BitLen,idx);

+  setClockGrid(50, waveIdx + (idx*50));

   if (g_debugMode){ 
     PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
     printDemodBuff();
   if (g_debugMode){ 
     PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
     printDemodBuff();