X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c4809fd411a00e9d0ce2b7ad62dc9a19a9c7a89d..0d2624a0cc13dbe34392da1f8495af6c64a84ddb:/client/cmdlfpyramid.c?ds=inline diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index c7a6cb93..82367720 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -7,11 +7,13 @@ // Low frequency Farpoint / Pyramid tag commands // FSK2a, rf/50, 128 bits (complete) //----------------------------------------------------------------------------- + +#include "cmdlfpyramid.h" + #include <string.h> #include <inttypes.h> #include <stdio.h> -#include "cmdlfpyramid.h" -#include "proxmark3.h" +#include "comms.h" #include "ui.h" #include "util.h" #include "graph.h" @@ -96,8 +98,9 @@ int CmdFSKdemodPyramid(const char *Cmd) size_t size = getFromGraphBuf(BitStream); if (size==0) return 0; + int waveIdx=0; //get binary from fsk wave - int idx = PyramiddemodFSK(BitStream, &size); + int idx = PyramiddemodFSK(BitStream, &size, &waveIdx); if (idx < 0){ if (g_debugMode){ if (idx == -5) @@ -152,7 +155,7 @@ int CmdFSKdemodPyramid(const char *Cmd) uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32); uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32); setDemodBuf(BitStream,128,idx); - setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock)); + setClockGrid(50, waveIdx + (idx*50)); size = removeParity(BitStream, idx+8, 8, 1, 120); if (size != 105){