usb communication (device side) refactoring

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index f6aed3838345b6b1f598ccbd8b7e3ca75502c0e0..8f93ba1753ea42e780f4f6b28835be5c6d6537ac 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -8,30 +8,28 @@
 // Data and Graph commands
 //-----------------------------------------------------------------------------
 
 // Data and Graph commands
 //-----------------------------------------------------------------------------
 

+#include "cmddata.h"
+

 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
 #include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
 #include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX

-#include "data.h"     // also included in util.h
-#include "cmddata.h"

 #include "util.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdmain.h"

-#include "proxmark3.h"
+#include "comms.h"

 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "cmdparser.h"// already included in cmdmain.h
 #include "usb_cmd.h"  // already included in cmdmain.h and proxmark3.h
 #include "lfdemod.h"  // for demod code
 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "cmdparser.h"// already included in cmdmain.h
 #include "usb_cmd.h"  // already included in cmdmain.h and proxmark3.h
 #include "lfdemod.h"  // for demod code

-#include "crc.h"      // for pyramid checksum maxim
-#include "crc16.h"    // for FDXB demod checksum

 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h"// for em410x demod
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode=0;
 size_t DemodBufferLen=0;
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h"// for em410x demod
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode=0;
 size_t DemodBufferLen=0;

-//size_t g_demodStartIdx=0;
-//uint8_t g_demodClock=0;
+int g_DemodStartIdx=0;
+int g_DemodClock=0;

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -42,8 +40,8 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
        if (buff == NULL) 
                return;
 
        if (buff == NULL) 
                return;
 

-       if ( size >= MAX_DEMOD_BUF_LEN)
-               size = MAX_DEMOD_BUF_LEN;
+       if ( size > MAX_DEMOD_BUF_LEN - startIdx)
+               size = MAX_DEMOD_BUF_LEN - startIdx;

 
        size_t i = 0;
        for (; i < size; i++){
 
        size_t i = 0;
        for (; i < size; i++){


@@ -53,6 +51,42 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
        return;
 }
 
        return;
 }
 

+bool getDemodBuf(uint8_t *buff, size_t *size) {
+       if (buff == NULL) return false;
+       if (size == NULL) return false;
+       if (*size == 0) return false;
+
+       *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
+
+       memcpy(buff, DemodBuffer, *size);
+       return true;
+}
+
+// option '1' to save DemodBuffer any other to restore
+void save_restoreDB(uint8_t saveOpt)
+{
+       static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
+       static size_t SavedDBlen;
+       static bool DB_Saved = false;
+       static int savedDemodStartIdx = 0;
+       static int savedDemodClock = 0;
+
+       if (saveOpt == GRAPH_SAVE) { //save
+
+               memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
+               SavedDBlen = DemodBufferLen;
+               DB_Saved=true;
+               savedDemodStartIdx = g_DemodStartIdx;
+               savedDemodClock = g_DemodClock;
+       } else if (DB_Saved) { //restore
+               memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
+               DemodBufferLen = SavedDBlen;
+               g_DemodClock = savedDemodClock;
+               g_DemodStartIdx = savedDemodStartIdx;
+       }
+       return;
+}
+

 int CmdSetDebugMode(const char *Cmd)
 {
        int demod=0;
 int CmdSetDebugMode(const char *Cmd)
 {
        int demod=0;


@@ -195,15 +229,21 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
        }
        bool st = false;
        size_t ststart = 0, stend = 0;
        }
        bool st = false;
        size_t ststart = 0, stend = 0;

-       if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend);
+       if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk, &ststart, &stend);
+       *stCheck = st;

        if (st) {
        if (st) {

-               *stCheck = st;

                clk = (clk == 0) ? foundclk : clk;
                CursorCPos = ststart;
                CursorDPos = stend;
                if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");
                clk = (clk == 0) ? foundclk : clk;
                CursorCPos = ststart;
                CursorDPos = stend;
                if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");

-       }
-       int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType);
+               //Graph ST trim (for testing)
+               //for (int i = 0; i < BitLen; i++) {
+               //      GraphBuffer[i] = BitStream[i]-128;
+               //}
+               //RepaintGraphWindow();
+       }
+       int startIdx = 0;
+       int errCnt = askdemod_ext(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);

        if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
                if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
                return 0;
        if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
                if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
                return 0;


@@ -213,9 +253,10 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
                return 0;
        }
        if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen);
                return 0;
        }
        if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen);

-

        //output
        setDemodBuf(BitStream,BitLen,0);
        //output
        setDemodBuf(BitStream,BitLen,0);

+       setClockGrid(clk, startIdx);
+

        if (verbose || g_debugMode){
                if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
                if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
        if (verbose || g_debugMode){
                if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
                if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);


@@ -261,11 +302,11 @@ int Cmdaskmandemod(const char *Cmd)
        }
        bool st = true;
        if (Cmd[0]=='s') 
        }
        bool st = true;
        if (Cmd[0]=='s') 

-               return ASKDemod_ext(Cmd++, true, true, 1, &st);
+               return ASKDemod_ext(Cmd++, true, false, 1, &st);

        else if (Cmd[1] == 's')
        else if (Cmd[1] == 's')

-               return ASKDemod_ext(Cmd+=2, true, true, 1, &st);
+               return ASKDemod_ext(Cmd+=2, true, false, 1, &st);

        else
        else

-               return ASKDemod(Cmd, true, true, 1);
+               return ASKDemod(Cmd, true, false, 1);

 }
 
 //by marshmellow
 }
 
 //by marshmellow


@@ -290,7 +331,7 @@ int Cmdmandecoderaw(const char *Cmd)
                return 0;
        }
        if (DemodBufferLen==0) return 0;
                return 0;
        }
        if (DemodBufferLen==0) return 0;

-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};

        int high=0,low=0;
        for (;i<DemodBufferLen;++i){
                if (DemodBuffer[i]>high) high=DemodBuffer[i];
        int high=0,low=0;
        for (;i<DemodBufferLen;++i){
                if (DemodBuffer[i]>high) high=DemodBuffer[i];


@@ -326,18 +367,20 @@ int Cmdmandecoderaw(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

-//by marshmellow
-//biphase decode
-//take 01 or 10 = 0 and 11 or 00 = 1
-//takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit
-// and "invert" default = 0 if 1 it will invert output
-//  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
+/** 
+ * @author marshmellow
+ * biphase decode
+ * decdoes  01 or 10 to 0 and 11 or 00 to 1
+ * param offset adjust start position
+ * param invert invert output
+ * param maxErr maximum tolerated errors 
+ */

 int CmdBiphaseDecodeRaw(const char *Cmd)
 {
        size_t size=0;
        int offset=0, invert=0, maxErr=20, errCnt=0;
        char cmdp = param_getchar(Cmd, 0);
 int CmdBiphaseDecodeRaw(const char *Cmd)
 {
        size_t size=0;
        int offset=0, invert=0, maxErr=20, errCnt=0;
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {
+       if (strlen(Cmd) > 7 || cmdp == 'h' || cmdp == 'H') {

                PrintAndLog("Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
                PrintAndLog("     Converts 10 or 01 to 1 and 11 or 00 to 0");
                PrintAndLog("     --must have binary sequence in demodbuffer (run data askrawdemod first)");
                PrintAndLog("Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
                PrintAndLog("     Converts 10 or 01 to 1 and 11 or 00 to 0");
                PrintAndLog("     --must have binary sequence in demodbuffer (run data askrawdemod first)");


@@ -352,14 +395,14 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
                return 0;
        }
        sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
                return 0;
        }
        sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);

-       if (DemodBufferLen==0){
+       if (DemodBufferLen==0) {

                PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first");
                return 0;
        }
                PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first");
                return 0;
        }

-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       memcpy(BitStream, DemodBuffer, DemodBufferLen); 
-       size = DemodBufferLen;
-       errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
+       uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
+       size = sizeof(BitStream);
+       if ( !getDemodBuf(BitStream, &size) ) return 0;
+       errCnt=BiphaseRawDecode(BitStream, &size, &offset, invert);

        if (errCnt<0){
                PrintAndLog("Error during decode:%d", errCnt);
                return 0;
        if (errCnt<0){
                PrintAndLog("Error during decode:%d", errCnt);
                return 0;


@@ -372,10 +415,12 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
        if (errCnt>0){
                PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
        }
        if (errCnt>0){
                PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
        }

+

        PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
        
        if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);  //remove first bit from raw demod
        PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
        
        if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);  //remove first bit from raw demod

+       setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);

        return 1;
 }
 
        return 1;
 }
 


@@ -384,30 +429,32 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
        //ask raw demod GraphBuffer first
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
        //ask raw demod GraphBuffer first

-       int offset=0, clk=0, invert=0, maxErr=0;
+       int offset=0, clk=0, invert=0, maxErr=100;

        sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
        sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 

-       uint8_t BitStream[MAX_DEMOD_BUF_LEN];     
-       size_t size = getFromGraphBuf(BitStream);         
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN];   
+       size_t size = getFromGraphBuf(BitStream);
+       int startIdx = 0;

        //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
        //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);  
+       int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);  

        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
                        return 0;  
        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
                        return 0;  

-       } 
+       }

 
        //attempt to Biphase decode BitStream
 
        //attempt to Biphase decode BitStream

