Merge branch 'graphwork2' into graphwork

[proxmark3-svn] / client / cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index d1b4c293e396044a5eba952b15155407a835ba31..c7a6cb938217c3bbda3dc8c88e2c33cc0f4049fa 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -5,10 +5,12 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Farpoint / Pyramid tag commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Farpoint / Pyramid tag commands

+// FSK2a, rf/50, 128 bits (complete)

 //-----------------------------------------------------------------------------
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>

+#include "cmdlfpyramid.h"

 #include "proxmark3.h"
 #include "ui.h"
 #include "util.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);
        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){
 
        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) {
 }
 
 int CmdPyramidRead(const char *Cmd) {

-       CmdLFRead("s");
-       getSamples("30000",false);
+       lf_read(true, 15000);

        return CmdFSKdemodPyramid("");
 }
 
        return CmdFSKdemodPyramid("");
 }