From: iceman1001 <iceman@iuse.se>
Date: Tue, 10 Feb 2015 08:01:31 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1e3a799d47fc551bb9c1611c6d7db47844dd03b7

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

1e3a799d47fc551bb9c1611c6d7db47844dd03b7
diff --cc armsrc/appmain.c
index 271ff3f8,189f9d7a..31e17e88
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@@ -205,15 -216,13 +216,13 @@@ void MeasureAntennaTuning(void
    	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
  	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
  	SpinDelay(20);
- 	// Vref = 3300mV, and an 10:1 voltage divider on the input
- 	// can measure voltages up to 33000 mV
- 	vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
+ 	vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
  
- 	cmd_send(CMD_MEASURED_ANTENNA_TUNING,vLf125|(vLf134<<16),vHf,peakf|(peakv<<16),LF_Results,256);
+ 	cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
  	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 -	LED_A_OFF();
 -	LED_B_OFF();
 -	return;
 +  LED_A_OFF();
 +  LED_B_OFF();
 +  return;
  }
  
  void MeasureAntennaTuningHf(void)
diff --cc armsrc/lfops.c
index c5f4a37a,e34eab35..bbefba03
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@@ -651,10 -651,10 +651,10 @@@ void CmdEM410xdemod(int findone, int *h
          if (ledcontrol) LED_A_ON();
  
  		DoAcquisition_default(-1,true);
 -		size  = BigBuf_max_traceLen();
 +        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();
  
diff --cc client/cmddata.h
index a858843e,29b3bbc9..56cc60e0
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@@ -14,11 -14,10 +14,12 @@@
  command_t * CmdDataCommands();
  
  int CmdData(const char *Cmd);
 +void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);
  void printDemodBuff();
 +void printBitStream(uint8_t BitStream[], uint32_t bitLen);
  int CmdAmp(const char *Cmd);
  int Cmdaskdemod(const char *Cmd);
+ int CmdAskEM410xDemod(const char *Cmd);
  int Cmdaskrawdemod(const char *Cmd);
  int Cmdaskmandemod(const char *Cmd);
  int CmdAutoCorr(const char *Cmd);