Merge branch 'graphwork2' into graphwork

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 5dcd87b6e3d129025e644950672b46c0c5f0e8f1..e291c9243fe448ff406493923d6ef9fe9ad63a84 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -807,8 +807,8 @@ int FSKrawDemod(const char *Cmd, bool verbose)
        if (size > 0) {
                setDemodBuf(BitStream,size,0);
                setClockGrid(rfLen, startIdx);
        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

                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));
                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));


@@ -1069,8 +1069,9 @@ int CmdRawDemod(const char *Cmd)
 void setClockGrid(int clk, int offset) {
        g_DemodStartIdx = offset;
        g_DemodClock = clk;
 void setClockGrid(int clk, int offset) {
        g_DemodStartIdx = offset;
        g_DemodClock = clk;

-       PrintAndLog("demodoffset %d, clk %d",offset,clk);
-       if (offset > clk) offset %= clk;
+       if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk);
+
+  if (offset > clk) offset %= clk;

        if (offset < 0) offset += clk;
 
        if (offset > GraphTraceLen || offset < 0) return;
        if (offset < 0) offset += clk;
 
        if (offset > GraphTraceLen || offset < 0) return;