ADD: `analyse nuid` - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1...

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 910b2af4e65a1b2809819ff8d68d1db34bc6d7c2..797bce40638e805cbffd55ec43a7da312b52b187 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -7,29 +7,33 @@
 //-----------------------------------------------------------------------------
 // Low frequency demod/decode commands
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Low frequency demod/decode commands
 //-----------------------------------------------------------------------------

-
-#include <stdlib.h>

 #include "lfdemod.h"
 #include "lfdemod.h"

-#include <string.h>

 
 //un_comment to allow debug print calls when used not on device
 void dummy(char *fmt, ...){}
 
 //un_comment to allow debug print calls when used not on device
 void dummy(char *fmt, ...){}

+void dummy_sgc (int clock, int startidx) {}

 
 #ifndef ON_DEVICE
 
 #ifndef ON_DEVICE

-#include "ui.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#define prnt PrintAndLog
+# include "ui.h"                // plotclock, plotclockstartindex
+# include "cmdparser.h"
+# include "cmddata.h"
+# define prnt PrintAndLog
+# define sgc SetGraphClock
+void SetGraphClock(int clock, int startidx){
+       PlotClock = clock;
+       PlockClockStartIndex = startidx;        
+}

 #else 
 #else 

-       uint8_t g_debugMode=0;
-#define prnt dummy
+  uint8_t g_debugMode = 0;
+# define prnt dummy
+# define sgc dummy_sgc

 #endif
 
 //test samples are not just noise
 uint8_t justNoise(uint8_t *bits, size_t size) {
        #define THRESHOLD 123
        uint8_t val = 1;
 #endif
 
 //test samples are not just noise
 uint8_t justNoise(uint8_t *bits, size_t size) {
        #define THRESHOLD 123
        uint8_t val = 1;

-       for(size_t idx=0; idx < size && val ;idx++)
+       for(size_t idx = 0; idx < size && val; idx++)

                val = bits[idx] < THRESHOLD;
        return val;
 }
                val = bits[idx] < THRESHOLD;
        return val;
 }


@@ -60,7 +64,7 @@ uint8_t parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType)
        for (uint8_t i = 0; i < bitLen; i++){
                ans ^= ((bits >> i) & 1);
        }
        for (uint8_t i = 0; i < bitLen; i++){
                ans ^= ((bits >> i) & 1);
        }

-       //prnt("DEBUG: ans: %d, ptype: %d",ans,pType);
+       if (g_debugMode) prnt("DEBUG: ans: %d, ptype: %d, bits: %08X",ans,pType,bits);

        return (ans == pType);
 }
 
        return (ans == pType);
 }
 


@@ -76,6 +80,8 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
                        parityWd = (parityWd << 1) | BitStream[startIdx+word+bit];
                        BitStream[j++] = (BitStream[startIdx+word+bit]);
                }
                        parityWd = (parityWd << 1) | BitStream[startIdx+word+bit];
                        BitStream[j++] = (BitStream[startIdx+word+bit]);
                }

+               if (word+pLen > bLen) break;
+

                j--; // overwrite parity with next data
                // if parity fails then return 0
                switch (pType) {
                j--; // overwrite parity with next data
                // if parity fails then return 0
                switch (pType) {


@@ -141,72 +147,112 @@ uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits)
        return num;
 }
 
        return num;
 }
 

+//by marshmellow
+// search for given preamble in given BitStream and return success=1 or fail=0 and startIndex (where it was found)
+bool preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx){
+       return preambleSearchEx(BitStream, preamble, pLen, size, startIdx, false);
+}

 //by marshmellow
 //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex and length
 //by marshmellow
 //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex and length

-uint8_t preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx)
+// param @findone:  look for a repeating preamble or only the first.
+// em4x05/4x69 only sends preamble once, so look for it once in the first pLen bits
+bool preambleSearchEx(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone)

 {
        // Sanity check.  If preamble length is bigger than bitstream length.
 {
        // Sanity check.  If preamble length is bigger than bitstream length.

-       if ( *size <= pLen ) return 0;
+       if ( *size <= pLen ) return false;

        
        uint8_t foundCnt = 0;
        for (int idx = 0; idx < *size - pLen; idx++){
                if (memcmp(BitStream+idx, preamble, pLen) == 0){
        
        uint8_t foundCnt = 0;
        for (int idx = 0; idx < *size - pLen; idx++){
                if (memcmp(BitStream+idx, preamble, pLen) == 0){

+                       if (g_debugMode) prnt("DEBUG: preamble found at %i", idx);

                        //first index found
                        foundCnt++;
                        if (foundCnt == 1){
                                *startIdx = idx;
                        //first index found
                        foundCnt++;
                        if (foundCnt == 1){
                                *startIdx = idx;

+                               if (findone) return true;

                        }
                        if (foundCnt == 2){
                                *size = idx - *startIdx;
                        }
                        if (foundCnt == 2){
                                *size = idx - *startIdx;

-                               return 1;
+                               return true;

                        }
                }
        }
                        }
                }
        }

-       return 0;
+       return false;
+}
+
+// find start of modulating data (for fsk and psk) in case of beginning noise or slow chip startup.
+size_t findModStart(uint8_t dest[], size_t size, uint8_t threshold_value, uint8_t expWaveSize) {
+       size_t i = 0;
+       size_t waveSizeCnt = 0;
+       uint8_t thresholdCnt = 0;
+       bool isAboveThreshold = dest[i++] >= threshold_value;
+       for (; i < size-20; i++ ) {
+               if(dest[i] < threshold_value && isAboveThreshold) {
+                       thresholdCnt++;
+                       if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;                     
+                       isAboveThreshold = false;
+                       waveSizeCnt = 0;
+               } else if (dest[i] >= threshold_value && !isAboveThreshold) {
+                       thresholdCnt++;
+                       if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;                     
+                       isAboveThreshold = true;
+                       waveSizeCnt = 0;
+               } else {
+                       waveSizeCnt++;
+               }
+               if (thresholdCnt > 10) break;
+       }
+       if (g_debugMode == 2) prnt("DEBUG: threshold Count reached at %u, count: %u",i, thresholdCnt);
+       return i;

 }
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID
 }
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID

