Merge pull request #9 from Proxmark/master

[proxmark3-svn] / client / cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 648966f3e5592258bf5a3f4e107c9ac5a76e3c90..cde945554c440b0e38c401b232bdf12d79925bdc 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -8,11 +8,14 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency AWID26 commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency AWID26 commands

+// FSK2a, RF/50, 96 bits (complete)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+#include "cmdlfawid.h"
+

 #include <string.h>
 #include <stdio.h>      // sscanf
 #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 "lfdemod.h"    // parityTest +
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "lfdemod.h"    // parityTest +


@@ -86,8 +89,9 @@ int CmdFSKdemodAWID(const char *Cmd)
        size_t size = getFromGraphBuf(BitStream);
        if (size==0) return 0;
 
        size_t size = getFromGraphBuf(BitStream);
        if (size==0) return 0;
 

+       int waveIdx = 0;

        //get binary from fsk wave
        //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)
        if (idx<=0){
                if (g_debugMode){
                        if (idx == -1)


@@ -124,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);
        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){
 
        size = removeParity(BitStream, idx+8, 4, 1, 88);
        if (size != 66){