X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/946a84c35be79de8852d2c294de22f456f42a1ae..refs/pull/400/head:/client/cmdlfgproxii.c?ds=inline diff --git a/client/cmdlfgproxii.c b/client/cmdlfgproxii.c index 06bd53eb..71c5f391 100644 --- a/client/cmdlfgproxii.c +++ b/client/cmdlfgproxii.c @@ -5,6 +5,7 @@ // the license. //----------------------------------------------------------------------------- // Low frequency G Prox II tag commands +// Biphase, rf/ , 96 bits (unknown key calc + some bits) //----------------------------------------------------------------------------- #include #include @@ -82,16 +83,16 @@ int CmdG_Prox_II_Demod(const char *Cmd) PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); } PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); - setDemodBuf(DemodBuffer+ans, 96, 0); + setDemodBuf(DemodBuffer, 96, ans); + setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock)); + return 1; } //by marshmellow //see ASKDemod for what args are accepted int CmdG_Prox_II_Read(const char *Cmd) { // read lf silently - CmdLFRead("s"); - // get samples silently - getSamples("10000",false); + lf_read(true, 10000); // demod and output viking ID return CmdG_Prox_II_Demod(Cmd); }