+// actually, no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future

 int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo)
 {
 int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo)
 {

-       //no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future
-       //  otherwise could be a void with no arguments
-       //set defaults
-       uint32_t i = 0;
-       if (BitStream[1]>1) return -1;  //allow only 1s and 0s
-
-       // 111111111 bit pattern represent start of frame
-       //  include 0 in front to help get start pos
-       uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
-       uint32_t idx = 0;
-       uint32_t parityBits = 0;
-       uint8_t errChk = 0;
-       uint8_t FmtLen = 10;
+       // sanity check
+       if (*size < 64) return -3;      
+       if (BitStream[1] > 1) return -1; 
+       
+       uint8_t fmtlen;

        *startIdx = 0;
        *startIdx = 0;

-       errChk = preambleSearch(BitStream, preamble, sizeof(preamble), size, startIdx);
-       if (errChk == 0 ) return -4;
-       if (*size < 64) return -3;
-       if (*size > 64) FmtLen = 22;
-       *startIdx += 1; //get rid of 0 from preamble
-       idx = *startIdx + 9;
-       for (i=0; i<FmtLen; i++){ //loop through 10 or 22 sets of 5 bits (50-10p = 40 bits or 88 bits)
-               parityBits = bytebits_to_byte(BitStream+(i*5)+idx,5);
-               //check even parity - quit if failed
-               if (parityTest(parityBits, 5, 0) == 0) return -5;
-               //set uint64 with ID from BitStream
-               for (uint8_t ii=0; ii<4; ii++){
-                       *hi = (*hi << 1) | (*lo >> 63);
-                       *lo = (*lo << 1) | (BitStream[(i*5)+ii+idx]);
-               }
+       
+       // preamble 0111111111
+       // include 0 in front to help get start pos
+       uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
+       if (!preambleSearch(BitStream, preamble, sizeof(preamble), size, startIdx))
+               return -2;
+
+       //XL and normal size.
+       if (*size != 64 && *size != 128) return -3;
+       
+       fmtlen = (*size == 128) ? 22 : 10;
+
+       //skip last 4bit parity row for simplicity
+       *size = removeParity(BitStream, *startIdx + sizeof(preamble), 5, 0, fmtlen * 5);  
+       
+       switch (*size) {
+          case 40: { 
+           // std em410x format
+               *hi = 0;
+               *lo = ((uint64_t)(bytebits_to_byte(BitStream, 8)) << 32) | (bytebits_to_byte(BitStream + 8, 32));
+               break;
+           } 
+           case 88:  { 
+           // long em format
+               *hi = (bytebits_to_byte(BitStream, 24)); 
+               *lo = ((uint64_t)(bytebits_to_byte(BitStream + 24, 32)) << 32) | (bytebits_to_byte(BitStream + 24 + 32, 32));
+               break;
+           } 
+           default: return -4; 

        }
        }

-       if (errChk != 0) return 1;
-       //skip last 5 bit parity test for simplicity.
-       // *size = 64 | 128;
-       return 0;
+       return 1;

 }
 
 //by marshmellow
 //demodulates strong heavily clipped samples
 }
 
 //by marshmellow
 //demodulates strong heavily clipped samples

