Revert "dbg: Watchdog resets while 'hw tune lf'"

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index d6ef88a40280e57d3e241baffc772bfd70e1aeed..f470371a3b399e6292f799eea6e3f90ac628d179 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -505,13 +505,14 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr) {
        return bestStart[best];
 }
 
        return bestStart[best];
 }
 

-int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low){
+int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong) {

        //find shortest transition from high to low
        //find shortest transition from high to low

+       *strong = false;

        size_t i = 0;
        size_t transition1 = 0;
        int lowestTransition = 255;
        bool lastWasHigh = false;
        size_t i = 0;
        size_t transition1 = 0;
        int lowestTransition = 255;
        bool lastWasHigh = false;

-
+       size_t transitionSampleCount = 0;

        //find first valid beginning of a high or low wave
        while ((dest[i] >= peak || dest[i] <= low) && (i < size))
                ++i;
        //find first valid beginning of a high or low wave
        while ((dest[i] >= peak || dest[i] <= low) && (i < size))
                ++i;


@@ -527,10 +528,17 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low){
                        lastWasHigh = (dest[i] >= peak);
                        if (i-transition1 < lowestTransition) lowestTransition = i-transition1;
                        transition1 = i;
                        lastWasHigh = (dest[i] >= peak);
                        if (i-transition1 < lowestTransition) lowestTransition = i-transition1;
                        transition1 = i;

+               } else if (dest[i] < peak && dest[i] > low) {
+                       transitionSampleCount++;

                }
        }
        if (lowestTransition == 255) lowestTransition = 0;
        if (g_debugMode==2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d",lowestTransition);
                }
        }
        if (lowestTransition == 255) lowestTransition = 0;
        if (g_debugMode==2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d",lowestTransition);

+       // if less than 10% of the samples were not peaks (or 90% were peaks) then we have a strong wave
+       if (transitionSampleCount / size < 10) {
+               *strong = true;
+               lowestTransition = getClosestClock(lowestTransition);
+       }

        return lowestTransition;
 }
 
        return lowestTransition;
 }
 


@@ -550,7 +558,9 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock, size_t *clockStartIdx
        int peak, low;
        if (getHiLo(dest, loopCnt, &peak, &low, 90, 90) < 1) return 0;
 
        int peak, low;
        if (getHiLo(dest, loopCnt, &peak, &low, 90, 90) < 1) return 0;
 

-       int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low);
+       bool strong = false;
+       int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
+       if (strong) return lowestTransition;

        size_t ii;
        uint8_t clkCnt;
        uint8_t tol = 0;
        size_t ii;
        uint8_t clkCnt;
        uint8_t tol = 0;


@@ -1130,10 +1140,10 @@ int millerRawDecode(uint8_t *BitStream, size_t *size, int invert) {
 //take 01 or 10 = 1 and 11 or 00 = 0
 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
 //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding
 //take 01 or 10 = 1 and 11 or 00 = 0
 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
 //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding

-int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int offset, int invert) {
+int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int *offset, int invert) {

        uint16_t bitnum = 0;
        uint16_t errCnt = 0;
        uint16_t bitnum = 0;
        uint16_t errCnt = 0;

-       size_t i = offset;
+       size_t i = *offset;

        uint16_t MaxBits=512;
        //if not enough samples - error
        if (*size < 51) return -1;
        uint16_t MaxBits=512;
        //if not enough samples - error
        if (*size < 51) return -1;


@@ -1143,8 +1153,8 @@ int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int offset, int invert) {
                if (BitStream[i+1]==BitStream[i+2]) offsetA=0; 
                if (BitStream[i+2]==BitStream[i+3]) offsetB=0;                                  
        }
                if (BitStream[i+1]==BitStream[i+2]) offsetA=0; 
                if (BitStream[i+2]==BitStream[i+3]) offsetB=0;                                  
        }

-       if (!offsetA && offsetB) offset++;
-       for (i=offset; i<*size-3; i+=2){
+       if (!offsetA && offsetB) *offset+=1;
+       for (i=*offset; i<*size-3; i+=2){

                //check for phase error
                if (BitStream[i+1]==BitStream[i+2]) {
                        BitStream[bitnum++]=7;
                //check for phase error
                if (BitStream[i+1]==BitStream[i+2]) {
                        BitStream[bitnum++]=7;


@@ -1489,18 +1499,14 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert,
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)

-int fskdemod_ext(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+       if (justNoise(dest, size)) return 0;

        // FSK demodulator
        size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx);
        size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx);
        return size;
 }
 
        // FSK demodulator
        size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx);
        size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx);
        return size;
 }
 

-int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow) {
-       int startIdx=0;
-       return fskdemod_ext(dest, size, rfLen, invert, fchigh, fclow, &startIdx);
-}
-

 // by marshmellow
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s
 // by marshmellow
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s


