X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1f78a4d305cf7cab4682973bc00c6d391de777d6..ba3fd680fb91335eabb96601fa3ff8ee460b6ede:/armsrc/lfsampling.c?ds=sidebyside diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index 348549ef..120c0801 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -13,7 +13,7 @@ #include "lfsampling.h" -sample_config config = { 1, 8, 1, 88, 0 } ; +sample_config config = { 1, 8, 1, 95, 0 } ; void printConfig() { @@ -62,7 +62,6 @@ typedef struct { uint32_t position; } BitstreamOut; - /** * @brief Pushes bit onto the stream * @param stream @@ -225,21 +224,21 @@ uint32_t DoAcquisition_config( bool silent) ,silent); } -uint32_t ReadLF(bool activeField) +uint32_t ReadLF(bool activeField, bool silent) { - printConfig(); + if (!silent) printConfig(); LFSetupFPGAForADC(config.divisor, activeField); // Now call the acquisition routine - return DoAcquisition_config(false); + return DoAcquisition_config(silent); } /** * Initializes the FPGA for reader-mode (field on), and acquires the samples. * @return number of bits sampled **/ -uint32_t SampleLF() +uint32_t SampleLF(bool printCfg) { - return ReadLF(true); + return ReadLF(true, printCfg); } /** * Initializes the FPGA for snoop-mode (field off), and acquires the samples. @@ -248,5 +247,5 @@ uint32_t SampleLF() uint32_t SnoopLF() { - return ReadLF(false); + return ReadLF(false, true); }