Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / armsrc / lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index ffbc0da875ebe11e683fe9426b9c0630e39335ee..e0764063da3d33c078bb854f1b939fe5bd8695ce 100644 (file)
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -12,9 +12,9 @@
 #include "string.h"
 #include "lfsampling.h"
 #include "usb_cdc.h"   // for usb_poll_validate_length
-//#include "ticks.h"           // for StartTicks
+#include "fpgaloader.h"
 
-sample_config config = { 1, 8, 1, 95, 0 } ;
+sample_config config = { 1, 8, 1, 95, 0, 0 } ;
 
 void printConfig()
 {
@@ -24,6 +24,7 @@ void printConfig()
        Dbprintf("  [d] decimation:        %d ", config.decimation);
        Dbprintf("  [a] averaging:         %d ", config.averaging);
        Dbprintf("  [t] trigger threshold: %d ", config.trigger_threshold);
+       Dbprintf("  [s] samples to skip:   %d ", config.samples_to_skip);
 }
 
 
@@ -34,20 +35,21 @@ void printConfig()
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
  *
- * Values set to '0' implies no change (except for averaging)
+ * Values set to '0' implies no change (except for averaging, threshold, samples_to_skip)
  * @brief setSamplingConfig
  * @param sc
  */
-void setSamplingConfig(sample_config *sc)
-{
-       if(sc->divisor != 0) config.divisor = sc->divisor;
-       if(sc->bits_per_sample!= 0) config.bits_per_sample= sc->bits_per_sample;
-       if(sc->decimation!= 0) config.decimation= sc->decimation;
-       if(sc->trigger_threshold != -1) config.trigger_threshold= sc->trigger_threshold;
+void setSamplingConfig(uint8_t *config_data) {
+       sample_config *sc = (sample_config *)config_data;
+       if (sc->divisor != 0) config.divisor = sc->divisor;
+       if (sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
+       if (sc->decimation != 0) config.decimation = sc->decimation;
+       if (sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
+       if (sc->samples_to_skip != -1) config.samples_to_skip = sc->samples_to_skip;
 
        config.averaging= sc->averaging;
-       if(config.bits_per_sample > 8)  config.bits_per_sample = 8;
-       if(config.decimation < 1)       config.decimation = 1;
+       if (config.bits_per_sample > 8) config.bits_per_sample = 8;
+       if (config.decimation < 1)      config.decimation = 1;
 
        printConfig();
 }
@@ -119,7 +121,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
  * @param silent - is true, now outputs are made. If false, dbprints the status
  * @return the number of bits occupied by the samples.
  */
-uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, int cancel_after)
+uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, int cancel_after, int samples_to_skip)
 {
        //.
        uint8_t *dest = BigBuf_get_addr();
@@ -141,6 +143,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
        uint32_t sample_total_numbers =0 ;
        uint32_t sample_total_saved =0 ;
        uint32_t cancel_counter = 0;
+       uint32_t samples_skipped = 0;
 
        while(!BUTTON_PRESS() && !usb_poll_validate_length() ) {
                WDT_HIT();
@@ -160,6 +163,10 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
                                continue;
                        }
                        trigger_threshold = 0;
+                       if (samples_to_skip > samples_skipped) {
+                               samples_skipped++;
+                               continue;
+                       }
                        sample_total_numbers++;
 
                        if(averaging)
@@ -218,7 +225,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
  */
 uint32_t DoAcquisition_default(int trigger_threshold, bool silent)
 {
-       return DoAcquisition(1,8,0,trigger_threshold,silent,0,0);
+       return DoAcquisition(1,8,0,trigger_threshold,silent,0,0,0);
 }
 uint32_t DoAcquisition_config(bool silent, int sample_size)
 {
@@ -228,11 +235,12 @@ uint32_t DoAcquisition_config(bool silent, int sample_size)
                                  ,config.trigger_threshold
                                  ,silent
                                  ,sample_size
-                                 ,0);
+                                 ,0
+                                 ,config.samples_to_skip);
 }
 
 uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, int cancel_after) {
-       return DoAcquisition(1,8,0,trigger_threshold,silent,sample_size,cancel_after);
+       return DoAcquisition(1,8,0,trigger_threshold,silent,sample_size,cancel_after,0);
 }
 
 uint32_t ReadLF(bool activeField, bool silent, int sample_size)