@@ -1627,14 +1633,12 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert) {
 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID
 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID

-int AWIDdemodFSK(uint8_t *dest, size_t *size) {
+int AWIDdemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx) {

        //make sure buffer has enough data
        if (*size < 96*50) return -1;
 
        //make sure buffer has enough data
        if (*size < 96*50) return -1;
 

-       if (justNoise(dest, *size)) return -2;
-

        // FSK demodulator
        // FSK demodulator

-       *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
+       *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx);  // fsk2a RF/50 

        if (*size < 96) return -3;  //did we get a good demod?
 
        uint8_t preamble[] = {0,0,0,0,0,0,0,1};
        if (*size < 96) return -3;  //did we get a good demod?
 
        uint8_t preamble[] = {0,0,0,0,0,0,0,1};


@@ -1716,12 +1720,10 @@ int gProxII_Demod(uint8_t BitStream[], size_t *size) {
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it

-int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo) {
-       if (justNoise(dest, *size)) return -1;
-
+int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {

        size_t numStart=0, size2=*size, startIdx=0; 
        size_t numStart=0, size2=*size, startIdx=0; 

-       // FSK demodulator
-       *size = fskdemod(dest, size2,50,1,10,8); //fsk2a
+       // FSK demodulator  fsk2a so invert and fc/10/8
+       *size = fskdemod(dest, size2, 50, 1, 10, 8, waveStartIdx);

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


@@ -1746,12 +1748,11 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
        return (int)startIdx;
 }
 
        return (int)startIdx;
 }
 

-int IOdemodFSK(uint8_t *dest, size_t size) {
-       if (justNoise(dest, size)) return -1;
+int IOdemodFSK(uint8_t *dest, size_t size, int *waveStartIdx) {

        //make sure buffer has data
        if (size < 66*64) return -2;
        //make sure buffer has data
        if (size < 66*64) return -2;

-       // FSK demodulator
-       size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64 
+       // FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
+       size = fskdemod(dest, size, 64, 1, 10, 8, waveStartIdx); 

        if (size < 65) return -3;  //did we get a good demod?
        //Index map
        //0           10          20          30          40          50          60
        if (size < 65) return -3;  //did we get a good demod?
        //Index map
        //0           10          20          30          40          50          60


@@ -1776,32 +1777,61 @@ int IOdemodFSK(uint8_t *dest, size_t size) {
 } 
 
 // redesigned by marshmellow adjusted from existing decode functions
 } 
 
 // redesigned by marshmellow adjusted from existing decode functions

-// indala id decoding - only tested on 26 bit tags, but attempted to make it work for more
-int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
-       //26 bit 40134 format  (don't know other formats)
-       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
-       uint8_t preamble_i[] = {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,0};
-       size_t startidx = 0; 
-       if (!preambleSearch(bitStream, preamble, sizeof(preamble), size, &startidx)){
-               // if didn't find preamble try again inverting
-               if (!preambleSearch(bitStream, preamble_i, sizeof(preamble_i), size, &startidx)) return -1;
+// indala id decoding
+int indala64decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
+       //standard 64 bit indala formats including 26 bit 40134 format
+       uint8_t preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
+       uint8_t preamble64_i[] = {0,1,0,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, 0};
+       size_t startidx = 0;
+       size_t found_size = *size;
+       bool found = preambleSearch(bitStream, preamble64, sizeof(preamble64), &found_size, &startidx);
+       if (!found) {
+               found = preambleSearch(bitStream, preamble64_i, sizeof(preamble64_i), &found_size, &startidx);
+               if (!found) return -1;

                *invert ^= 1;
                *invert ^= 1;

-       } 
-       if (*size != 64 && *size != 224) return -2;
+       }
+       if (found_size != 64) return -2;

        if (*invert==1)
        if (*invert==1)

-               for (size_t i = startidx; i < *size + startidx; i++) 
+               for (size_t i = startidx; i < found_size + startidx; i++) 
+                       bitStream[i] ^= 1;
+
+       // note: don't change *size until we are sure we got it... 
+       *size = found_size;
+       return (int) startidx;
+}
+
+int indala224decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
+       //large 224 bit indala formats (different preamble too...)
+       uint8_t preamble224[] = {1,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1};
+       uint8_t preamble224_i[] = {0,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,0};
+       size_t startidx = 0;
+       size_t found_size = *size;
+       bool found = preambleSearch(bitStream, preamble224, sizeof(preamble224), &found_size, &startidx);
+       if (!found) {
+               found = preambleSearch(bitStream, preamble224_i, sizeof(preamble224_i), &found_size, &startidx);
+               if (!found) return -1;
+               *invert ^= 1;
+       }
+       if (found_size != 224) return -2;
+       if (*invert==1 && startidx > 0)
+               for (size_t i = startidx-1; i < found_size + startidx + 2; i++) 

                        bitStream[i] ^= 1;
 
                        bitStream[i] ^= 1;
 

+       // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
+       // note loses 1 bit at beginning of transformation...
+       // don't need to verify array is big enough as to get here there has to be a full preamble after all of our data
+       psk1TOpsk2(bitStream + (startidx-1), found_size+2);
+       startidx++;
+
+       *size = found_size;

        return (int) startidx;
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
        return (int) startidx;
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it

-int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo) {
-       if (justNoise(dest, *size)) return -1;
-       
+int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {

        size_t numStart=0, size2=*size, startIdx=0;
        // FSK demodulator
        size_t numStart=0, size2=*size, startIdx=0;
        // FSK demodulator

-       *size = fskdemod(dest, size2,50,1,10,8); //fsk2a
+       *size = fskdemod(dest, size2,50,1,10,8,waveStartIdx); //fsk2a

        if (*size < 96) return -2;
 
        // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
        if (*size < 96) return -2;
 
        // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1


@@ -1841,15 +1871,12 @@ int PrescoDemod(uint8_t *dest, size_t *size) {
 
 // by marshmellow
 // FSK Demod then try to locate a Farpointe Data (pyramid) ID
 
 // by marshmellow
 // FSK Demod then try to locate a Farpointe Data (pyramid) ID

-int PyramiddemodFSK(uint8_t *dest, size_t *size) {
+int PyramiddemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx) {

        //make sure buffer has data
        if (*size < 128*50) return -5;
 
        //make sure buffer has data
        if (*size < 128*50) return -5;
 

-       //test samples are not just noise
-       if (justNoise(dest, *size)) return -1;
-

        // FSK demodulator
        // FSK demodulator

-       *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
+       *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx);  // 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};
        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};