-       errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
+       errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);

        if (errCnt < 0){
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
                return 0;
        if (errCnt < 0){
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
                return 0;

-       } 
+       }

        if (errCnt > maxErr) {
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt);
                return 0;
        }
        //success set DemodBuffer and return
        setDemodBuf(BitStream, size, 0);
        if (errCnt > maxErr) {
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt);
                return 0;
        }
        //success set DemodBuffer and return
        setDemodBuf(BitStream, size, 0);

+       setClockGrid(clk, startIdx + clk*offset/2);

        if (g_debugMode || verbose){
                PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
                printDemodBuff();
        if (g_debugMode || verbose){
                PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
                printDemodBuff();


@@ -444,99 +491,6 @@ int Cmdaskbiphdemod(const char *Cmd)
        return ASKbiphaseDemod(Cmd, true);
 }
 
        return ASKbiphaseDemod(Cmd, true);
 }
 

-//could be split to a gProxII file
-//by marshmellow
-//attempts to demodulate and identify a G_Prox_II verex/chubb card
-//WARNING: if it fails during some points it will destroy the DemodBuffer data
-// but will leave the GraphBuffer intact.
-//if successful it will push askraw data back to demod buffer ready for emulation
-int CmdG_Prox_II_Demod(const char *Cmd)
-{
-       if (!ASKbiphaseDemod(Cmd, false)){
-               if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
-               return 0;
-       }
-       size_t size = DemodBufferLen;
-       //call lfdemod.c demod for gProxII
-       int ans = gProxII_Demod(DemodBuffer, &size);
-       if (ans < 0){
-               if (g_debugMode) PrintAndLog("Error gProxII_Demod");
-               return 0;
-       }
-       //got a good demod of 96 bits
-       uint8_t ByteStream[8] = {0x00};
-       uint8_t xorKey=0;
-       size_t startIdx = ans + 6; //start after 6 bit preamble
-
-       uint8_t bits_no_spacer[90];
-       //so as to not mess with raw DemodBuffer copy to a new sample array
-       memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
-       // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
-       size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
-       if (bitLen != 72) {
-               if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
-               return 0;
-       }
-       // get key and then get all 8 bytes of payload decoded
-       xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
-       for (size_t idx = 0; idx < 8; idx++) {
-               ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
-               if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
-       }
-       //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
-       // 
-       uint8_t fmtLen = ByteStream[0]>>2;
-       uint32_t FC = 0;
-       uint32_t Card = 0;
-       //get raw 96 bits to print
-       uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
-       uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
-       uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-
-       if (fmtLen==36){
-               FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-               Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-               PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-       } else if(fmtLen==26){
-               FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
-               Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
-               PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-       } else {
-               PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
-               PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); 
-       }
-       PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
-       setDemodBuf(DemodBuffer+ans, 96, 0);
-       return 1;
-}
-
-//could be moved to a viking file
-//by marshmellow
-//see ASKDemod for what args are accepted
-int CmdVikingDemod(const char *Cmd)
-{
-       if (!ASKDemod(Cmd, false, false, 1)) {
-               if (g_debugMode) PrintAndLog("ASKDemod failed");
-               return 0;
-       }
-       size_t size = DemodBufferLen;
-       //call lfdemod.c demod for Viking
-       int ans = VikingDemod_AM(DemodBuffer, &size);
-       if (ans < 0) {
-               if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans);
-               return 0;
-       }
-       //got a good demod
-       uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
-       uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
-       uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);
-       uint8_t  checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
-       PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum);
-       PrintAndLog("Raw: %08X%08X", raw1,raw2);
-       setDemodBuf(DemodBuffer+ans, 64, 0);
-       return 1;
-}
-

 //by marshmellow - see ASKDemod
 int Cmdaskrawdemod(const char *Cmd)
 {
 //by marshmellow - see ASKDemod
 int Cmdaskrawdemod(const char *Cmd)
 {


@@ -561,45 +515,44 @@ int Cmdaskrawdemod(const char *Cmd)
        return ASKDemod(Cmd, true, false, 0);
 }
 
        return ASKDemod(Cmd, true, false, 0);
 }
 

-int AutoCorrelate(int window, bool SaveGrph, bool verbose)
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose)

 {
        static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
        size_t Correlation = 0;
        int maxSum = 0;
        int lastMax = 0;
        if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window);
 {
        static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
        size_t Correlation = 0;
        int maxSum = 0;
        int lastMax = 0;
        if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window);

-       for (int i = 0; i < GraphTraceLen - window; ++i) {
+       for (int i = 0; i < len - window; ++i) {

                int sum = 0;
                for (int j = 0; j < window; ++j) {
                int sum = 0;
                for (int j = 0; j < window; ++j) {

-                       sum += (GraphBuffer[j]*GraphBuffer[i + j]) / 256;
+                       sum += (in[j]*in[i + j]) / 256;

                }
                CorrelBuffer[i] = sum;
                }
                CorrelBuffer[i] = sum;

-               if (sum >= maxSum-100 && sum <= maxSum+100){
+               if (sum >= maxSum-100 && sum <= maxSum+100) {

                        //another max
                        Correlation = i-lastMax;
                        lastMax = i;
                        if (sum > maxSum) maxSum = sum;
                        //another max
                        Correlation = i-lastMax;
                        lastMax = i;
                        if (sum > maxSum) maxSum = sum;

-               } else if (sum > maxSum){
+               } else if (sum > maxSum) {

                        maxSum=sum;
                        lastMax = i;
                }
        }
                        maxSum=sum;
                        lastMax = i;
                }
        }

-       if (Correlation==0){
+       if (Correlation==0) {

                //try again with wider margin
                //try again with wider margin

-               for (int i = 0; i < GraphTraceLen - window; i++){
-                       if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)){
+               for (int i = 0; i < len - window; i++) {
+                       if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)) {

                                //another max
                                Correlation = i-lastMax;
                                lastMax = i;
                                //another max
                                Correlation = i-lastMax;
                                lastMax = i;

-                               //if (CorrelBuffer[i] > maxSum) maxSum = sum;

                        }
                }
        }
        if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation);
 
                        }
                }
        }
        if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation);
 

