Merge pull request #4 from gcohen55/ubuntu_makefile

[proxmark3-svn] / armsrc / lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 7af065ea141bb2f889c20de389000f93a8716094..635934ef64fee23bf631c3f7c53c5902df239dab 100644 (file)
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -12,12 +12,12 @@
 #include "string.h"
 
 #include "lfsampling.h"
 #include "string.h"
 
 #include "lfsampling.h"

-#include "cipherutils.h"
+

 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig()
 {
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig()
 {

-       Dbprintf("Sampling config: ");
+       Dbprintf("LF Sampling config: ");

        Dbprintf("  [q] divisor:           %d ", config.divisor);
        Dbprintf("  [b] bps:               %d ", config.bits_per_sample);
        Dbprintf("  [d] decimation:        %d ", config.decimation);
        Dbprintf("  [q] divisor:           %d ", config.divisor);
        Dbprintf("  [b] bps:               %d ", config.bits_per_sample);
        Dbprintf("  [d] decimation:        %d ", config.decimation);


@@ -55,20 +55,19 @@ sample_config* getSamplingConfig()
 {
        return &config;
 }
 {
        return &config;
 }

-/*
+

 typedef struct {
        uint8_t * buffer;
        uint32_t numbits;
        uint32_t position;
 } BitstreamOut;
 
 typedef struct {
        uint8_t * buffer;
        uint32_t numbits;
        uint32_t position;
 } BitstreamOut;
 

-*/

 /**
  * @brief Pushes bit onto the stream
  * @param stream
  * @param bit
  */
 /**
  * @brief Pushes bit onto the stream
  * @param stream
  * @param bit
  */

-/*void pushBit( BitstreamOut* stream, uint8_t bit)
+void pushBit( BitstreamOut* stream, uint8_t bit)

 {
        int bytepos = stream->position >> 3; // divide by 8
        int bitpos = stream->position & 7;
 {
        int bytepos = stream->position >> 3; // divide by 8
        int bitpos = stream->position & 7;


@@ -76,7 +75,7 @@ typedef struct {
        stream->position++;
        stream->numbits++;
 }
        stream->position++;
        stream->numbits++;
 }

-*/
+

 /**
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.
 /**
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.


@@ -120,7 +119,6 @@ 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.
  */
  * @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)
 {
        //.
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
 {
        //.


@@ -152,7 +150,8 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        LED_D_OFF();
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        LED_D_OFF();

-                       if (trigger_threshold > 0 && sample < trigger_threshold)
+                       // threshold either high or low values 128 = center 0.  if trigger = 178 
+                       if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) // 

                                continue;
 
                        trigger_threshold = 0;
                                continue;
 
                        trigger_threshold = 0;


@@ -225,21 +224,21 @@ uint32_t DoAcquisition_config( bool silent)
                                  ,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
        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
 **/
 }
 
 /**
 * 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.
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.


@@ -248,5 +247,5 @@ uint32_t SampleLF()
 
 uint32_t SnoopLF()
 {
 
 uint32_t SnoopLF()
 {

-       return ReadLF(false);
+       return ReadLF(false, true);

 }
 }