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

diff --cc armsrc/appmain.c
index 271ff3f84649ba64a3faab71d2fd1b846be173d2,189f9d7a307ef54551a8887afff6ba49ce0f1401..31e17e880a5c12eed13aaa5d2d569090ba360654
--- 1/armsrc/appmain.c
--- 2/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/apps.h
Simple merge

diff --cc armsrc/lfops.c
index c5f4a37a98b99d69b181687dccf7a25493be5106,e34eab35f5bc813f8201b699967db819ed9da556..bbefba03232d02ed13f855aa270852f1c13eba6e
--- 1/armsrc/lfops.c
--- 2/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.c
Simple merge

diff --cc client/cmddata.h
index a858843e8a11732809b0061bdb885298439ee41d,29b3bbc99a19433cd41e4c31aad161ae315f442e..56cc60e00c1aebeeb5a31a915495f8038be15aa3
--- 1/client/cmddata.h
--- 2/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);

diff --cc client/mifarehost.c
Simple merge