From: marshmellow42 Date: Thu, 13 Apr 2017 21:24:33 +0000 (-0400) Subject: Merge branch 'graphwork2' into graphwork X-Git-Tag: v3.0.0~12^2~11^2 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c4809fd411a00e9d0ce2b7ad62dc9a19a9c7a89d Merge branch 'graphwork2' into graphwork --- c4809fd411a00e9d0ce2b7ad62dc9a19a9c7a89d diff --cc client/cmddata.c index 8c2049ad,664ef850..e291c924 --- a/client/cmddata.c +++ b/client/cmddata.c @@@ -807,8 -797,8 +807,8 @@@ int FSKrawDemod(const char *Cmd, bool v if (size > 0) { setDemodBuf(BitStream,size,0); setClockGrid(rfLen, startIdx); - - // Now output the bitstream to the scrollback by line of 16 bits + - // Now output the bitstream to the scrollback by line of 16 bits ++ // Now output the bitstream to the scrollback by line of 16 bits if (verbose || g_debugMode) { PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow); PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert)); @@@ -1067,10 -1057,7 +1067,11 @@@ int CmdRawDemod(const char *Cmd } void setClockGrid(int clk, int offset) { - if (offset > clk) offset %= clk; + g_DemodStartIdx = offset; + g_DemodClock = clk; + if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk); - if (offset > clk) offset %= clk; ++ ++ if (offset > clk) offset %= clk; if (offset < 0) offset += clk; if (offset > GraphTraceLen || offset < 0) return;