dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
This commit is contained in:
iceman1001
2015-02-10 08:58:14 +01:00
parent e57fe796f5 146c201cbe
commit 2b61c24212
28 changed files with 1930 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
armsrc/apps.h
View File

@@ -45,12 +45,6 @@ int AvgAdc(int ch);
void ToSendStuffBit(int b);
void ToSendReset(void);
void ListenReaderField(int limit);
void AcquireRawAdcSamples125k(int at134khz);
void SnoopLFRawAdcSamples(int divisor, int trigger_threshold);
void DoAcquisition125k_internal(int trigger_threshold, bool silent);
void DoAcquisition125k_threshold(int trigger_threshold);
void DoAcquisition125k();
extern int ToSendMax;
extern uint8_t ToSend[];
@@ -110,6 +104,10 @@ void SetAdcMuxFor(uint32_t whichGpio);
#define FPGA_HF_ISO14443A_READER_MOD (4<<0)
/// lfops.h
extern uint8_t decimation;
extern uint8_t bits_per_sample ;
extern bool averaging;
void AcquireRawAdcSamples125k(int divisor);
void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,uint8_t *command);
void ReadTItag(void);