X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b952b29ebba638c59ab03621c0f04fca7ec602c..1c70664ae75332e17466e8d7bcba718e406da36c:/client/cmdlfawid.c diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 648966f3..141ba172 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -8,11 +8,13 @@ // the license. //----------------------------------------------------------------------------- // Low frequency AWID26 commands +// FSK2a, RF/50, 96 bits (complete) //----------------------------------------------------------------------------- #include #include // sscanf #include "proxmark3.h" // Definitions, USB controls, etc +#include "cmdlfawid.h" #include "ui.h" // PrintAndLog #include "cmdparser.h" // CmdsParse, CmdsHelp #include "lfdemod.h" // parityTest + @@ -86,8 +88,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) @@ -124,6 +127,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(50, waveIdx + (idx*50)); size = removeParity(BitStream, idx+8, 4, 1, 88); if (size != 66){