cvs.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c

index 5d1f9248284fa77b04de411de76fbaaadc113659..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();

}

@@ -101,7 +103,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)

// Give it a bit of time for the resonant antenna to settle.

SpinDelay(50);

// Now set up the SSC to get the ADC samples that are now streaming at us.

- FpgaSetupSsc();

+ FpgaSetupSsc(FPGA_MAJOR_MODE_LF_ADC);

}

/**

@@ -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)

+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();

@@ -140,6 +142,8 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag

uint32_t sample_sum =0 ;

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();

@@ -151,10 +155,18 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag

sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;

LED_D_OFF();

// threshold either high or low values 128 = center 0. if trigger = 178

- if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) //

+ if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) { //

+ if (cancel_after > 0) {

+ cancel_counter++;

+ if (cancel_after == cancel_counter) break;

+ }

continue;

-

+ }

trigger_threshold = 0;

+ if (samples_to_skip > samples_skipped) {

+ samples_skipped++;

+ continue;

+ }

sample_total_numbers++;

if(averaging)

@@ -213,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);

+ return DoAcquisition(1,8,0,trigger_threshold,silent,0,0,0);

}

uint32_t DoAcquisition_config(bool silent, int sample_size)

{

@@ -222,11 +234,13 @@ uint32_t DoAcquisition_config(bool silent, int sample_size)

,config.averaging

,config.trigger_threshold

,silent

- ,sample_size);

+ ,sample_size

+ ,0

+ ,config.samples_to_skip);

}

-uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size) {

- return DoAcquisition(1,8,0,trigger_threshold,silent,sample_size);

+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,0);

}

uint32_t ReadLF(bool activeField, bool silent, int sample_size)

@@ -260,7 +274,7 @@ uint32_t SnoopLF()

}

/**

-* acquisition of Cotag LF signal. Similart to other LF, since the Cotag has such long datarate RF/384

+* acquisition of Cotag LF signal. Similar to other LF, since the Cotag has such long datarate RF/384

* and is Manchester?, we directly gather the manchester data into bigbuff

**/

#define COTAG_T1 384

@@ -329,8 +343,8 @@ uint32_t doCotagAcquisitionManchester() {

uint8_t sample = 0, firsthigh = 0, firstlow = 0;

uint16_t sample_counter = 0, period = 0;

uint8_t curr = 0, prev = 0;

-

- while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize) ) {

+ uint16_t noise_counter = 0;

+ while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize) && (noise_counter < (COTAG_T1<<1)) ) {

WDT_HIT();

if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {

AT91C_BASE_SSC->SSC_THR = 0x43;

@@ -343,14 +357,20 @@ uint32_t doCotagAcquisitionManchester() {

// find first peak

if ( !firsthigh ) {

- if (sample < COTAG_ONE_THRESHOLD)

+ if (sample < COTAG_ONE_THRESHOLD) {

+ noise_counter++;

continue;

+ }

+ noise_counter = 0;

firsthigh = 1;

}

if ( !firstlow ){

- if (sample > COTAG_ZERO_THRESHOLD )

+ if (sample > COTAG_ZERO_THRESHOLD ) {

+ noise_counter++;

continue;

+ }

+ noise_counter=0;

firstlow = 1;

}