-       if (SaveGrph){
-               GraphTraceLen = GraphTraceLen - window;
-               memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int));
+       if (SaveGrph) {
+               //GraphTraceLen = GraphTraceLen - window;
+               memcpy(out, CorrelBuffer, len * sizeof(int));

                RepaintGraphWindow();  
        }
        return Correlation;
                RepaintGraphWindow();  
        }
        return Correlation;


@@ -632,7 +585,7 @@ int CmdAutoCorr(const char *Cmd)
                return 0;
        }
        if (grph == 'g') updateGrph=true;
                return 0;
        }
        if (grph == 'g') updateGrph=true;

-       return AutoCorrelate(window, updateGrph, true);
+       return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);

 }
 
 int CmdBitsamples(const char *Cmd)
 }
 
 int CmdBitsamples(const char *Cmd)


@@ -640,8 +593,7 @@ int CmdBitsamples(const char *Cmd)
        int cnt = 0;
        uint8_t got[12288];
 
        int cnt = 0;
        uint8_t got[12288];
 

-       GetFromBigBuf(got,sizeof(got),0);
-       WaitForResponse(CMD_ACK,NULL);
+       GetFromBigBuf(got, sizeof(got), 0 , NULL, -1, false);

 
                for (int j = 0; j < sizeof(got); j++) {
                        for (int k = 0; k < 8; k++) {
 
                for (int j = 0; j < sizeof(got); j++) {
                        for (int k = 0; k < 8; k++) {


@@ -735,6 +687,18 @@ int CmdGraphShiftZero(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

+int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
+       int Last = 0;
+       for(int i = 1; i<len; i++) {
+               if (in[i]-in[i-1] >= threshold) //large jump up
+                       Last = 127;
+               else if(in[i]-in[i-1] <= -1 * threshold) //large jump down
+                       Last = -127;
+               out[i-1] = Last;
+       }
+       return 0;
+}
+

 //by marshmellow
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
 //similar to dirtheshold, threshold commands 
 //by marshmellow
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
 //similar to dirtheshold, threshold commands 


@@ -742,18 +706,12 @@ int CmdGraphShiftZero(const char *Cmd)
 int CmdAskEdgeDetect(const char *Cmd)
 {
        int thresLen = 25;
 int CmdAskEdgeDetect(const char *Cmd)
 {
        int thresLen = 25;

-       int Last = 0;
+       int ans = 0;

        sscanf(Cmd, "%i", &thresLen); 
 
        sscanf(Cmd, "%i", &thresLen); 
 

-       for(int i = 1; i<GraphTraceLen; i++){
-               if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up
-                       Last = 127;
-               else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down
-                       Last = -127;
-               GraphBuffer[i-1] = Last;
-       }
+       ans = AskEdgeDetect(GraphBuffer, GraphBuffer, GraphTraceLen, thresLen);

        RepaintGraphWindow();
        RepaintGraphWindow();

-       return 0;
+       return ans;

 }
 
 /* Print our clock rate */
 }
 
 /* Print our clock rate */


@@ -847,14 +805,17 @@ int FSKrawDemod(const char *Cmd, bool verbose)
        }
        //get bit clock length
        if (!rfLen) {
        }
        //get bit clock length
        if (!rfLen) {

-               rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);
+               int firstClockEdge = 0; //todo - align grid on graph with this...
+               rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow, &firstClockEdge);

                if (!rfLen) rfLen = 50;
        }
                if (!rfLen) rfLen = 50;
        }

-       int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);
+       int startIdx = 0;
+       int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);

        if (size > 0) {
                setDemodBuf(BitStream,size,0);
        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));


@@ -894,559 +855,6 @@ int CmdFSKrawdemod(const char *Cmd)
        return FSKrawDemod(Cmd, true);
 }
 
        return FSKrawDemod(Cmd, true);
 }
 

