ADD: Holimans new changes in master.

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 5ab5e03ae30973417b792c653397cfaa41a33843..eb5a4d9586253b7b43b9785aeed2ee506bfaee99 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -538,8 +538,6 @@ int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t
        size = fsk_wave_demod(dest, size, fchigh, fclow);
        if ( size > 0 )
                size = aggregate_bits(dest, size, rfLen, 192, invert, fchigh, fclow);
        size = fsk_wave_demod(dest, size, fchigh, fclow);
        if ( size > 0 )
                size = aggregate_bits(dest, size, rfLen, 192, invert, fchigh, fclow);

-       else
-               return -1;

        return size;
 }
 
        return size;
 }
 


@@ -623,8 +621,8 @@ int IOdemodFSK(uint8_t *dest, size_t size)
                        testMax = dest[idx];
        }
 
                        testMax = dest[idx];
        }
 

-       //if not just noise
-       if (testMax < 170) return -2;
+       //if not, just noise
+       if (testMax < 20) return -2;

                
        // FSK demodulator
        size = fskdemod(dest, size, 64, 1, 10, 8);  //  RF/64 and invert
                
        // FSK demodulator
        size = fskdemod(dest, size, 64, 1, 10, 8);  //  RF/64 and invert