Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / common / lfdemod.h

diff --git a/common/lfdemod.h b/common/lfdemod.h
index b0feff04311d704de07488c479393a1c13532122..15121cbff408ffc7274cb55fcdaa14f35bc4656b 100644 (file)
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -4,26 +4,45 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Low frequency commands
+// Low frequency demod related commands
+// marshmellow
+// note that many of these demods are not the slickest code and they often rely
+//   on peaks and clock instead of converting to clean signal. 
+//   

 //-----------------------------------------------------------------------------
 
 #ifndef LFDEMOD_H__
 #define LFDEMOD_H__
 #include <stdint.h>
 
 //-----------------------------------------------------------------------------
 
 #ifndef LFDEMOD_H__
 #define LFDEMOD_H__
 #include <stdint.h>
 

-int DetectASKClock(uint8_t dest[], size_t size, int clock);
-int askmandemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
-uint64_t Em410xDecode(uint8_t *BitStream,size_t size);
+int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr);
+uint8_t DetectCleanAskWave(uint8_t dest[], size_t size, int high, int low);
+int askmandemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr);
+uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo);
+int ManchesterEncode(uint8_t *BitStream, size_t size);

 int manrawdecode(uint8_t *BitStream, size_t *size);
 int manrawdecode(uint8_t *BitStream, size_t *size);

-int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset);
-int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
-int HIDdemodFSK(uint8_t *dest, size_t size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);
+int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset, int invert);
+int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp);
+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);

 int IOdemodFSK(uint8_t *dest, size_t size);
 int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow);
 uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);
 int IOdemodFSK(uint8_t *dest, size_t size);
 int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow);
 uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);

-int pskNRZrawDemod(uint8_t *dest, size_t *size, int *clk, int *invert);
-int DetectpskNRZClock(uint8_t dest[], size_t size, int clock);
+int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int maxErr);
+void psk1TOpsk2(uint8_t *BitStream, size_t size);
+void psk2TOpsk1(uint8_t *BitStream, size_t size);
+int DetectNRZClock(uint8_t dest[], size_t size, int clock);

 int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);

-void pskCleanWave(uint8_t *bitStream, size_t size);
+int PyramiddemodFSK(uint8_t *dest, size_t *size);
+int AWIDdemodFSK(uint8_t *dest, size_t *size);
+size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen);
+uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj);
+uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow);
+int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);
+uint8_t preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);
+uint8_t parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType);
+int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert);
+int DetectPSKClock(uint8_t dest[], size_t size, int clock);

 
 #endif
 
 #endif