-//move to cmdlfhid.c
-//by marshmellow (based on existing demod + holiman's refactor)
-//HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
-//print full HID Prox ID and some bit format details if found
-int CmdFSKdemodHID(const char *Cmd)
-{
-       //raw fsk demod no manchester decoding no start bit finding just get binary from wave
-       uint32_t hi2=0, hi=0, lo=0;
-
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t BitLen = getFromGraphBuf(BitStream);
-       if (BitLen==0) return 0;
-       //get binary from fsk wave
-       int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
-       if (idx<0){
-               if (g_debugMode){
-                       if (idx==-1){
-                               PrintAndLog("DEBUG: Just Noise Detected");
-                       } else if (idx == -2) {
-                               PrintAndLog("DEBUG: Error demoding fsk");
-                       } else if (idx == -3) {
-                               PrintAndLog("DEBUG: Preamble not found");
-                       } else if (idx == -4) {
-                               PrintAndLog("DEBUG: Error in Manchester data, SIZE: %d", BitLen);
-                       } else {
-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
-                       }   
-               }
-               return 0;
-       }
-       if (hi2==0 && hi==0 && lo==0) {
-               if (g_debugMode) PrintAndLog("DEBUG: Error - no values found");
-               return 0;
-       }
-       if (hi2 != 0){ //extra large HID tags
-               PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
-                        (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-       }
-       else {  //standard HID tags <38 bits
-               uint8_t fmtLen = 0;
-               uint32_t fc = 0;
-               uint32_t cardnum = 0;
-               if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
-                       uint32_t lo2=0;
-                       lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
-                       uint8_t idx3 = 1;
-                       while(lo2>1){ //find last bit set to 1 (format len bit)
-                               lo2=lo2>>1;
-                               idx3++;
-                       }
-                       fmtLen =idx3+19;
-                       fc =0;
-                       cardnum=0;
-                       if(fmtLen==26){
-                               cardnum = (lo>>1)&0xFFFF;
-                               fc = (lo>>17)&0xFF;
-                       }
-                       if(fmtLen==34){
-                               cardnum = (lo>>1)&0xFFFF;
-                               fc= ((hi&1)<<15)|(lo>>17);
-                       }
-                       if(fmtLen==35){
-                               cardnum = (lo>>1)&0xFFFFF;
-                               fc = ((hi&1)<<11)|(lo>>21);
-                       }
-               }
-               else { //if bit 38 is not set then 37 bit format is used
-                       fmtLen = 37;
-                       fc = 0;
-                       cardnum = 0;
-                       if(fmtLen == 37){
-                               cardnum = (lo>>1)&0x7FFFF;
-                               fc = ((hi&0xF)<<12)|(lo>>20);
-                       }
-               }
-               PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
-                       (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
-                       (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
-       }
-       setDemodBuf(BitStream,BitLen,idx);
-       if (g_debugMode){ 
-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
-               printDemodBuff();
-       }
-       return 1;
-}
-
-
-//by marshmellow
-//Paradox Prox demod - FSK RF/50 with preamble of 00001111 (then manchester encoded)
-//print full Paradox Prox ID and some bit format details if found
-int CmdFSKdemodParadox(const char *Cmd)
-{
-       //raw fsk demod no manchester decoding no start bit finding just get binary from wave
-       uint32_t hi2=0, hi=0, lo=0;
-
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t BitLen = getFromGraphBuf(BitStream);
-       if (BitLen==0) return 0;
-       //get binary from fsk wave
-       int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
-       if (idx<0){
-               if (g_debugMode){
-                       if (idx==-1){
-                               PrintAndLog("DEBUG: Just Noise Detected");     
-                       } else if (idx == -2) {
-                               PrintAndLog("DEBUG: Error demoding fsk");
-                       } else if (idx == -3) {
-                               PrintAndLog("DEBUG: Preamble not found");
-                       } else if (idx == -4) {
-                               PrintAndLog("DEBUG: Error in Manchester data");
-                       } else {
-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
-                       }
-               }
-               return 0;
-       }
-       if (hi2==0 && hi==0 && lo==0){
-               if (g_debugMode) PrintAndLog("DEBUG: Error - no value found");
-               return 0;
-       }
-       uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);
-       uint32_t cardnum = (lo>>10)&0xFFFF;
-       uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32);
-       uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);
-       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);
-
-       PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
-               hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo);
-       setDemodBuf(BitStream,BitLen,idx);
-       if (g_debugMode){ 
-               PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);
-               printDemodBuff();
-       }
-       return 1;
-}
-
-//by marshmellow
-//IO-Prox demod - FSK RF/64 with preamble of 000000001
-//print ioprox ID and some format details
-int CmdFSKdemodIO(const char *Cmd)
-{
-       int idx=0;
-       //something in graphbuffer?
-       if (GraphTraceLen < 65) {
-               if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer");
-               return 0;
-       }
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t BitLen = getFromGraphBuf(BitStream);
-       if (BitLen==0) return 0;
-
-       //get binary from fsk wave
-       idx = IOdemodFSK(BitStream,BitLen);
-       if (idx<0){
-               if (g_debugMode){
-                       if (idx==-1){
-                               PrintAndLog("DEBUG: Just Noise Detected");     
-                       } else if (idx == -2) {
-                               PrintAndLog("DEBUG: not enough samples");
-                       } else if (idx == -3) {
-                               PrintAndLog("DEBUG: error during fskdemod");        
-                       } else if (idx == -4) {
-                               PrintAndLog("DEBUG: Preamble not found");
-                       } else if (idx == -5) {
-                               PrintAndLog("DEBUG: Separator bits not found");
-                       } else {
-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
-                       }
-               }
-               return 0;
-       }
-       if (idx==0){
-               if (g_debugMode){
-                       PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen);
-                       if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16));
-               } 
-               return 0;
-       }
-               //Index map
-               //0           10          20          30          40          50          60
-               //|           |           |           |           |           |           |
-               //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
-               //-----------------------------------------------------------------------------
-               //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
-               //
-               //XSF(version)facility:codeone+codetwo (raw)
-               //Handle the data
-       if (idx+64>BitLen) {
-               if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen);
-               return 0;
-       }
-       PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx],    BitStream[idx+1],  BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9],  BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);
-
-       uint32_t code = bytebits_to_byte(BitStream+idx,32);
-       uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);
-       uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4
-       uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ;
-       uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9
-       uint8_t crc = bytebits_to_byte(BitStream+idx+54,8);
-       uint16_t calccrc = 0;
-
-       for (uint8_t i=1; i<6; ++i){
-               calccrc += bytebits_to_byte(BitStream+idx+9*i,8);
-       }
-       calccrc &= 0xff;
-       calccrc = 0xff - calccrc;
-
-       char *crcStr = (crc == calccrc) ? "crc ok": "!crc";
-
-       PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr);
-       setDemodBuf(BitStream,64,idx);
-       if (g_debugMode){
-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);
-               printDemodBuff();
-       }
-       return 1;
-}
-
-//by marshmellow
-//AWID Prox demod - FSK RF/50 with preamble of 00000001  (always a 96 bit data stream)
-//print full AWID Prox ID and some bit format details if found
-int CmdFSKdemodAWID(const char *Cmd)
-{
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t size = getFromGraphBuf(BitStream);
-       if (size==0) return 0;
-
-       //get binary from fsk wave
-       int idx = AWIDdemodFSK(BitStream, &size);
-       if (idx<=0){
-               if (g_debugMode){
-                       if (idx == -1)
-                               PrintAndLog("DEBUG: Error - not enough samples");
-                       else if (idx == -2)
-                               PrintAndLog("DEBUG: Error - only noise found");
-                       else if (idx == -3)
-                               PrintAndLog("DEBUG: Error - problem during FSK demod");
-                       else if (idx == -4)
-                               PrintAndLog("DEBUG: Error - AWID preamble not found");
-                       else if (idx == -5)
-                               PrintAndLog("DEBUG: Error - Size not correct: %d", size);
-                       else
-                               PrintAndLog("DEBUG: Error %d",idx);
-               }
-               return 0;
-       }
-
-       // Index map
-       // 0            10            20            30              40            50              60
-       // |            |             |             |               |             |               |
-       // 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96
-       // -----------------------------------------------------------------------------
-       // 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1
-       // premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96
-       //          |---26 bit---|    |-----117----||-------------142-------------|
-       // b = format bit len, o = odd parity of last 3 bits
-       // f = facility code, c = card number
-       // w = wiegand parity
-       // (26 bit format shown)
- 
-       //get raw ID before removing parities
-       uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32);
-       uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);
-       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);
-       setDemodBuf(BitStream,96,idx);
-
-       size = removeParity(BitStream, idx+8, 4, 1, 88);
-       if (size != 66){
-               if (g_debugMode) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");
-               return 0;
-       }
-       // ok valid card found!
-
-       // Index map
-       // 0           10         20        30          40        50        60
-       // |           |          |         |           |         |         |
-       // 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456
-       // -----------------------------------------------------------------------------
-       // 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000
-       // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-       // |26 bit|   |-117--| |-----142------|
-       // b = format bit len, o = odd parity of last 3 bits
-       // f = facility code, c = card number
-       // w = wiegand parity
-       // (26 bit format shown)
-
-       uint32_t fc = 0;
-       uint32_t cardnum = 0;
-       uint32_t code1 = 0;
-       uint32_t code2 = 0;
-       uint8_t fmtLen = bytebits_to_byte(BitStream,8);
-       if (fmtLen==26){
-               fc = bytebits_to_byte(BitStream+9, 8);
-               cardnum = bytebits_to_byte(BitStream+17, 16);
-               code1 = bytebits_to_byte(BitStream+8,fmtLen);
-               PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
-       } else {
-               cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
-               if (fmtLen>32){
-                       code1 = bytebits_to_byte(BitStream+8,fmtLen-32);
-                       code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32);
-                       PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-               } else{
-                       code1 = bytebits_to_byte(BitStream+8,fmtLen);
-                       PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
-               }
-       }
-       if (g_debugMode){
-               PrintAndLog("DEBUG: idx: %d, Len: %d Printing Demod Buffer:", idx, 96);
-               printDemodBuff();
-       }
-       //todo - convert hi2, hi, lo to demodbuffer for future sim/clone commands
-       return 1;
-}
-
-//by marshmellow
-//Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
-//print full Farpointe Data/Pyramid Prox ID and some bit format details if found
-int CmdFSKdemodPyramid(const char *Cmd)
-{
-       //raw fsk demod no manchester decoding no start bit finding just get binary from wave
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t size = getFromGraphBuf(BitStream);
-       if (size==0) return 0;
-
-       //get binary from fsk wave
-       int idx = PyramiddemodFSK(BitStream, &size);
-       if (idx < 0){
-               if (g_debugMode){
-                       if (idx == -5)
-                               PrintAndLog("DEBUG: Error - not enough samples");
-                       else if (idx == -1)
-                               PrintAndLog("DEBUG: Error - only noise found");
-                       else if (idx == -2)
-                               PrintAndLog("DEBUG: Error - problem during FSK demod");
-                       else if (idx == -3)
-                               PrintAndLog("DEBUG: Error - Size not correct: %d", size);
-                       else if (idx == -4)
-                               PrintAndLog("DEBUG: Error - Pyramid preamble not found");
-                       else
-                               PrintAndLog("DEBUG: Error - idx: %d",idx);
-               }
-               return 0;
-       }
-       // Index map
-       // 0           10          20          30            40          50          60
-       // |           |           |           |             |           |           |
-       // 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3
-       // -----------------------------------------------------------------------------
-       // 0000000 0 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1
-       // premable  xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o
-
-       // 64    70            80          90          100         110           120
-       // |     |             |           |           |           |             |
-       // 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7
-       // -----------------------------------------------------------------------------
-       // 0000000 1 0000000 1 0000000 1 0110111 0 0011000 1 0000001 0 0001100 1 1001010 0
-       // xxxxxxx o xxxxxxx o xxxxxxx o xswffff o ffffccc o ccccccc o ccccccw o ppppppp o
-       //                                  |---115---||---------71---------|
-       // s = format start bit, o = odd parity of last 7 bits
-       // f = facility code, c = card number
-       // w = wiegand parity, x = extra space for other formats
-       // p = unknown checksum
-       // (26 bit format shown)
-
-       //get bytes for checksum calc
-       uint8_t checksum = bytebits_to_byte(BitStream + idx + 120, 8);
-       uint8_t csBuff[14] = {0x00};
-       for (uint8_t i = 0; i < 13; i++){
-               csBuff[i] = bytebits_to_byte(BitStream + idx + 16 + (i*8), 8);
-       }
-       //check checksum calc
-       //checksum calc thanks to ICEMAN!!
-       uint32_t checkCS =  CRC8Maxim(csBuff,13);
-
-       //get raw ID before removing parities
-       uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32);
-       uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32);
-       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);
-       uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);
-       setDemodBuf(BitStream,128,idx);
-
-       size = removeParity(BitStream, idx+8, 8, 1, 120);
-       if (size != 105){
-               if (g_debugMode) 
-                       PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3);
-               return 0;
-       }
-
-       // ok valid card found!
-
-       // Index map
-       // 0         10        20        30        40        50        60        70
-       // |         |         |         |         |         |         |         |
-       // 01234567890123456789012345678901234567890123456789012345678901234567890
-       // -----------------------------------------------------------------------
-       // 00000000000000000000000000000000000000000000000000000000000000000000000
-       // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-       // 71         80         90          100
-       // |          |          |           |
-       // 1 2 34567890 1234567890123456 7 8901234
-       // ---------------------------------------
-       // 1 1 01110011 0000000001000110 0 1001010
-       // s w ffffffff cccccccccccccccc w ppppppp
-       //     |--115-| |------71------|
-       // s = format start bit, o = odd parity of last 7 bits
-       // f = facility code, c = card number
-       // w = wiegand parity, x = extra space for other formats
-       // p = unknown checksum
-       // (26 bit format shown)
-
-       //find start bit to get fmtLen
-       int j;
-       for (j=0; j<size; j++){
-               if(BitStream[j]) break;
-       }
-       uint8_t fmtLen = size-j-8;
-       uint32_t fc = 0;
-       uint32_t cardnum = 0;
-       uint32_t code1 = 0;
-       if (fmtLen==26){
-               fc = bytebits_to_byte(BitStream+73, 8);
-               cardnum = bytebits_to_byte(BitStream+81, 16);
-               code1 = bytebits_to_byte(BitStream+72,fmtLen);
-               PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
-       } else if (fmtLen==45){
-               fmtLen=42; //end = 10 bits not 7 like 26 bit fmt
-               fc = bytebits_to_byte(BitStream+53, 10);
-               cardnum = bytebits_to_byte(BitStream+63, 32);
-               PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-       } else {
-               cardnum = bytebits_to_byte(BitStream+81, 16);
-               if (fmtLen>32){
-                       //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32);
-                       //code2 = bytebits_to_byte(BitStream+(size-32),32);
-                       PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-               } else{
-                       //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen);
-                       PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-               }
-       }
-       if (checksum == checkCS)
-               PrintAndLog("Checksum %02x passed", checksum);
-       else
-               PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS);
-
-       if (g_debugMode){
-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
-               printDemodBuff();
-       }
-       return 1;
-}
-
-// FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
-// 8 databits + 1 parity (1)
-// CIITT 16 chksum
-// NATIONAL CODE, ICAR database
-// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
-// FLAG (animal/non-animal)
-/*
-38 IDbits   
-10 country code 
-1 extra app bit
-14 reserved bits
-1 animal bit
-16 ccitt CRC chksum over 64bit ID CODE.
-24 appli bits.
-
--- sample: 985121004515220  [ 37FF65B88EF94 ]
-*/
-int CmdFDXBdemodBI(const char *Cmd){
-
-       int invert = 1;
-       int clk = 32;           
-       int errCnt = 0;
-       int maxErr = 0;
-       uint8_t BitStream[MAX_DEMOD_BUF_LEN];   
-       size_t size = getFromGraphBuf(BitStream);       
-       
-       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;
-       }
-
-       errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
-       if (errCnt < 0 || errCnt > maxErr ) {
-               if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
-               return 0;
-       } 
-
-       int preambleIndex = FDXBdemodBI(BitStream, &size);
-       if (preambleIndex < 0){
-               if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
-               return 0;
-       }
-       if (size != 128) {
-               if (g_debugMode) PrintAndLog("Error incorrect data length found");
-               return 0;
-       }
-
-       setDemodBuf(BitStream, 128, preambleIndex);
-
-       // remove marker bits (1's every 9th digit after preamble) (pType = 2)
-       size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
-       if ( size != 104 ) {
-               if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
-               return 0;
-       }
-       if (g_debugMode) {
-               char *bin = sprint_bin_break(BitStream,size,16);
-               PrintAndLog("DEBUG BinStream:\n%s",bin);
-       }
-       PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
-       if (g_debugMode) PrintAndLog("Start marker %d;   Size %d", preambleIndex, size);
-
-       //got a good demod
-       uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
-       uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10);
-       uint8_t dataBlockBit = BitStream[48];
-       uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14);
-       uint8_t animalBit = BitStream[63];
-       uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16);
-       uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24);
-
-       uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32);
-       uint8_t raw[8];
-       num_to_bytes(rawid, 8, raw);
-
-       if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
-
-       uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
-       PrintAndLog("Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
-       PrintAndLog("National Code: %012" PRIu64, NationalCode);
-       PrintAndLog("CountryCode:   %04u", countryCode);
-       PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
-       PrintAndLog("reserved Code: %u", reservedCode);
-       PrintAndLog("Animal Tag:    %s", animalBit ? "True" : "False");
-       PrintAndLog("CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
-       PrintAndLog("Extended:      0x%X\n", extended);
-       
-       return 1;
-}
-
-

 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)


