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

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c

diff --cc armsrc/Makefile
Simple merge

diff --cc armsrc/appmain.c
index 00e9ba4dadc85d9b95e43c8ac9742981ff24d8ae,cb1b9f73fee185ddf706e2e6720a348bb517799d..271ff3f84649ba64a3faab71d2fd1b846be173d2
--- 1/armsrc/appmain.c
--- 2/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@@ -21,9 -21,9 +21,9 @@@
  #include <stdarg.h>
  
  #include "legicrf.h"
 -#include <hitag2.h>
 +#include "../include/hitag2.h"
- 
+ #include "lfsampling.h"
 +
  #ifdef WITH_LCD
   #include "LCD.h"
  #endif

diff --cc armsrc/apps.h
Simple merge

diff --cc armsrc/lfops.c
index 98045d81f57a99668af35c63480c44b8565d5fe5,479da77204ebc3fc357b5c569afbc3b0aab2f2bc..c5f4a37a98b99d69b181687dccf7a25493be5106
--- 1/armsrc/lfops.c
--- 2/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@@ -123,18 -34,19 +34,19 @@@ void ModThenAcquireRawAdcSamples125k(in
      if (command[strlen((char *) command) - 1] == 'h')
          divisor_used = 88; // 134.8 KHz
  
+       sample_config sc = { 0,0,1, divisor_used, 0};
+       setSamplingConfig(&sc);
  
-     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used);
-     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-     // Give it a bit of time for the resonant antenna to settle.
-     SpinDelay(50);
 -      /* Make sure the tag is reset */
 -      FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 -      FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 -      SpinDelay(2500);
++    /* Make sure the tag is reset */
++    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
++    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
++    SpinDelay(2500);
+ 
+       LFSetupFPGAForADC(sc.divisor, 1);
  
 -      // And a little more time for the tag to fully power up
 -      SpinDelay(2000);
 +    // And a little more time for the tag to fully power up
 +    SpinDelay(2000);
  
-     // Now set up the SSC to get the ADC samples that are now streaming at us.
-     FpgaSetupSsc();
- 
      // now modulate the reader field
      while(*command != '\0' && *command != ' ') {
          FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@@ -647,8 -561,8 +561,8 @@@ void CmdHIDdemodFSK(int findone, int *h
          WDT_HIT();
          if (ledcontrol) LED_A_ON();
  
-         DoAcquisition125k_internal(-1,true);
+               DoAcquisition_default(-1,true);
 -              // FSK demodulator
 +        // FSK demodulator
          size = sizeOfBigBuff;  //variable size will change after demod so re initialize it before use
                idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo);
          
@@@ -736,8 -650,8 +650,8 @@@ void CmdEM410xdemod(int findone, int *h
          WDT_HIT();
          if (ledcontrol) LED_A_ON();
  
-         DoAcquisition125k_internal(-1,true);
+               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);
@@@ -789,8 -703,8 +703,8 @@@ void CmdIOdemodFSK(int findone, int *hi
      while(!BUTTON_PRESS()) {
          WDT_HIT();
          if (ledcontrol) LED_A_ON();
-         DoAcquisition125k_internal(-1,true);
+               DoAcquisition_default(-1,true);
 -              //fskdemod and get start index
 +        //fskdemod and get start index
          WDT_HIT();
          idx = IOdemodFSK(dest, BigBuf_max_traceLen());
          if (idx>0){

diff --cc client/Makefile
Simple merge

diff --cc client/cmddata.c
Simple merge

diff --cc include/usb_cmd.h
index ecdf8ac18f5734527b016118ba39db5f627d684c,6ee6509ebc9d41653f111b0dd7e8555d58b130a7..295f0ebf1da7f0fef4dcb8954a0f207deafa66bf
--- 1/include/usb_cmd.h
--- 2/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@@ -187,9 -194,10 +197,10 @@@ typedef struct
  
  
  //Iclass reader flags
 -#define FLAG_ICLASS_READER_ONLY_ONCE    0x01
 +#define FLAG_ICLASS_READER_ONLY_ONCE 0x01
  #define FLAG_ICLASS_READER_GET_CC       0x02
  
+ 
  // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
  /* Whether a bootloader that understands the common_area is present */
  #define DEVICE_INFO_FLAG_BOOTROM_PRESENT              (1<<0)