+//RETURN: num of errors.  if 0, is ok.

 int cleanAskRawDemod(uint8_t *BinStream, size_t *size, int clk, int invert, int high, int low)
 {
        size_t bitCnt=0, smplCnt=0, errCnt=0;
 int cleanAskRawDemod(uint8_t *BinStream, size_t *size, int clk, int invert, int high, int low)
 {
        size_t bitCnt=0, smplCnt=0, errCnt=0;


@@ -283,6 +329,8 @@ int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr
        if (amp==1) askAmp(BinStream, *size);
        if (g_debugMode==2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
 
        if (amp==1) askAmp(BinStream, *size);
        if (g_debugMode==2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
 

+       sgc(*clk, start);
+               

        uint8_t initLoopMax = 255;
        if (initLoopMax > *size) initLoopMax = *size;
        // Detect high and lows
        uint8_t initLoopMax = 255;
        if (initLoopMax > *size) initLoopMax = *size;
        // Detect high and lows


@@ -349,25 +397,30 @@ int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt

-int manrawdecode(uint8_t * BitStream, size_t *size, uint8_t invert){
+int manrawdecode(uint8_t *BitStream, size_t *size, uint8_t invert){
+
+       // sanity check
+       if (*size < 16) return -1;
+       

        int errCnt = 0, bestErr = 1000;
        uint16_t bitnum = 0, MaxBits = 512, bestRun = 0;
        size_t i, k;
        int errCnt = 0, bestErr = 1000;
        uint16_t bitnum = 0, MaxBits = 512, bestRun = 0;
        size_t i, k;

-       if (*size < 16) return -1;
+

        //find correct start position [alignment]
        //find correct start position [alignment]

-       for (k=0; k < 2; ++k){
-               for (i=k; i<*size-3; i += 2)
+       for (k = 0; k < 2; ++k){
+               for (i = k; i < *size-3; i += 2) {

                        if (BitStream[i] == BitStream[i+1])
                                errCnt++;
                        if (BitStream[i] == BitStream[i+1])
                                errCnt++;

-
+               }

                if (bestErr > errCnt){
                        bestErr = errCnt;
                        bestRun = k;
                }
                if (bestErr > errCnt){
                        bestErr = errCnt;
                        bestRun = k;
                }

-               errCnt=0;
+               errCnt = 0;

        }
        }

+       

        //decode
        //decode

-       for (i=bestRun; i < *size-3; i += 2){
+       for (i = bestRun; i < *size-3; i += 2){

                if (BitStream[i] == 1 && (BitStream[i+1] == 0)){
                        BitStream[bitnum++] = invert;
                } else if ((BitStream[i] == 0) && BitStream[i+1] == 1){
                if (BitStream[i] == 1 && (BitStream[i+1] == 0)){
                        BitStream[bitnum++] = invert;
                } else if ((BitStream[i] == 0) && BitStream[i+1] == 1){


@@ -375,9 +428,9 @@ int manrawdecode(uint8_t * BitStream, size_t *size, uint8_t invert){
                } else {
                        BitStream[bitnum++] = 7;
                }
                } else {
                        BitStream[bitnum++] = 7;
                }

-               if (bitnum>MaxBits) break;
+               if (bitnum > MaxBits) break;

        }
        }

-       *size=bitnum;
+       *size = bitnum;

        return bestErr;
 }
 
        return bestErr;
 }
 


@@ -456,9 +509,11 @@ int gProxII_Demod(uint8_t BitStream[], size_t *size)
        size_t startIdx=0;
        uint8_t preamble[] = {1,1,1,1,1,0};
 
        size_t startIdx=0;
        uint8_t preamble[] = {1,1,1,1,1,0};
 

-       uint8_t errChk = preambleSearch(BitStream, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -3; //preamble not found
+       if (!preambleSearch(BitStream, preamble, sizeof(preamble), size, &startIdx)) 
+               return -3; //preamble not found
+

        if (*size != 96) return -2; //should have found 96 bits
        if (*size != 96) return -2; //should have found 96 bits

+       

        //check first 6 spacer bits to verify format
        if (!BitStream[startIdx+5] && !BitStream[startIdx+10] && !BitStream[startIdx+15] && !BitStream[startIdx+20] && !BitStream[startIdx+25] && !BitStream[startIdx+30]){
                //confirmed proper separator bits found
        //check first 6 spacer bits to verify format
        if (!BitStream[startIdx+5] && !BitStream[startIdx+10] && !BitStream[startIdx+15] && !BitStream[startIdx+20] && !BitStream[startIdx+25] && !BitStream[startIdx+30]){
                //confirmed proper separator bits found


@@ -473,7 +528,6 @@ size_t fsk_wave_demod(uint8_t * dest, size_t size, uint8_t fchigh, uint8_t fclow
 {
        size_t last_transition = 0;
        size_t idx = 1;
 {
        size_t last_transition = 0;
        size_t idx = 1;

-       //uint32_t maxVal=0;

        if (fchigh==0) fchigh=10;
        if (fclow==0) fclow=8;
        //set the threshold close to 0 (graph) or 128 std to avoid static
        if (fchigh==0) fchigh=10;
        if (fclow==0) fclow=8;
        //set the threshold close to 0 (graph) or 128 std to avoid static


@@ -481,19 +535,22 @@ size_t fsk_wave_demod(uint8_t * dest, size_t size, uint8_t fchigh, uint8_t fclow
        size_t preLastSample = 0;
        size_t LastSample = 0;
        size_t currSample = 0;
        size_t preLastSample = 0;
        size_t LastSample = 0;
        size_t currSample = 0;

-       // sync to first lo-hi transition, and threshold
+       if ( size < 1024 ) return 0; // not enough samples
+
+       //find start of modulating data in trace 
+       idx = findModStart(dest, size, threshold_value, fchigh);

 
        // Need to threshold first sample
 
        // Need to threshold first sample

-       // skip 160 samples to allow antenna/samples to settle
-       if(dest[160] < threshold_value) dest[0] = 0;
+       if(dest[idx] < threshold_value) dest[0] = 0;

        else dest[0] = 1;
        else dest[0] = 1;

+       idx++;

 
        size_t numBits = 0;
        // count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
        // or 10 (fc/10) cycles but in practice due to noise etc we may end up with anywhere
        // between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
        //  (could also be fc/5 && fc/7 for fsk1 = 4-9)
 
        size_t numBits = 0;
        // count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
        // or 10 (fc/10) cycles but in practice due to noise etc we may end up with anywhere
        // between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
        //  (could also be fc/5 && fc/7 for fsk1 = 4-9)

-       for(idx = 161; idx < size-20; idx++) {
+       for(; idx < size-20; idx++) {

                // threshold current value
 
                if (dest[idx] < threshold_value) dest[idx] = 0;
                // threshold current value
 
                if (dest[idx] < threshold_value) dest[idx] = 0;


@@ -508,13 +565,14 @@ size_t fsk_wave_demod(uint8_t * dest, size_t size, uint8_t fchigh, uint8_t fclow
                                //do nothing with extra garbage
                        } else if (currSample < (fchigh-1)) {           //6-8 = 8 sample waves  (or 3-6 = 5)
                                //correct previous 9 wave surrounded by 8 waves (or 6 surrounded by 5)
                                //do nothing with extra garbage
                        } else if (currSample < (fchigh-1)) {           //6-8 = 8 sample waves  (or 3-6 = 5)
                                //correct previous 9 wave surrounded by 8 waves (or 6 surrounded by 5)

-                               if (LastSample > (fchigh-2) && (preLastSample < (fchigh-1) || preLastSample     == 0 )){
+                               if (LastSample > (fchigh-2) && (preLastSample < (fchigh-1))){

                                        dest[numBits-1]=1;
                                }
                                dest[numBits++]=1;
 
                                        dest[numBits-1]=1;
                                }
                                dest[numBits++]=1;
 

-                       } else if (currSample > (fchigh) && !numBits) { //12 + and first bit = unusable garbage 
-                               //do nothing with beginning garbage
+                       } else if (currSample > (fchigh+1) && numBits < 3) { //12 + and first two bit = unusable garbage
+                               //do nothing with beginning garbage and reset..  should be rare..
+                               numBits = 0; 

                        } else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
                                dest[numBits++]=1;
                        } else {                                        //9+ = 10 sample waves (or 6+ = 7)
                        } else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
                                dest[numBits++]=1;
                        } else {                                        //9+ = 10 sample waves (or 6+ = 7)


@@ -588,9 +646,8 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
        if (*size < 96*2) return -2;
        // 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
        uint8_t preamble[] = {0,0,0,1,1,1,0,1};
        if (*size < 96*2) return -2;
        // 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
        uint8_t preamble[] = {0,0,0,1,1,1,0,1};

-       // find bitstring in array  
-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -3; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+               return -3; //preamble not found

 
        numStart = startIdx + sizeof(preamble);
        // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
 
        numStart = startIdx + sizeof(preamble);
        // final loop, go over previously decoded FSK data and manchester decode into usable tag ID


@@ -622,9 +679,8 @@ int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, ui
 
        // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
        uint8_t preamble[] = {0,0,0,0,1,1,1,1};
 
        // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
        uint8_t preamble[] = {0,0,0,0,1,1,1,1};

-
-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -3; //preamble not found
+       if (preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+               return -3; //preamble not found

 
        numStart = startIdx + sizeof(preamble);
        // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
 
        numStart = startIdx + sizeof(preamble);
        // final loop, go over previously decoded FSK data and manchester decode into usable tag ID


@@ -661,8 +717,8 @@ int IOdemodFSK(uint8_t *dest, size_t size)
        //Handle the data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,1};
        //Handle the data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,1};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), &size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
+       if (! preambleSearch(dest, preamble, sizeof(preamble), &size, &startIdx))
+               return -4; //preamble not found

 
        if (!dest[startIdx+8] && dest[startIdx+17]==1 && dest[startIdx+26]==1 && dest[startIdx+35]==1 && dest[startIdx+44]==1 && dest[startIdx+53]==1){
                //confirmed proper separator bits found
 
        if (!dest[startIdx+8] && dest[startIdx+17]==1 && dest[startIdx+26]==1 && dest[startIdx+35]==1 && dest[startIdx+44]==1 && dest[startIdx+53]==1){
                //confirmed proper separator bits found


@@ -679,8 +735,9 @@ int VikingDemod_AM(uint8_t *dest, size_t *size) {
        if (*size < 64*2) return -2;
        size_t startIdx = 0;
        uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        if (*size < 64*2) return -2;
        size_t startIdx = 0;
        uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+               return -4; //preamble not found
+       

        uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^ 
                                                 bytebits_to_byte(dest+startIdx+8,8) ^ 
                                                 bytebits_to_byte(dest+startIdx+16,8) ^ 
        uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^ 
                                                 bytebits_to_byte(dest+startIdx+8,8) ^ 
                                                 bytebits_to_byte(dest+startIdx+16,8) ^ 


@@ -701,8 +758,8 @@ int Visa2kDemod_AM(uint8_t *dest, size_t *size) {
        if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};
        if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -2; //preamble not found

        if (*size != 96) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;
        if (*size != 96) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;


@@ -713,8 +770,8 @@ int NoralsyDemod_AM(uint8_t *dest, size_t *size) {
        if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
        if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -2; //preamble not found

        if (*size != 96) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;
        if (*size != 96) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;


@@ -724,8 +781,8 @@ int PrescoDemod(uint8_t *dest, size_t *size) {
        if (*size < 128*2) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,1,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0};
        if (*size < 128*2) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,1,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -2; //preamble not found

        if (*size != 128) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;
        if (*size != 128) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;


@@ -737,8 +794,8 @@ int FDXBdemodBI(uint8_t *dest, size_t *size) {
        if (*size < 128*2) return -1;   //make sure buffer has enough data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
        if (*size < 128*2) return -1;   //make sure buffer has enough data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -2; //preamble not found

        if (*size != 128) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;
        if (*size != 128) return -3; //wrong demoded size
        //return start position
        return (int)startIdx;


@@ -752,8 +809,8 @@ int JablotronDemod(uint8_t *dest, size_t *size){
        if (*size < 64*2) return -1;    //make sure buffer has enough data
        size_t startIdx = 0;
        uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
        if (*size < 64*2) return -1;    //make sure buffer has enough data
        size_t startIdx = 0;
        uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+               return -2; //preamble not found

        if (*size != 64) return -3; // wrong demoded size
        
        uint8_t checkchksum = 0;
        if (*size != 64) return -3; // wrong demoded size
        
        uint8_t checkchksum = 0;


@@ -781,8 +838,8 @@ int AWIDdemodFSK(uint8_t *dest, size_t *size)
 
        uint8_t preamble[] = {0,0,0,0,0,0,0,1};
        size_t startIdx = 0;
 
        uint8_t preamble[] = {0,0,0,0,0,0,0,1};
        size_t startIdx = 0;

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -4; //preamble not found

        if (*size != 96) return -5;
        return (int)startIdx;
 }
        if (*size != 96) return -5;
        return (int)startIdx;
 }


@@ -800,11 +857,10 @@ int PyramiddemodFSK(uint8_t *dest, size_t *size)
        // FSK demodulator
        *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
        if (*size < 128) return -2;  //did we get a good demod?
        // FSK demodulator
        *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
        if (*size < 128) return -2;  //did we get a good demod?

-
-       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};

        size_t startIdx = 0;
        size_t startIdx = 0;

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
+       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -4; //preamble not found

        if (*size != 128) return -3;
        return (int)startIdx;
 }
        if (*size != 128) return -3;
        return (int)startIdx;
 }


@@ -817,8 +873,8 @@ int NedapDemod(uint8_t *dest, size_t *size) {
        size_t startIdx = 0;
        //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
        uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
        size_t startIdx = 0;
        //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
        uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -4; //preamble not found

        return (int) startIdx;
 }
 
        return (int) startIdx;
 }
 


@@ -829,8 +885,8 @@ int IdteckDemodPSK(uint8_t *dest, size_t *size) {
        if (*size < 64*2) return -1;    
        size_t startIdx = 0;
        uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
        if (*size < 64*2) return -1;    
        size_t startIdx = 0;
        uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};

-       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -2; //preamble not found
+       if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+               return -2; //preamble not found

        if (*size != 64) return -3; // wrong demoded size
        return (int) startIdx;
 }
        if (*size != 64) return -3; // wrong demoded size
        return (int) startIdx;
 }


@@ -857,13 +913,14 @@ uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, uint8_t high, uint8_t lo
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low

-int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low)
+int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low, int *clock)

 {
 {

-       uint8_t fndClk[] = {8,16,32,40,50,64,128};
+       uint8_t clocks[] = {8,16,32,40,50,64,128};

        size_t startwave;
        size_t i = 100;
        size_t minClk = 255;
        size_t startwave;
        size_t i = 100;
        size_t minClk = 255;

-               // get to first full low to prime loop and skip incomplete first pulse
+       int shortestWaveIdx = 0;
+       // get to first full low to prime loop and skip incomplete first pulse

        while ((dest[i] < high) && (i < size))
                ++i;
        while ((dest[i] > low) && (i < size))
        while ((dest[i] < high) && (i < size))
                ++i;
        while ((dest[i] > low) && (i < size))


@@ -880,14 +937,18 @@ int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low)
                while ((dest[i] > low) && (i < size))
                        ++i;
                //get minimum measured distance
                while ((dest[i] > low) && (i < size))
                        ++i;
                //get minimum measured distance

-               if (i-startwave < minClk && i < size)
+               if (i-startwave < minClk && i < size) {

                        minClk = i - startwave;
                        minClk = i - startwave;

+                       shortestWaveIdx = startwave;
+               }

        }
        // set clock
        if (g_debugMode==2) prnt("DEBUG ASK: detectstrongASKclk smallest wave: %d",minClk);
        for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
        }
        // set clock
        if (g_debugMode==2) prnt("DEBUG ASK: detectstrongASKclk smallest wave: %d",minClk);
        for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {

-               if (minClk >= fndClk[clkCnt]-(fndClk[clkCnt]/8) && minClk <= fndClk[clkCnt]+1)
-                       return fndClk[clkCnt];
+               if (minClk >= clocks[clkCnt]-(clocks[clkCnt]/8) && minClk <= clocks[clkCnt]+1) {
+                       *clock = clocks[clkCnt];
+                       return shortestWaveIdx;
+               }

        }
        return 0;
 }
        }
        return 0;
 }


@@ -898,15 +959,15 @@ int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low)
 // return start index of best starting position for that clock and return clock (by reference)
 int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
 {
 // return start index of best starting position for that clock and return clock (by reference)
 int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
 {

-       size_t i=1;
+       size_t i = 1;

        uint8_t clk[] = {255,8,16,32,40,50,64,100,128,255};
        uint8_t clkEnd = 9;
        uint8_t loopCnt = 255;  //don't need to loop through entire array...
        uint8_t clk[] = {255,8,16,32,40,50,64,100,128,255};
        uint8_t clkEnd = 9;
        uint8_t loopCnt = 255;  //don't need to loop through entire array...

-       if (size <= loopCnt+60) return -1; //not enough samples
+       if (size <= loopCnt + 60) return -1; //not enough samples

        size -= 60; //sometimes there is a strange end wave - filter out this....
        //if we already have a valid clock
        size -= 60; //sometimes there is a strange end wave - filter out this....
        //if we already have a valid clock

-       uint8_t clockFnd=0;
-       for (;i<clkEnd;++i)
+       uint8_t clockFnd = 0;
+       for (; i < clkEnd; ++i)

                if (clk[i] == *clock) clockFnd = i;
                //clock found but continue to find best startpos
 
                if (clk[i] == *clock) clockFnd = i;
                //clock found but continue to find best startpos
 


@@ -917,15 +978,10 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
        //test for large clean peaks
        if (!clockFnd){
                if (DetectCleanAskWave(dest, size, peak, low)==1){
        //test for large clean peaks
        if (!clockFnd){
                if (DetectCleanAskWave(dest, size, peak, low)==1){

-                       int ans = DetectStrongAskClock(dest, size, peak, low);
-                       if (g_debugMode==2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %d",ans);
-                       for (i=clkEnd-1; i>0; i--){
-                               if (clk[i] == ans) {
-                                       *clock = ans;
-                                       //clockFnd = i;
-                                       return 0;  // for strong waves i don't use the 'best start position' yet...
-                                       //break; //clock found but continue to find best startpos [not yet]
-                               }
+                       int ans = DetectStrongAskClock(dest, size, peak, low, clock);
+                       if (g_debugMode==2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", clock ,ans);
+                       if (ans > 0){
+                                       return ans;  // return shortest wave start pos

                        }
                }
        }
                        }
                }
        }


@@ -936,15 +992,15 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
        size_t errCnt = 0;
        size_t arrLoc, loopEnd;
 
        size_t errCnt = 0;
        size_t arrLoc, loopEnd;
 

-       if (clockFnd>0) {
+       if (clockFnd > 0) {

                clkCnt = clockFnd;
                clkEnd = clockFnd+1;
        } else {
                clkCnt = clockFnd;
                clkEnd = clockFnd+1;
        } else {

-               clkCnt=1;
+               clkCnt = 1;

        }
 
        //test each valid clock from smallest to greatest to see which lines up
        }
 
        //test each valid clock from smallest to greatest to see which lines up

-       for(; clkCnt < clkEnd; clkCnt++) {
+       for (; clkCnt < clkEnd; clkCnt++) {

                if (clk[clkCnt] <= 32) {
                        tol=1;
                } else {
                if (clk[clkCnt] <= 32) {
                        tol=1;
                } else {


@@ -999,35 +1055,42 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
                if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
        }
        if (!clockFnd) *clock = clk[best];
                if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
        }
        if (!clockFnd) *clock = clk[best];

+       

        return bestStart[best];
 }
 
        return bestStart[best];
 }
 

+int DetectPSKClock(uint8_t dest[], size_t size, int clock) {
+       int firstPhaseShift = 0;
+       return DetectPSKClock_ext(dest, size, clock, &firstPhaseShift);
+}
+

 //by marshmellow
 //detect psk clock by reading each phase shift
 // a phase shift is determined by measuring the sample length of each wave
 //by marshmellow
 //detect psk clock by reading each phase shift
 // a phase shift is determined by measuring the sample length of each wave

-int DetectPSKClock(uint8_t dest[], size_t size, int clock)
-{
-       uint8_t clk[]={255,16,32,40,50,64,100,128,255}; //255 is not a valid clock
+int DetectPSKClock_ext(uint8_t dest[], size_t size, int clock, int *firstPhaseShift) {
+       uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock

        uint16_t loopCnt = 4096;  //don't need to loop through entire array...
        uint16_t loopCnt = 4096;  //don't need to loop through entire array...

-       if (size == 0) return 0;
-       if (size<loopCnt) loopCnt = size-20;

 
        //if we already have a valid clock quit
        size_t i=1;
        for (; i < 8; ++i)
                if (clk[i] == clock) return clock;
 
 
        //if we already have a valid clock quit
        size_t i=1;
        for (; i < 8; ++i)
                if (clk[i] == clock) return clock;
 

+       if (size < 160+20) return 0;
+       // size must be larger than 20 here, and 160 later on.
+       if (size < loopCnt) loopCnt = size-20;  
+

        size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
        uint8_t clkCnt, fc=0, fullWaveLen=0, tol=1;
        uint16_t peakcnt=0, errCnt=0, waveLenCnt=0;
        size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
        uint8_t clkCnt, fc=0, fullWaveLen=0, tol=1;
        uint16_t peakcnt=0, errCnt=0, waveLenCnt=0;

-       uint16_t bestErr[]={1000,1000,1000,1000,1000,1000,1000,1000,1000};
-       uint16_t peaksdet[]={0,0,0,0,0,0,0,0,0};
+       uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
+       uint16_t peaksdet[] = {0,0,0,0,0,0,0,0,0};

        fc = countFC(dest, size, 0);
        if (fc!=2 && fc!=4 && fc!=8) return -1;
        if (g_debugMode==2) prnt("DEBUG PSK: FC: %d",fc);
 
        //find first full wave
        fc = countFC(dest, size, 0);
        if (fc!=2 && fc!=4 && fc!=8) return -1;
        if (g_debugMode==2) prnt("DEBUG PSK: FC: %d",fc);
 
        //find first full wave

-       for (i=160; i<loopCnt; i++){
+       for (i=160; i < loopCnt; i++){

                if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
                        if (waveStart == 0) {
                                waveStart = i+1;
                if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
                        if (waveStart == 0) {
                                waveStart = i+1;


@@ -1045,10 +1108,11 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock)
                        }
                }
        }
                        }
                }
        }

-       if (g_debugMode ==2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);
+       *firstPhaseShift = firstFullWave;
+       if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);

        
        //test each valid clock from greatest to smallest to see which lines up
        
        //test each valid clock from greatest to smallest to see which lines up

-       for(clkCnt=7; clkCnt >= 1 ; clkCnt--){
+       for (clkCnt=7; clkCnt >= 1 ; clkCnt--){

                lastClkBit = firstFullWave; //set end of wave as clock align
                waveStart = 0;
                errCnt=0;
                lastClkBit = firstFullWave; //set end of wave as clock align
                waveStart = 0;
                errCnt=0;


@@ -1082,19 +1146,17 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock)
                                }
                        }
                }
                                }
                        }
                }

-               if (errCnt == 0){
-                       return clk[clkCnt];
-               }
-               if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt]=errCnt;
-               if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt]=peakcnt;
+               if (errCnt == 0) return clk[clkCnt];
+               if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt;
+               if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt;

        } 
        //all tested with errors 
        //return the highest clk with the most peaks found
        } 
        //all tested with errors 
        //return the highest clk with the most peaks found

