X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8ad1e731c8561ba050db2e80daff7b1e97e575ca..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/common/lfdemod.h?ds=inline diff --git a/common/lfdemod.h b/common/lfdemod.h index 4c2cb9fb..9bd340fc 100644 --- a/common/lfdemod.h +++ b/common/lfdemod.h @@ -19,6 +19,9 @@ #include // for //generic +#ifndef ON_DEVICE +void SetGraphClock(int clock, int startidx); +#endif uint8_t justNoise(uint8_t *bits, size_t size); size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType); int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType); @@ -30,10 +33,14 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj); int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr); uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, uint8_t high, uint8_t low); 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); int DetectNRZClock(uint8_t dest[], size_t size, int clock); +int DetectNRZClock_ext(uint8_t dest[], size_t size, int clock, int *clockStartIdx); int DetectPSKClock(uint8_t dest[], size_t size, int clock); -int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low); +int DetectPSKClock_ext(uint8_t dest[], size_t size, int clock, int *firstPhaseShift); +int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low, int *clock); 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); int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow); int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo); uint32_t manchesterEncode2Bytes(uint16_t datain); @@ -50,7 +57,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t //tag specific int AWIDdemodFSK(uint8_t *dest, size_t *size); -uint8_t 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); int FDXBdemodBI(uint8_t *dest, size_t *size); int gProxII_Demod(uint8_t BitStream[], size_t *size); int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);