@@ -1466,16 +874,9 @@ int PSKDemod(const char *Cmd, bool verbose)
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;

-       uint8_t carrier=countFC(BitStream, BitLen, 0);
-       if (carrier!=2 && carrier!=4 && carrier!=8){
-               //invalid carrier
-               return 0;
-       }
-       if (g_debugMode){
-               PrintAndLog("Carrier: rf/%d",carrier);
-       }

        int errCnt=0;
        int errCnt=0;

-       errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
+       int startIdx = 0;
+       errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);

        if (errCnt > maxErr){
                if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
                return 0;
        if (errCnt > maxErr){
                if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
                return 0;


@@ -1492,98 +893,8 @@ int PSKDemod(const char *Cmd, bool verbose)
        }
        //prime demod buffer for output
        setDemodBuf(BitStream,BitLen,0);
        }
        //prime demod buffer for output
        setDemodBuf(BitStream,BitLen,0);

-       return 1;
-}
-
-// Indala 26 bit decode
-// by marshmellow
-// optional arguments - same as CmdpskNRZrawDemod (clock & invert)
-int CmdIndalaDecode(const char *Cmd)
-{
-       int ans;
-       if (strlen(Cmd)>0){
-               ans = PSKDemod(Cmd, 0);
-       } else{ //default to RF/32
-               ans = PSKDemod("32", 0);
-       }
-
-       if (!ans){
-               if (g_debugMode) 
-                       PrintAndLog("Error1: %d",ans);
-               return 0;
-       }
-       uint8_t invert=0;
-       size_t size = DemodBufferLen;
-       int startIdx = indala26decode(DemodBuffer, &size, &invert);
-       if (startIdx < 0 || size > 224) {
-               if (g_debugMode)
-                       PrintAndLog("Error2: %d",ans);
-               return -1;
-       }
-       setDemodBuf(DemodBuffer, size, (size_t)startIdx);
-       if (invert)
-               if (g_debugMode)
-                       PrintAndLog("Had to invert bits");
-
-       PrintAndLog("BitLen: %d",DemodBufferLen);
-       //convert UID to HEX
-       uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-       uid1=bytebits_to_byte(DemodBuffer,32);
-       uid2=bytebits_to_byte(DemodBuffer+32,32);
-       if (DemodBufferLen==64) {
-               PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2);
-       } else {
-               uid3=bytebits_to_byte(DemodBuffer+64,32);
-               uid4=bytebits_to_byte(DemodBuffer+96,32);
-               uid5=bytebits_to_byte(DemodBuffer+128,32);
-               uid6=bytebits_to_byte(DemodBuffer+160,32);
-               uid7=bytebits_to_byte(DemodBuffer+192,32);
-               PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", 
-                   sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7);
-       }
-       if (g_debugMode){
-               PrintAndLog("DEBUG: printing demodbuffer:");
-               printDemodBuff();
-       }
-       return 1;
-}
-
-int CmdPSKNexWatch(const char *Cmd)
-{
-       if (!PSKDemod("", false)) return 0;
-       uint8_t preamble[28] = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-       size_t startIdx = 0, size = DemodBufferLen; 
-       bool invert = false;
-       if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){
-               // if didn't find preamble try again inverting
-               if (!PSKDemod("1", false)) return 0; 
-               size = DemodBufferLen;
-               if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0;
-               invert = true;
-       } 
-       if (size != 128) return 0;
-       setDemodBuf(DemodBuffer, size, startIdx+4);
-       startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0)
-       //get ID
-       uint32_t ID = 0;
-       for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){
-               for (uint8_t idx=0; idx<8; idx++){
-                       ID = (ID << 1) | DemodBuffer[startIdx+wordIdx+(idx*4)];
-               }       
-       }
-       //parity check (TBD)
+       setClockGrid(clk, startIdx);

 
 