-       uint8_t best=7;
-       for (i=7; i>=1; i--){
-               if (peaksdet[i] > peaksdet[best]) {
+       uint8_t best = 7;
+       for (i=7; i >= 1; i--){
+               if (peaksdet[i] > peaksdet[best])

                        best = i;
                        best = i;

-               }
+

                if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
        }
        return clk[best];
                if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
        }
        return clk[best];


@@ -1129,18 +1191,25 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low){
        return lowestTransition;
 }
 
        return lowestTransition;
 }
 

+int DetectNRZClock(uint8_t dest[], size_t size, int clock) {
+       int bestStart = 0;
+       return DetectNRZClock_ext(dest, size, clock, &bestStart);
+}
+

 //by marshmellow
 //detect nrz clock by reading #peaks vs no peaks(or errors)
 //by marshmellow
 //detect nrz clock by reading #peaks vs no peaks(or errors)

-int DetectNRZClock(uint8_t dest[], size_t size, int clock)
-{
-       size_t i=0;
-       uint8_t clk[]={8,16,32,40,50,64,100,128,255};
+int DetectNRZClock_ext(uint8_t dest[], size_t size, int clock, int *clockStartIdx) {
+       size_t i = 0;
+       uint8_t clk[] = {8,16,32,40,50,64,100,128,255};

        size_t loopCnt = 4096;  //don't need to loop through entire array...
        size_t loopCnt = 4096;  //don't need to loop through entire array...

-       if (size == 0) return 0;
-       if (size<loopCnt) loopCnt = size-20;
+

        //if we already have a valid clock quit
        for (; i < 8; ++i)
                if (clk[i] == clock) return clock;
        //if we already have a valid clock quit
        for (; i < 8; ++i)
                if (clk[i] == clock) return clock;

+       
+       if (size < 20) return 0;
+       // size must be larger than 20 here
+       if (size < loopCnt) loopCnt = size-20;

 
        //get high and low peak
        int peak, low;
 
        //get high and low peak
        int peak, low;


@@ -1161,7 +1230,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
                        if (!firstpeak) continue;
                        smplCnt++;
                } else {
                        if (!firstpeak) continue;
                        smplCnt++;
                } else {

-                       firstpeak=true;
+                       firstpeak = true;

                        if (smplCnt > 6 ){
                                if (maxPeak > smplCnt){
                                        maxPeak = smplCnt;
                        if (smplCnt > 6 ){
                                if (maxPeak > smplCnt){
                                        maxPeak = smplCnt;


@@ -1169,7 +1238,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
                                }
                                peakcnt++;
                                //prnt("maxPk: %d, smplCnt: %d, peakcnt: %d",maxPeak,smplCnt,peakcnt);
                                }
                                peakcnt++;
                                //prnt("maxPk: %d, smplCnt: %d, peakcnt: %d",maxPeak,smplCnt,peakcnt);

-                               smplCnt=0;
+                               smplCnt = 0;

                        }
                }
        }
                        }
                }
        }


