X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2deb4b6b46ac7210984f5b3a6fc4c45b33ee8aea..7b6e32053373740516833b1a228a0ad01bb14bd2:/client/cmdlfawid.c diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 7f0b9910..cde94555 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -11,10 +11,11 @@ // FSK2a, RF/50, 96 bits (complete) //----------------------------------------------------------------------------- +#include "cmdlfawid.h" + #include #include // sscanf -#include "proxmark3.h" // Definitions, USB controls, etc -#include "cmdlfawid.h" +#include "comms.h" // Definitions, USB controls, etc #include "ui.h" // PrintAndLog #include "cmdparser.h" // CmdsParse, CmdsHelp #include "lfdemod.h" // parityTest + @@ -88,8 +89,9 @@ int CmdFSKdemodAWID(const char *Cmd) size_t size = getFromGraphBuf(BitStream); if (size==0) return 0; + int waveIdx = 0; //get binary from fsk wave - int idx = AWIDdemodFSK(BitStream, &size); + int idx = AWIDdemodFSK(BitStream, &size, &waveIdx); if (idx<=0){ if (g_debugMode){ if (idx == -1) @@ -126,7 +128,7 @@ int CmdFSKdemodAWID(const char *Cmd) uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32); uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32); setDemodBuf(BitStream,96,idx); - setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock)); + setClockGrid(50, waveIdx + (idx*50)); size = removeParity(BitStream, idx+8, 4, 1, 88); if (size != 66){