X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cf4640b973d72d184d5a782cb63379e02c53c5bc..c4809fd411a00e9d0ce2b7ad62dc9a19a9c7a89d:/client/cmdlfpyramid.c diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index d1b4c293..c7a6cb93 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -5,10 +5,12 @@ // the license. //----------------------------------------------------------------------------- // Low frequency Farpoint / Pyramid tag commands +// FSK2a, rf/50, 128 bits (complete) //----------------------------------------------------------------------------- #include #include #include +#include "cmdlfpyramid.h" #include "proxmark3.h" #include "ui.h" #include "util.h" @@ -150,6 +152,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)); size = removeParity(BitStream, idx+8, 8, 1, 120); if (size != 105){ @@ -224,8 +227,7 @@ int CmdFSKdemodPyramid(const char *Cmd) } int CmdPyramidRead(const char *Cmd) { - CmdLFRead("s"); - getSamples("30000",false); + lf_read(true, 15000); return CmdFSKdemodPyramid(""); }