X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4db6f3bbb9b589f62bdaa8d30be0dc6cef3dac3f..5acd195d0fe7dffc36daaada39d0d34ae87b8e1b:/client/cmdlffdx.c?ds=sidebyside diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index 69c3c483..234db59f 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -5,11 +5,14 @@ // the license. //----------------------------------------------------------------------------- // Low frequency fdx-b tag commands +// Differential Biphase, rf/32, 128 bits (known) //----------------------------------------------------------------------------- #include "cmdlffdx.h" +#include #include +#include #include "proxmark3.h" #include "ui.h" // for PrintAndLog #include "util.h" @@ -134,7 +137,7 @@ int CmdFdxDemod(const char *Cmd){ //Differential Biphase / di-phase (inverted biphase) //get binary from ask wave - if (!ASKbiphaseDemod("0 32 1 0", FALSE)) { + if (!ASKbiphaseDemod("0 32 1 0", false)) { if (g_debugMode) PrintAndLog("DEBUG: Error - FDX-B ASKbiphaseDemod failed"); return 0; } @@ -156,6 +159,8 @@ int CmdFdxDemod(const char *Cmd){ // set and leave DemodBuffer intact setDemodBuf(DemodBuffer, 128, preambleIndex); + setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock)); + uint8_t bits_no_spacer[117]; memcpy(bits_no_spacer, DemodBuffer + 11, 117); @@ -201,8 +206,7 @@ int CmdFdxDemod(const char *Cmd){ } int CmdFdxRead(const char *Cmd) { - CmdLFRead("s"); - getSamples("10000", TRUE); + lf_read(true, 10000); return CmdFdxDemod(Cmd); }