-       //checksum check (TBD)
-
-       //output
-       PrintAndLog("NexWatch ID: %d", ID);
-       if (invert){
-               PrintAndLog("Had to Invert - probably NexKey");
-               for (uint8_t idx=0; idx<size; idx++)
-                       DemodBuffer[idx] ^= 1;
-       } 
-
-       CmdPrintDemodBuff("x");

        return 1;
 }
 
        return 1;
 }
 


@@ -1622,6 +933,8 @@ int NRZrawDemod(const char *Cmd, bool verbose)
        if (verbose || g_debugMode) PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
        //prime demod buffer for output
        setDemodBuf(BitStream,BitLen,0);
        if (verbose || g_debugMode) PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
        //prime demod buffer for output
        setDemodBuf(BitStream,BitLen,0);

+       setClockGrid(clk, clkStartIdx);
+

 
        if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
        if (verbose || g_debugMode) {
 
        if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
        if (verbose || g_debugMode) {


@@ -1760,6 +1073,30 @@ int CmdRawDemod(const char *Cmd)
        return ans;
 }
 
        return ans;
 }
 

+void setClockGrid(int clk, int offset) {
+       g_DemodStartIdx = offset;
+       g_DemodClock = 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 (clk < 8 || clk > GraphTraceLen) {
+               GridLocked = false;
+               GridOffset = 0;
+               PlotGridX = 0;
+               PlotGridXdefault = 0;
+               RepaintGraphWindow();
+       } else {
+               GridLocked = true;
+               GridOffset = offset;
+               PlotGridX = clk;
+               PlotGridXdefault = clk;
+               RepaintGraphWindow();
+       }
+}
+

 int CmdGrid(const char *Cmd)
 {
        sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
 int CmdGrid(const char *Cmd)
 {
        sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);


@@ -1795,8 +1132,7 @@ int CmdHexsamples(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       GetFromBigBuf(got,requested,offset);
-       WaitForResponse(CMD_ACK,NULL);
+       GetFromBigBuf(got, requested, offset, NULL, -1, false);

 
        i = 0;
        for (j = 0; j < requested; j++) {
 
        i = 0;
        for (j = 0; j < requested; j++) {


@@ -1851,7 +1187,7 @@ uint8_t getByte(uint8_t bits_per_sample, BitstreamIn* b)
        return val;
 }
 
        return val;
 }
 

-int getSamples(const char *Cmd, bool silent)
+int getSamples(int n, bool silent)

 {
        //If we get all but the last byte in bigbuf,
        // we don't have to worry about remaining trash
 {
        //If we get all but the last byte in bigbuf,
        // we don't have to worry about remaining trash


@@ -1860,29 +1196,26 @@ int getSamples(const char *Cmd, bool silent)
 
        uint8_t got[BIGBUF_SIZE-1] = { 0 };
 
 
        uint8_t got[BIGBUF_SIZE-1] = { 0 };
 

-       int n = strtol(Cmd, NULL, 0);
-

        if (n == 0 || n > sizeof(got))
                n = sizeof(got);
 
        if (n == 0 || n > sizeof(got))
                n = sizeof(got);
 

-       PrintAndLog("Reading %d bytes from device memory\n", n);
-       GetFromBigBuf(got,n,0);
-       PrintAndLog("Data fetched");
+       if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);

        UsbCommand response;
        UsbCommand response;

-       WaitForResponse(CMD_ACK, &response);
+       GetFromBigBuf(got, n, 0, &response, -1, false);
+       if (!silent) PrintAndLog("Data fetched");

        uint8_t bits_per_sample = 8;
 
        //Old devices without this feature would send 0 at arg[0]
        if(response.arg[0] > 0)
        {
                sample_config *sc = (sample_config *) response.d.asBytes;
        uint8_t bits_per_sample = 8;
 
        //Old devices without this feature would send 0 at arg[0]
        if(response.arg[0] > 0)
        {
                sample_config *sc = (sample_config *) response.d.asBytes;

-               PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample
+               if (!silent) PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample

                    , sc->decimation);
                bits_per_sample = sc->bits_per_sample;
        }
        if(bits_per_sample < 8)
        {
                    , sc->decimation);
                bits_per_sample = sc->bits_per_sample;
        }
        if(bits_per_sample < 8)
        {

-               PrintAndLog("Unpacking...");
+               if (!silent) PrintAndLog("Unpacking...");

                BitstreamIn bout = { got, bits_per_sample * n,  0};
                int j =0;
                for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
                BitstreamIn bout = { got, bits_per_sample * n,  0};
                int j =0;
                for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {


@@ -1899,13 +1232,16 @@ int getSamples(const char *Cmd, bool silent)
                GraphTraceLen = n;
        }
 
                GraphTraceLen = n;
        }
 

+       setClockGrid(0,0);
+       DemodBufferLen = 0;

        RepaintGraphWindow();
        return 0;
 }
 
 int CmdSamples(const char *Cmd)
 {
        RepaintGraphWindow();
        return 0;
 }
 
 int CmdSamples(const char *Cmd)
 {

-       return getSamples(Cmd, false);
+       int n = strtol(Cmd, NULL, 0);
+       return getSamples(n, false);

 }
 
 int CmdTuneSamples(const char *Cmd)
 }
 
 int CmdTuneSamples(const char *Cmd)


@@ -1944,26 +1280,36 @@ int CmdTuneSamples(const char *Cmd)
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");

