github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 21:33:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into GenericTracing

Browse source 
Conflicts:
	armsrc/iso14443a.c
This commit is contained in:
Martin Holst Swende 2015-02-10 21:25:14 +01:00
commit 61972abbdd
15 changed files with 1491 additions and 779 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/apps.h
View file

@ -38,6 +38,10 @@ void DbpString(char *str);
void Dbprintf(const char *fmt, ...);
void Dbhexdump(int len, uint8_t *d, bool bAsci);
// ADC Vref = 3300mV, and an (10M+1M):1M voltage divider on the HF input can measure voltages up to 36300 mV
#define MAX_ADC_HF_VOLTAGE 36300
// ADC Vref = 3300mV, and an (10000k+240k):240k voltage divider on the LF input can measure voltages up to 140800 mV
#define MAX_ADC_LF_VOLTAGE 140800
int AvgAdc(int ch);
void ToSendStuffBit(int b);