Merge branch 'master' into master

[proxmark3-svn] / client / cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 0b7d28117c79edb7409064e2b157301354d5d943..4756266c8ef766d1eadc8d6effba920e7a2cfdb9 100644 (file)
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -5,14 +5,15 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency jablotron tag commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency jablotron tag commands

-// Differential Biphase, RF/64, 64 bits long
+// Differential Biphase, RF/64, 64 bits long (complete)

 //-----------------------------------------------------------------------------
 
 #include "cmdlfjablotron.h"
 //-----------------------------------------------------------------------------
 
 #include "cmdlfjablotron.h"

+

 #include <string.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
 #include <inttypes.h>
 #include <stdbool.h>

-#include "proxmark3.h"
+#include "comms.h"

 #include "ui.h"
 #include "util.h"
 #include "graph.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"


@@ -117,8 +118,8 @@ int CmdJablotronDemod(const char *Cmd) {
                return 0;
        }
 
                return 0;
        }
 

-       setDemodBuf(DemodBuffer+ans, 64, 0);
-       //setGrid_Clock(64);
+       setDemodBuf(DemodBuffer, 64, ans);
+       setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));

 
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);


@@ -141,8 +142,7 @@ int CmdJablotronDemod(const char *Cmd) {
 }
 
 int CmdJablotronRead(const char *Cmd) {
 }
 
 int CmdJablotronRead(const char *Cmd) {

-       CmdLFRead("s");
-       getSamples("10000", true);
+       lf_read(true, 10000);

        return CmdJablotronDemod(Cmd);
 }
 
        return CmdJablotronDemod(Cmd);
 }