-       PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
-       PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
-       PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
-       PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
-
- #define LF_UNUSABLE_V         2948            // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
- #define LF_MARGINAL_V         14739           // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
- #define HF_UNUSABLE_V         3167            // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
- #define HF_MARGINAL_V         7917            // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
-
-       if (peakv < LF_UNUSABLE_V)
-               PrintAndLog("# Your LF antenna is unusable.");
-       else if (peakv < LF_MARGINAL_V)
-               PrintAndLog("# Your LF antenna is marginal.");
-       if (vHf < HF_UNUSABLE_V)
-               PrintAndLog("# Your HF antenna is unusable.");
-       else if (vHf < HF_MARGINAL_V)
-               PrintAndLog("# Your HF antenna is marginal.");
-
-       if (peakv >= LF_UNUSABLE_V)     {
+       if (arg & FLAG_TUNE_LF)
+       {
+               PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/500.0);
+               PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/500.0);
+               PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/500.0, 12000.0/(peakf+1));
+       }
+       if (arg & FLAG_TUNE_HF)
+               PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
+
+ #define LF_UNUSABLE_V         3000
+ #define LF_MARGINAL_V         15000
+ #define HF_UNUSABLE_V         3200
+ #define HF_MARGINAL_V         8000
+
+       if (arg & FLAG_TUNE_LF)
+       {
+               if (peakv<<1 < LF_UNUSABLE_V)
+                       PrintAndLog("# Your LF antenna is unusable.");
+               else if (peakv<<1 < LF_MARGINAL_V)
+                       PrintAndLog("# Your LF antenna is marginal.");
+       }
+       if (arg & FLAG_TUNE_HF)
+       {
+               if (vHf < HF_UNUSABLE_V)
+                       PrintAndLog("# Your HF antenna is unusable.");
+               else if (vHf < HF_MARGINAL_V)
+                       PrintAndLog("# Your HF antenna is marginal.");
+       }
+
+       if (peakv<<1 >= LF_UNUSABLE_V)  {

                for (int i = 0; i < 256; i++) {
                        GraphBuffer[i] = resp.d.asBytes[i] - 128;
                }
                for (int i = 0; i < 256; i++) {
                        GraphBuffer[i] = resp.d.asBytes[i] - 128;
                }


@@ -2001,6 +1347,8 @@ int CmdLoad(const char *Cmd)
        }
        fclose(f);
        PrintAndLog("loaded %d samples", GraphTraceLen);
        }
        fclose(f);
        PrintAndLog("loaded %d samples", GraphTraceLen);

+       setClockGrid(0,0);
+       DemodBufferLen = 0;

        RepaintGraphWindow();
        return 0;
 }
        RepaintGraphWindow();
        return 0;
 }


@@ -2036,9 +1384,9 @@ int CmdMtrim(const char *Cmd) {
        if (start > GraphTraceLen       || stop > GraphTraceLen || start > stop) return 0;
        start++; //leave start position sample
 
        if (start > GraphTraceLen       || stop > GraphTraceLen || start > stop) return 0;
        start++; //leave start position sample
 

-       GraphTraceLen -= stop - start;
+       GraphTraceLen = stop - start;

        for (int i = 0; i < GraphTraceLen; i++) {
        for (int i = 0; i < GraphTraceLen; i++) {

-               GraphBuffer[start+i] = GraphBuffer[stop+i];
+               GraphBuffer[i] = GraphBuffer[start+i];

        }
        return 0;
 }
        }
        return 0;
 }


@@ -2058,8 +1406,7 @@ int CmdNorm(const char *Cmd)
 
        if (max != min) {
                for (i = 0; i < GraphTraceLen; ++i) {
 
        if (max != min) {
                for (i = 0; i < GraphTraceLen; ++i) {

-                       GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 /
-                               (max - min);
+                       GraphBuffer[i] = ((long)(GraphBuffer[i] - ((max + min) / 2)) * 256) / (max - min);

                                //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
                }
        }
                                //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
                }
        }


@@ -2108,37 +1455,42 @@ int CmdScale(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdDirectionalThreshold(const char *Cmd)
+int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down)

 {
 {

-       int8_t upThres = param_get8(Cmd, 0);
-       int8_t downThres = param_get8(Cmd, 1);
-
-       printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);
+       int lastValue = in[0];
+       out[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in.

 
 

-       int lastValue = GraphBuffer[0];
-       GraphBuffer[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in.
-
-       for (int i = 1; i < GraphTraceLen; ++i) {
+       for (int i = 1; i < len; ++i) {

                // Apply first threshold to samples heading up
                // Apply first threshold to samples heading up

-               if (GraphBuffer[i] >= upThres && GraphBuffer[i] > lastValue)
+               if (in[i] >= up && in[i] > lastValue)

                {
                {

-                       lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-                       GraphBuffer[i] = 127;
+                       lastValue = out[i]; // Buffer last value as we overwrite it.
+                       out[i] = 1;

                }
                // Apply second threshold to samples heading down
                }
                // Apply second threshold to samples heading down

-               else if (GraphBuffer[i] <= downThres && GraphBuffer[i] < lastValue)
+               else if (in[i] <= down && in[i] < lastValue)

                {
                {

-                       lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-                       GraphBuffer[i] = -127;
+                       lastValue = out[i]; // Buffer last value as we overwrite it.
+                       out[i] = -1;

                }
                else
                {
                }
                else
                {

-                       lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-                       GraphBuffer[i] = GraphBuffer[i-1];
-
+                       lastValue = out[i]; // Buffer last value as we overwrite it.
+                       out[i] = out[i-1];

                }
        }
                }
        }

-       GraphBuffer[0] = GraphBuffer[1]; // Aline with first edited sample.
+       out[0] = out[1]; // Align with first edited sample.
+       return 0;
+}
+
+int CmdDirectionalThreshold(const char *Cmd)
+{
+       int8_t upThres = param_get8(Cmd, 0);
+       int8_t downThres = param_get8(Cmd, 1);
+
+       printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);
+
+       directionalThreshold(GraphBuffer, GraphBuffer,GraphTraceLen, upThres, downThres);

        RepaintGraphWindow();
        return 0;
 }
        RepaintGraphWindow();
        return 0;
 }


