From: Martin Holst Swende Date: Sun, 14 Jun 2015 17:32:36 +0000 (+0200) Subject: Merge pull request #117 from marshmellow42/master X-Git-Tag: v2.1.0~3 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/26fbe1fbd9705bc53a423f41e346323069a93e3e?hp=0f5b97d92cfd4e7a33eb79a226831753812c4ed5 Merge pull request #117 from marshmellow42/master askbiphase bug fix --- diff --git a/client/cmddata.c b/client/cmddata.c index 976dc084..309044e1 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -498,13 +498,13 @@ int CmdBiphaseDecodeRaw(const char *Cmd) int ASKbiphaseDemod(const char *Cmd, bool verbose) { //ask raw demod GraphBuffer first - int offset=0, clk=0, invert=0, maxErr=0, ans=0; - ans = sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); + int offset=0, clk=0, invert=0, maxErr=0; + sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); uint8_t BitStream[MAX_DEMOD_BUF_LEN]; size_t size = getFromGraphBuf(BitStream); - - int errCnt = askdemod(BitStream, &size, &clk, 0, maxErr, 0, 0); + //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer + int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); if ( errCnt < 0 || errCnt > maxErr ) { if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); return 0;