From: iceman Date: Tue, 9 Feb 2016 19:58:21 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/60faf34855193c1b01e8f67e9f914192c6fdff7e?hp=6c6da3d466bab3939ccdf02c0bb5906a3e5b4210 Merge branch 'master' of https://github.com/iceman1001/proxmark3 --- diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c index b0fa3aad..f717c3f9 100644 --- a/client/cmdlfviking.c +++ b/client/cmdlfviking.c @@ -53,6 +53,7 @@ uint64_t getVikingBits(uint32_t id) { ret |= checksum; return ret; } + //by marshmellow //see ASKDemod for what args are accepted int CmdVikingRead(const char *Cmd) { @@ -80,7 +81,7 @@ int CmdVikingClone(const char *Cmd) { rawID = getVikingBits(id); - UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFF, Q5}}; + UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFFFFFF, Q5}}; clearCommandBuffer(); SendCommand(&c); //check for ACK