sync with master lf files to resolve conflicts

This commit is contained in:
marshmellow42 2015-01-06 10:58:35 -05:00
parent 4118b74dc8
commit c07b79fcbf
3 changed files with 1998 additions and 2460 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -12,8 +12,8 @@
#include <stdint.h>
int DetectASKClock(uint8_t dest[], size_t size, int clock);
int askmandemod(uint8_t *BinStream,int *BitLen,int *clk, int *invert);
uint64_t Em410xDecode(uint8_t *BitStream,int BitLen);
int askmandemod(uint8_t *BinStream,uint32_t *BitLen,int *clk, int *invert);
uint64_t Em410xDecode(uint8_t *BitStream,uint32_t BitLen);
int manrawdecode(uint8_t *BitStream, int *bitLen);
int BiphaseRawDecode(uint8_t * BitStream, int *bitLen, int offset);
int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert);
@ -21,9 +21,5 @@ int HIDdemodFSK(uint8_t *dest, size_t size, uint32_t *hi2, uint32_t *hi, uint32_
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, int numbits);
int pskNRZrawDemod(uint8_t *dest, int *bitLen, int *clk, int *invert);
int DetectpskNRZClock(uint8_t dest[], size_t size, int clock);
int indala26decode(uint8_t *bitStream, int *bitLen, uint8_t *invert);
void pskCleanWave(uint8_t *bitStream, int bitLen);
#endif