@@ -1179,7 +1248,8 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
        uint8_t ignoreWindow = 4;
        bool lastPeakHigh = 0;
        int lastBit = 0; 
        uint8_t ignoreWindow = 4;
        bool lastPeakHigh = 0;
        int lastBit = 0; 

-       peakcnt=0;
+       int bestStart[] = {0,0,0,0,0,0,0,0,0};
+       peakcnt = 0;

        //test each valid clock from smallest to greatest to see which lines up
        for(clkCnt=0; clkCnt < 8; ++clkCnt){
                //ignore clocks smaller than smallest peak
        //test each valid clock from smallest to greatest to see which lines up
        for(clkCnt=0; clkCnt < 8; ++clkCnt){
                //ignore clocks smaller than smallest peak


@@ -1199,7 +1269,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
                                                if (dest[i] >= peak || dest[i] <= low) {
                                                        //if same peak don't count it
                                                        if ((dest[i] >= peak && !lastPeakHigh) || (dest[i] <= low && lastPeakHigh)) {
                                                if (dest[i] >= peak || dest[i] <= low) {
                                                        //if same peak don't count it
                                                        if ((dest[i] >= peak && !lastPeakHigh) || (dest[i] <= low && lastPeakHigh)) {

-                                               peakcnt++;
+                                                               peakcnt++;

                                                        }
                                                        lastPeakHigh = (dest[i] >= peak);
                                                        bitHigh = true;
                                                        }
                                                        lastPeakHigh = (dest[i] >= peak);
                                                        bitHigh = true;


@@ -1211,9 +1281,10 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
                                                }
                                        //else if not a clock bit and no peaks
                                        } else if (dest[i] < peak && dest[i] > low){
                                                }
                                        //else if not a clock bit and no peaks
                                        } else if (dest[i] < peak && dest[i] > low){

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

                                                        bitHigh=false;
                                                        bitHigh=false;

-                                                       if (errBitHigh==true) peakcnt--;
+                                                       if (errBitHigh==true) 
+                                                               peakcnt--;

                                                        errBitHigh=false;
                                                } else {
                                                        ignoreCnt--;
                                                        errBitHigh=false;
                                                } else {
                                                        ignoreCnt--;


@@ -1224,61 +1295,58 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
                                                errBitHigh=true;
                                        }
                                }
                                                errBitHigh=true;
                                        }
                                }

