add lf PAC/Stanley tag read (#354)

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 49838f5e2be22e694015a181a0e36438c74b4561..880e2c2b04ebfe20cd6d212f82d20837db9e5eb4 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;
 }
 


@@ -548,9 +556,11 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock, size_t *clockStartIdx
 
        //get high and low peak
        int peak, low;
 
        //get high and low peak
        int peak, low;

-       if (getHiLo(dest, loopCnt, &peak, &low, 85, 85) < 1) return 0;
+       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;


@@ -751,8 +761,8 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock, size_t *firstPhaseShi
        uint16_t fcs = countFC(dest, size, 0);
        *fc = fcs & 0xFF;
        if (g_debugMode==2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
        uint16_t fcs = countFC(dest, size, 0);
        *fc = fcs & 0xFF;
        if (g_debugMode==2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);

-       if ((fcs>>8) == 10 && *fc == 8) return -1;
-       if (*fc!=2 && *fc!=4 && *fc!=8) return -1;
+       if ((fcs>>8) == 10 && *fc == 8) return 0;
+       if (*fc!=2 && *fc!=4 && *fc!=8) return 0;

 
        //if we already have a valid clock quit
        size_t i=1;
 
        //if we already have a valid clock quit
        size_t i=1;


@@ -833,15 +843,9 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock, size_t *firstPhaseShi
        return clk[best];
 }
 
        return clk[best];
 }
 

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

 //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_ext(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {
+uint8_t detectFSKClk(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};


@@ -947,17 +951,14 @@ uint8_t detectFSKClk_ext(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_
        return clk[ii];
 }
 
        return clk[ii];
 }
 

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

 //**********************************************************************************************
 //--------------------Modulation Demods &/or Decoding Section-----------------------------------
 //**********************************************************************************************
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
 bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
 //**********************************************************************************************
 //--------------------Modulation Demods &/or Decoding Section-----------------------------------
 //**********************************************************************************************
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
 bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {

+       if (buffSize < *i+4) return false;
+

        for (; *i < buffSize - 4; *i+=1) {
                *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
                if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior
        for (; *i < buffSize - 4; *i+=1) {
                *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
                if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior


@@ -975,7 +976,7 @@ bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLo
 }
 //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_ext(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststart, size_t *stend) {
+bool DetectST(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
        int clk = 0; 
        size_t bufsize = *size;
        //need to loop through all samples and identify our clock, look for the ST pattern
        int clk = 0; 


@@ -1096,10 +1097,6 @@ bool DetectST_ext(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststa
        *size = newloc;
        return true;
 }
        *size = newloc;
        return true;
 }

-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
 //take 11 10 01 11 00 and make 01100 ... miller decoding 
 
 //by marshmellow
 //take 11 10 01 11 00 and make 01100 ... miller decoding 


@@ -1143,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;


@@ -1156,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;


@@ -1502,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


@@ -1559,7 +1552,7 @@ int pskRawDemod_ext(uint8_t dest[], size_t *size, int *clock, int *invert, int *
        uint16_t errCnt=0, errCnt2=0;
        
        *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);
        uint16_t errCnt=0, errCnt2=0;
        
        *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);

-       if (*clock == 0) return -1;
+       if (*clock <= 0) return -1;

        //if clock detect found firstfullwave...
        uint16_t tol = fc/2;
        if (firstFullWave == 0) {
        //if clock detect found firstfullwave...
        uint16_t tol = fc/2;
        if (firstFullWave == 0) {


@@ -1640,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};


@@ -1729,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};


@@ -1759,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


@@ -1809,12 +1797,10 @@ int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
 }
 
 // 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


@@ -1854,15 +1840,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};