X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e977fb0da3b08802307ea0f3106390cd5ae718b3..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/common/lfdemod.h?ds=sidebyside diff --git a/common/lfdemod.h b/common/lfdemod.h index 86ae7bc2..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); @@ -41,7 +48,8 @@ int ManchesterEncode(uint8_t *BitStream, size_t size); int manrawdecode(uint8_t *BitStream, size_t *size, uint8_t invert); int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert); uint8_t parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType); -uint8_t preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx); +bool preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx); +bool preambleSearchEx(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone); int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert); void psk2TOpsk1(uint8_t *BitStream, size_t size); void psk1TOpsk2(uint8_t *BitStream, size_t size);