From: marshmellow42 <marshmellowrf@gmail.com>
Date: Fri, 6 Feb 2015 19:45:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.0.0-rc1~26^2~2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/be2cf126bf74c3e0c60706dd2620c8a6d742e396

Merge remote-tracking branch 'upstream/master'
---

be2cf126bf74c3e0c60706dd2620c8a6d742e396
diff --cc armsrc/lfops.c
index 67652986,479da772..e34eab35
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@@ -734,11 -650,11 +650,11 @@@ void CmdEM410xdemod(int findone, int *h
          WDT_HIT();
          if (ledcontrol) LED_A_ON();
  
-         DoAcquisition125k_internal(-1,true);
-         size  = BigBuf_max_traceLen();
+ 		DoAcquisition_default(-1,true);
+ 		size  = BigBuf_max_traceLen();
          //Dbprintf("DEBUG: Buffer got");
  		//askdemod and manchester decode
 -		errCnt = askmandemod(dest, &size, &clk, &invert);
 +		errCnt = askmandemod(dest, &size, &clk, &invert, maxErr);
          //Dbprintf("DEBUG: ASK Got");
          WDT_HIT();