X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2938b3cb12060875655ba9afbd98a69b7eea6d43..refs/pull/938/head:/client/cmdlfjablotron.c?ds=inline diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index 0b7d2811..4756266c 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -5,14 +5,15 @@ // 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 #include #include -#include "proxmark3.h" +#include "comms.h" #include "ui.h" #include "util.h" #include "graph.h" @@ -117,8 +118,8 @@ int CmdJablotronDemod(const char *Cmd) { 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); @@ -141,8 +142,7 @@ int CmdJablotronDemod(const char *Cmd) { } int CmdJablotronRead(const char *Cmd) { - CmdLFRead("s"); - getSamples("10000", true); + lf_read(true, 10000); return CmdJablotronDemod(Cmd); }