#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()
{
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
*/
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;
// 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);
}
/**
* @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();
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();
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)
*/
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)
+uint32_t DoAcquisition_config(bool silent, int sample_size)
{
return DoAcquisition(config.decimation
,config.bits_per_sample
,config.averaging
,config.trigger_threshold
,silent
- ,0);
+ ,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)
+uint32_t ReadLF(bool activeField, bool silent, int sample_size)
{
if (!silent) printConfig();
LFSetupFPGAForADC(config.divisor, activeField);
// Now call the acquisition routine
- return DoAcquisition_config(silent);
+ return DoAcquisition_config(silent, sample_size);
}
/**
* Initializes the FPGA for reader-mode (field on), and acquires the samples.
* @return number of bits sampled
**/
-uint32_t SampleLF(bool printCfg)
+uint32_t SampleLF(bool printCfg, int sample_size)
{
- uint32_t ret = ReadLF(true, printCfg);
+ uint32_t ret = ReadLF(true, printCfg, sample_size);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
return ret;
}
uint32_t SnoopLF()
{
- uint32_t ret = ReadLF(false, true);
+ uint32_t ret = ReadLF(false, true, 0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
return ret;
}
/**
-* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
-* the data is collected in BigBuf.
-**/
-void doT55x7Acquisition(size_t sample_size) {
-
- #define T55xx_READ_UPPER_THRESHOLD 128+60 // 60 grph
- #define T55xx_READ_LOWER_THRESHOLD 128-60 // -60 grph
- #define T55xx_READ_TOL 5
-
- uint8_t *dest = BigBuf_get_addr();
- uint16_t bufsize = BigBuf_max_traceLen();
-
- if ( bufsize > sample_size )
- bufsize = sample_size;
-
- uint16_t i = 0;
- bool startFound = false;
- bool highFound = false;
- bool lowFound = false;
- uint8_t curSample = 0;
- uint8_t lastSample = 0;
- uint16_t skipCnt = 0;
- while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt<1000 && i<bufsize ) {
- WDT_HIT();
- if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
- AT91C_BASE_SSC->SSC_THR = 0x43;
- LED_D_ON();
- }
- if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
- curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
- LED_D_OFF();
-
- // skip until the first high sample above threshold
- if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
- //if (curSample > lastSample)
- // lastSample = curSample;
- highFound = true;
- } else if (!highFound) {
- skipCnt++;
- continue;
- }
- // skip until the first Low sample below threshold
- if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) {
- //if (curSample > lastSample)
- lastSample = curSample;
- lowFound = true;
- } else if (!lowFound) {
- skipCnt++;
- continue;
- }
-
-
- // skip until first high samples begin to change
- if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD+T55xx_READ_TOL){
- // if just found start - recover last sample
- if (!startFound) {
- dest[i++] = lastSample;
- startFound = true;
- }
- // collect samples
- dest[i++] = curSample;
- }
- }
- }
-}
-
-/**
-* 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
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;
// 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;
}
projects / proxmark3-svn / blobdiff