X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e04475c42128e4b61c96cab0ff2c1a47d6413885..1523527f94c4c294d0c04d0fd3396ce7eda095e4:/client/cmdlfcotag.c diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c index f10516a6..d1808c9a 100644 --- a/client/cmdlfcotag.c +++ b/client/cmdlfcotag.c @@ -7,7 +7,18 @@ //----------------------------------------------------------------------------- // Low frequency COTAG commands //----------------------------------------------------------------------------- -#include "cmdlfcotag.h" // COTAG function declarations + +#include "cmdlfcotag.h" + +#include +#include +#include +#include "comms.h" +#include "ui.h" +#include "cmddata.h" +#include "lfdemod.h" +#include "usb_cmd.h" +#include "cmdmain.h" static int CmdHelp(const char *Cmd); @@ -33,7 +44,8 @@ int CmdCOTAGDemod(const char *Cmd) { size_t bitlen = COTAG_BITS; memcpy(bits, DemodBuffer, COTAG_BITS); - int err = manrawdecode(bits, &bitlen, 1); + uint8_t alignPos = 0; + int err = manrawdecode(bits, &bitlen, 1, &alignPos); if (err){ if (g_debugMode) PrintAndLog("DEBUG: Error - COTAG too many errors: %d", err); return -1; @@ -85,13 +97,12 @@ int CmdCOTAGRead(const char *Cmd) { case 2: { CmdPlot(""); CmdGrid("384"); - getSamples("", true); break; + getSamples(0, true); break; } case 1: { - GetFromBigBuf(DemodBuffer, COTAG_BITS, 0); - DemodBufferLen = COTAG_BITS; UsbCommand response; - if ( !WaitForResponseTimeout(CMD_ACK, &response, 1000) ) { + DemodBufferLen = COTAG_BITS; + if (!GetFromBigBuf(DemodBuffer, COTAG_BITS, 0, &response, 1000, true)) { PrintAndLog("timeout while waiting for reply."); return -1; }