-                               if(peakcnt>peaksdet[clkCnt]) {
-                                       peaksdet[clkCnt]=peakcnt;
+                               if (peakcnt > peaksdet[clkCnt]) {
+                                       bestStart[clkCnt]=ii;
+                                       peaksdet[clkCnt] = peakcnt;

                                }
                        }
                }
        }
                                }
                        }
                }
        }

-       int iii=7;
-       uint8_t best=0;
-       for (iii=7; iii > 0; iii--){
-               if ((peaksdet[iii] >= (peaksdet[best]-1)) && (peaksdet[iii] <= peaksdet[best]+1) && lowestTransition) {
-                       if (clk[iii] > (lowestTransition - (clk[iii]/8)) && clk[iii] < (lowestTransition + (clk[iii]/8))) {
-                       best = iii;
-               }
-               } else if (peaksdet[iii] > peaksdet[best]){
-                       best = iii;
+
+       uint8_t best = 0;
+       for (int m = 7; m > 0; m--){
+               if ((peaksdet[m] >= (peaksdet[best]-1)) && (peaksdet[m] <= peaksdet[best]+1) && lowestTransition) {
+                       if (clk[m] > (lowestTransition - (clk[m]/8)) && clk[m] < (lowestTransition + (clk[m]/8))) {
+                               best = m;
+                       }
+               } else if (peaksdet[m] > peaksdet[best]){
+                       best = m;

                }
                }

-               if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, maxPeak: %d, bestClk: %d, lowestTrs: %d",clk[iii],peaksdet[iii],maxPeak, clk[best], lowestTransition);
+               if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, maxPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], maxPeak, clk[best], lowestTransition);

        }
        }

