github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
This commit is contained in:
iceman1001 2015-02-10 21:53:16 +01:00
commit 4ecde0e1ff
17 changed files with 1286 additions and 1285 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui.c
View file

@ -108,7 +108,7 @@ int manchester_decode( int * data, const size_t len, uint8_t * dataout, size_t
DetectHighLowInGraph(&high, &low, TRUE);
/* get clock */
clock = GetClock("",0, 0);
clock = GetAskClock("",false, false);
startindex = DetectFirstTransition(data, len, high);