@@ -2264,12 +1616,209 @@ int Cmdhex2bin(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

+       /* // example of FSK2 RF/50 Tones
+       static const int LowTone[]  = {
+       1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+       1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+       1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+       1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+       1,  1,  1,  1,  1, -1, -1, -1, -1, -1
+       };
+       static const int HighTone[] = {
+       1,  1,  1,  1,  1,     -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
+       1,  1,  1,  1,         -1, -1, -1, -1,
+       1,  1,  1,  1,         -1, -1, -1, -1,
+       1,  1,  1,  1,         -1, -1, -1, -1,
+       1,  1,  1,  1,         -1, -1, -1, -1,
+       1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
+       };
+       */
+void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
+       int i,j=0;
+       int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC)/2);
+       int Right_Modifier = (clk % LowToneFC) / 2;
+       //int HighToneMod = clk mod HighToneFC;
+       int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
+       int FCs_per_clk = clk/LowToneFC;
+       
+       // need to correctly split up the clock to field clocks.
+       // First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
+
+       // start with LowTone
+       // set extra 1 modifiers to make up for when FC doesn't divide evenly into Clk
+       for (i = 0; i < Left_Modifier; i++) {
+               LowTone[i] = 1;
+       }
+
+       // loop # of field clocks inside the main clock
+       for (i = 0; i < (FCs_per_clk); i++) {
+               // loop # of samples per field clock
+               for (j = 0; j < LowToneFC; j++) {
+                       LowTone[(i*LowToneFC)+Left_Modifier+j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+               }
+       }
+
+       int k;
+       // add last -1 modifiers
+       for (k = 0; k < Right_Modifier; k++) {
+               LowTone[((i-1)*LowToneFC)+Left_Modifier+j+k] = -1;
+       }
+
+       // now do hightone
+       Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC)/2);
+       Right_Modifier = (clk % HighToneFC) / 2;
+       LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC/2); //truncate
+       FCs_per_clk = clk/HighToneFC;
+
+       for (i = 0; i < Left_Modifier; i++) {
+               HighTone[i] = 1;
+       }
+
+       // loop # of field clocks inside the main clock
+       for (i = 0; i < (FCs_per_clk); i++) {
+               // loop # of samples per field clock
+               for (j = 0; j < HighToneFC; j++) {
+                       HighTone[(i*HighToneFC)+Left_Modifier+j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+               }
+       }
+
+       // add last -1 modifiers
+       for (k = 0; k < Right_Modifier; k++) {
+               PrintAndLog("(i-1)*HighToneFC+lm+j+k %i",((i-1)*HighToneFC)+Left_Modifier+j+k);
+               HighTone[((i-1)*HighToneFC)+Left_Modifier+j+k] = -1;
+       }
+       if (g_debugMode == 2) {
+               for ( i = 0; i < clk; i++) {
+                       PrintAndLog("Low: %i,  High: %i",LowTone[i],HighTone[i]);
+               }
+       }
+}
+
+//old CmdFSKdemod adapted by marshmellow 
+//converts FSK to clear NRZ style wave.  (or demodulates)
+int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
+       uint8_t ans=0;
+       if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
+               int firstClockEdge=0;
+               ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, false, &firstClockEdge);
+               if (g_debugMode > 1) {
+                       PrintAndLog     ("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
+               }
+       }
+       // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
+       if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC   < 4) {
+               if (g_debugMode > 1) {
+                       PrintAndLog     ("DEBUG FSKtoNRZ: no fsk clocks found");
+               }
+               return 0;
+       }
+       int LowTone[clk];
+       int HighTone[clk];
+       GetHiLoTone(LowTone, HighTone, clk, LowToneFC, HighToneFC);
+       
+       int i, j;
+
+       // loop through ([all samples] - clk)
+       for (i = 0; i < *dataLen - clk; ++i) {
+               int lowSum = 0, highSum = 0;
+
+               // sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
+               for (j = 0; j < clk; ++j) {
+                       lowSum += LowTone[j] * data[i+j];
+                       highSum += HighTone[j] * data[i + j];
+               }
+               // get abs( [average sample value per clk] * 100 )  (or a rolling average of sorts)
+               lowSum = abs(100 * lowSum / clk);
+               highSum = abs(100 * highSum / clk);
+               // save these back to buffer for later use
+               data[i] = (highSum << 16) | lowSum;
+       }
+
+       // now we have the abs( [average sample value per clk] * 100 ) for each tone
+       //   loop through again [all samples] - clk - 16  
+       //                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
+       for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
+               int lowTot = 0, highTot = 0;
+
+               // sum a field clock width of abs( [average sample values per clk] * 100) for each tone
+               for (j = 0; j < LowToneFC; ++j) {  //10 for fsk2
+                 lowTot += (data[i + j] & 0xffff);
+               }
+               for (j = 0; j < HighToneFC; j++) {  //8 for fsk2
+                 highTot += (data[i + j] >> 16);
+               }
+
+               // subtract the sum of lowTone averages by the sum of highTone averages as it 
+               //   and write back the new graph value 
+               data[i] = lowTot - highTot;
+       }
+       // update dataLen to what we put back to the data sample buffer
+       *dataLen -= (clk + LowToneFC);
+       return 0;
+}
+
+int usage_data_fsktonrz() {
+               PrintAndLog("Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
+               PrintAndLog("Options:        ");
+               PrintAndLog("       h            This help");
+               PrintAndLog("       c <clock>    enter the a clock (omit to autodetect)");
+               PrintAndLog("       l <fc_low>   enter a field clock (omit to autodetect)");
+               PrintAndLog("       f <fc_high>  enter a field clock (omit to autodetect)");
+               return 0;       
+}
+
+int CmdFSKToNRZ(const char *Cmd) {
+       // take clk, fc_low, fc_high 
+       //   blank = auto;
+       bool errors = false;
+       int clk = 0;
+       char cmdp = 0;
+       int fc_low = 10, fc_high = 8;
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_data_fsktonrz();
+               case 'C':
+               case 'c':
+                       clk = param_get32ex(Cmd, cmdp+1, 0, 10);
+                       cmdp += 2;
+                       break;
+               case 'F':
+               case 'f':
+                       fc_high = param_get32ex(Cmd, cmdp+1, 0, 10);
+                       cmdp += 2;
+                       break;
+               case 'L':
+               case 'l':
+                       fc_low = param_get32ex(Cmd, cmdp+1, 0, 10);
+                       cmdp += 2;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
+                       break;
+               }
+               if(errors) break;
+       }
+       //Validations
+       if(errors) return usage_data_fsktonrz();
+
+       setClockGrid(0,0);
+       DemodBufferLen = 0;
+       int ans = FSKToNRZ(GraphBuffer, &GraphTraceLen, clk, fc_low, fc_high);
+       CmdNorm("");
+       RepaintGraphWindow();
+       return ans;
+}
+
+

 static command_t CommandTable[] =
 {
        {"help",            CmdHelp,            1, "This help"},
        {"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
 static command_t CommandTable[] =
 {
        {"help",            CmdHelp,            1, "This help"},
        {"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},

-       {"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},
-       {"askvikingdemod",  CmdVikingDemod,     1, "Demodulate a Viking tag from GraphBuffer"},

        {"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
        {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
        {"bin2hex",         Cmdbin2hex,         1, "bin2hex <digits>     -- Converts binary to hexadecimal"},
        {"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
        {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
        {"bin2hex",         Cmdbin2hex,         1, "bin2hex <digits>     -- Converts binary to hexadecimal"},


@@ -2277,13 +1826,7 @@ static command_t CommandTable[] =
        {"buffclear",       CmdBuffClear,       1, "Clear sample buffer and graph window"},
        {"dec",             CmdDec,             1, "Decimate samples"},
        {"detectclock",     CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
        {"buffclear",       CmdBuffClear,       1, "Clear sample buffer and graph window"},
        {"dec",             CmdDec,             1, "Decimate samples"},
        {"detectclock",     CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},

-       {"fdxbdemod",       CmdFDXBdemodBI    , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
-       {"fskawiddemod",    CmdFSKdemodAWID,    1, "Demodulate an AWID FSK tag from GraphBuffer"},
-       //{"fskfcdetect",   CmdFSKfcDetect,     1, "Try to detect the Field Clock of an FSK wave"},
-       {"fskhiddemod",     CmdFSKdemodHID,     1, "Demodulate a HID FSK tag from GraphBuffer"},
-       {"fskiodemod",      CmdFSKdemodIO,      1, "Demodulate an IO Prox FSK tag from GraphBuffer"},
-       {"fskpyramiddemod", CmdFSKdemodPyramid, 1, "Demodulate a Pyramid FSK tag from GraphBuffer"},
-       {"fskparadoxdemod", CmdFSKdemodParadox, 1, "Demodulate a Paradox FSK tag from GraphBuffer"},
+       {"fsktonrz",        CmdFSKToNRZ,        1, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},

        {"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
        {"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
        {"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
        {"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
        {"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
        {"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},


@@ -2298,8 +1841,6 @@ static command_t CommandTable[] =
        {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
        {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
        {"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
        {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
        {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
        {"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},

-       {"pskindalademod",  CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},
-       {"psknexwatchdemod",CmdPSKNexWatch,     1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},

        {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
        {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
        {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
        {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
        {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
        {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},