#include "usb_cdc.h" // for usb_poll_validate_length
#include "fpgaloader.h"
-sample_config config = { 1, 8, 1, 95, 0 } ;
+sample_config config = { 1, 8, 1, 95, 0, 0 } ;
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);
}
* 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();
}
* @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();
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();
continue;
}
trigger_threshold = 0;
+ if (samples_to_skip > samples_skipped) {
+ samples_skipped++;
+ continue;
+ }
sample_total_numbers++;
if(averaging)
*/
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)
{
,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)