-
+       *clockStartIdx  = bestStart[best];

        return clk[best];
 }
 
 // by marshmellow
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s
        return clk[best];
 }
 
 // by marshmellow
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s

-void psk1TOpsk2(uint8_t *BitStream, size_t size)
-{
-       size_t i=1;
-       uint8_t lastBit=BitStream[0];
-       for (; i<size; i++){
-               if (BitStream[i]==7){
-                       //ignore errors
-               } else if (lastBit!=BitStream[i]){
-                       lastBit=BitStream[i];
-                       BitStream[i]=1;
+void psk1TOpsk2(uint8_t *bits, size_t size) {
+       uint8_t lastBit = bits[0];
+       for (size_t i = 1; i < size; i++){
+               //ignore errors         
+               if (bits[i] == 7) continue;
+                       
+               if (lastBit != bits[i]){
+                       lastBit = bits[i];
+                       bits[i] = 1;

                } else {
                } else {

-                       BitStream[i]=0;
+                       bits[i] = 0;

                }
        }
                }
        }

-       return;

 }
 
 // by marshmellow
 // convert psk2 demod to psk1 demod
 // from only transition waves are 1s to phase shifts change bit
 }
 
 // by marshmellow
 // convert psk2 demod to psk1 demod
 // from only transition waves are 1s to phase shifts change bit

-void psk2TOpsk1(uint8_t *BitStream, size_t size)
-{
-       uint8_t phase=0;
-       for (size_t i=0; i<size; i++){
-               if (BitStream[i]==1){
-                       phase ^=1;
+void psk2TOpsk1(uint8_t *bits, size_t size) {
+       uint8_t phase = 0;
+       for (size_t i = 0; i < size; i++){
+               if (bits[i] == 1){
+                       phase ^= 1;

                }
                }

-               BitStream[i]=phase;
+               bits[i] = phase;

        }
        }

-       return;

 }
 
 // redesigned by marshmellow adjusted from existing decode functions
 }
 
 // redesigned by marshmellow adjusted from existing decode functions


@@ -1335,10 +1403,14 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert){
        return 0;
 }
 
        return 0;
 }
 

+uint8_t        detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow) {
+       int firstClockEdge = 0;
+       return detectFSKClk_ext(BitStream, size, fcHigh, fcLow, &firstClockEdge);
+}
+

 //by marshmellow
 //detects the bit clock for FSK given the high and low Field Clocks
 //by marshmellow
 //detects the bit clock for FSK given the high and low Field Clocks

-uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow)
-{
+uint8_t detectFSKClk_ext(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {

        uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
        uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
        uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};


@@ -1369,7 +1441,10 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc
                        continue;               
                // else new peak 
                // if we got less than the small fc + tolerance then set it to the small fc
                        continue;               
                // else new peak 
                // if we got less than the small fc + tolerance then set it to the small fc

-               if (fcCounter < fcLow+fcTol) 
+               // if it is inbetween set it to the last counter
+               if (fcCounter < fcHigh && fcCounter > fcLow)
+                       fcCounter = lastFCcnt;
+               else if (fcCounter < fcLow+fcTol) 

                        fcCounter = fcLow;
                else //set it to the large fc
                        fcCounter = fcHigh;
                        fcCounter = fcLow;
                else //set it to the large fc
                        fcCounter = fcHigh;


@@ -1391,6 +1466,7 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc
                                        rfLens[rfLensFnd++] = rfCounter;
                                }
                        } else {
                                        rfLens[rfLensFnd++] = rfCounter;
                                }
                        } else {

+                               *firstClockEdge = i;

                                firstBitFnd++;
                        }
                        rfCounter=0;
                                firstBitFnd++;
                        }
                        rfCounter=0;


@@ -1435,7 +1511,7 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc
                }
        }
 
                }
        }
 

-       if (ii<0) return 0; // oops we went too far
+       if (ii<2) return 0; // oops we went too far

 
        return clk[ii];
 }
 
        return clk[ii];
 }


@@ -1449,10 +1525,10 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj)
        uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t fcLensFnd = 0;
        uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t fcLensFnd = 0;

-       uint8_t lastFCcnt=0;
+       uint8_t lastFCcnt = 0;

        uint8_t fcCounter = 0;
        size_t i;
        uint8_t fcCounter = 0;
        size_t i;

-       if (size == 0) return 0;
+       if (size < 180) return 0;

 
        // prime i to first up transition
        for (i = 160; i < size-20; i++)
 
        // prime i to first up transition
        for (i = 160; i < size-20; i++)


@@ -1539,27 +1615,37 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert)
 
        size_t numBits=0;
        uint8_t curPhase = *invert;
 
        size_t numBits=0;
        uint8_t curPhase = *invert;

-       size_t i, waveStart=1, waveEnd=0, firstFullWave=0, lastClkBit=0;
-       uint8_t fc=0, fullWaveLen=0, tol=1;
-       uint16_t errCnt=0, waveLenCnt=0;
-       fc = countFC(dest, *size, 0);
+       size_t i=0, waveStart=1, waveEnd=0, firstFullWave=0, lastClkBit=0;
+       uint16_t fc=0, fullWaveLen=0, tol=1;
+       uint16_t errCnt=0, waveLenCnt=0, errCnt2=0;
+       fc = countFC(dest, *size, 1);
+       uint8_t fc2 = fc >> 8;
+       if (fc2 == 10) return -1; //fsk found - quit
+       fc = fc & 0xFF;

        if (fc!=2 && fc!=4 && fc!=8) return -1;
        //prnt("DEBUG: FC: %d",fc);
        *clock = DetectPSKClock(dest, *size, *clock);
        if (*clock == 0) return -1;
        if (fc!=2 && fc!=4 && fc!=8) return -1;
        //prnt("DEBUG: FC: %d",fc);
        *clock = DetectPSKClock(dest, *size, *clock);
        if (*clock == 0) return -1;

