Merge branch 'graphwork2' into graphwork

diff --cc client/cmddata.c
index 8c2049ad1cbf4af9f6c68f860a6d1833a912d609,664ef85048e36730450d8f3e28115502862c2493..e291c9243fe448ff406493923d6ef9fe9ad63a84
--- 1/client/cmddata.c
--- 2/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;

diff --cc client/proxguiqt.cpp
Simple merge