X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6cd2eef44ba915ffca378435429b3585e7d83797..refs/pull/910/head:/client/cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 060ecb68..cde94555 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -8,14 +8,16 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency AWID26 commands
+// FSK2a, RF/50, 96 bits (complete)
 //-----------------------------------------------------------------------------
 
+#include "cmdlfawid.h"
+
 #include <string.h>
 #include <stdio.h>      // sscanf
-#include "proxmark3.h"  // Definitions, USB controls, etc
+#include "comms.h"      // Definitions, USB controls, etc
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
-#include "cmdlfawid.h"  // AWID function declarations
 #include "lfdemod.h"    // parityTest +
 #include "util.h"       // weigandparity
 #include "protocols.h"  // for T55xx config register definitions
@@ -87,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)
@@ -125,6 +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(50, waveIdx + (idx*50));
 
 	size = removeParity(BitStream, idx+8, 4, 1, 88);
 	if (size != 66){