-       int avgWaveVal=0, lastAvgWaveVal=0;
+
+       //find start of modulating data in trace 
+       uint8_t threshold_value = 123; //-5
+       i = findModStart(dest, *size, threshold_value, fc);
+

        //find first phase shift
        //find first phase shift

-       for (i=0; i<loopCnt; i++){
+       int avgWaveVal=0, lastAvgWaveVal=0;
+       waveStart = i;
+       for (; i<loopCnt; i++){
+               // find peak 

                if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
                        waveEnd = i+1;
                if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
                        waveEnd = i+1;

-                       //prnt("DEBUG: waveEnd: %d",waveEnd);
+                       if (g_debugMode == 2) prnt("DEBUG PSK: waveEnd: %u, waveStart: %u",waveEnd, waveStart);

                        waveLenCnt = waveEnd-waveStart;
                        waveLenCnt = waveEnd-waveStart;

-                       if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc+2)){ //not first peak and is a large wave but not out of whack
+                       if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc+3)){ //not first peak and is a large wave but not out of whack

                                lastAvgWaveVal = avgWaveVal/(waveLenCnt);
                                firstFullWave = waveStart;
                                fullWaveLen=waveLenCnt;
                                lastAvgWaveVal = avgWaveVal/(waveLenCnt);
                                firstFullWave = waveStart;
                                fullWaveLen=waveLenCnt;

-                               //if average wave value is > graph 0 then it is an up wave or a 1
-                               if (lastAvgWaveVal > 123) curPhase ^= 1;  //fudge graph 0 a little 123 vs 128
+                               //if average wave value is > graph 0 then it is an up wave or a 1 (could cause inverting)
+                               if (lastAvgWaveVal > threshold_value) curPhase ^= 1;

                                break;
                        } 
                        waveStart = i+1;
                                break;
                        } 
                        waveStart = i+1;


@@ -1580,7 +1666,7 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert)
        //set start of wave as clock align
        lastClkBit = firstFullWave;
        if (g_debugMode==2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u",firstFullWave,fullWaveLen);  
        //set start of wave as clock align
        lastClkBit = firstFullWave;
        if (g_debugMode==2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u",firstFullWave,fullWaveLen);  

-       if (g_debugMode==2) prnt("DEBUG: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit,(unsigned int) fc);
+       if (g_debugMode==2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit,(unsigned int) fc);

        waveStart = 0;
        dest[numBits++] = curPhase; //set first read bit
        for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){
        waveStart = 0;
        dest[numBits++] = curPhase; //set first read bit
        for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){


@@ -1611,6 +1697,9 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert)
                                } else if (i+1 > lastClkBit + *clock + tol + fc){
                                        lastClkBit += *clock; //no phase shift but clock bit
                                        dest[numBits++] = curPhase;
                                } else if (i+1 > lastClkBit + *clock + tol + fc){
                                        lastClkBit += *clock; //no phase shift but clock bit
                                        dest[numBits++] = curPhase;

+                               } else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
+                                       errCnt2++;
+                                       if(errCnt2 > 101) return errCnt2;

                                }
                                avgWaveVal = 0;
                                waveStart = i+1;
                                }
                                avgWaveVal = 0;
                                waveStart = i+1;


@@ -1622,9 +1711,14 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert)
        return errCnt;
 }
 
        return errCnt;
 }
 

+bool DetectST(uint8_t  buffer[], size_t *size, int *foundclock) {
+       size_t ststart = 0, stend = 0;
+       return DetectST_ext(buffer, size, foundclock, &ststart, &stend);
+}
+

 //by marshmellow
 //attempt to identify a Sequence Terminator in ASK modulated raw wave
 //by marshmellow
 //attempt to identify a Sequence Terminator in ASK modulated raw wave

-bool DetectST(uint8_t buffer[], size_t *size, int *foundclock) {
+bool DetectST_ext(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststart, size_t *stend) {

        size_t bufsize = *size;
        //need to loop through all samples and identify our clock, look for the ST pattern
        uint8_t fndClk[] = {8,16,32,40,50,64,128};
        size_t bufsize = *size;
        //need to loop through all samples and identify our clock, look for the ST pattern
        uint8_t fndClk[] = {8,16,32,40,50,64,128};


@@ -1779,7 +1873,7 @@ bool DetectST(uint8_t buffer[], size_t *size, int *foundclock) {
        size_t newloc = 0;
        i=0;
        if (g_debugMode==2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);            
        size_t newloc = 0;
        i=0;
        if (g_debugMode==2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);            

-
+       bool firstrun = true;

        // warning - overwriting buffer given with raw wave data with ST removed...
        while ( dataloc < bufsize-(clk/2) ) {
                //compensate for long high at end of ST not being high due to signal loss... (and we cut out the start of wave high part)
        // warning - overwriting buffer given with raw wave data with ST removed...
        while ( dataloc < bufsize-(clk/2) ) {
                //compensate for long high at end of ST not being high due to signal loss... (and we cut out the start of wave high part)


@@ -1787,6 +1881,15 @@ bool DetectST(uint8_t buffer[], size_t *size, int *foundclock) {
                        for(i=0; i < clk/2-tol; ++i) {
                                buffer[dataloc+i] = high+5;
                        }
                        for(i=0; i < clk/2-tol; ++i) {
                                buffer[dataloc+i] = high+5;
                        }

+               } //test for single sample outlier (high between two lows) in the case of very strong waves
+               if (buffer[dataloc] >= high && buffer[dataloc+2] <= low) {
+                       buffer[dataloc] = buffer[dataloc+2];
+                       buffer[dataloc+1] = buffer[dataloc+2];
+               }
+               if (firstrun) {
+                       *stend = dataloc;
+                       *ststart = dataloc-(clk*4);
+                       firstrun=false;

                }
                for (i=0; i<datalen; ++i) {
                        if (i+newloc < bufsize) {
                }
                for (i=0; i<datalen; ++i) {
                        if (i+newloc < bufsize) {