Merge pull request #143 from marshmellow42/master

[proxmark3-svn] / armsrc / lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index e04467698b7630ca76ecb2b7dc9be88032aa6a40..115d4b18ffaba74ef9c5da113cabb5444679375b 100644 (file)
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -253,50 +253,53 @@ uint32_t SnoopLF()
 * acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
 * the data is collected in BigBuf.
 **/
-void doT55x7Acquisition(void){
+void doT55x7Acquisition(size_t sample_size) {
 
-       #define T55xx_SAMPLES_SIZE 12000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)
-       #define T55xx_READ_UPPER_THRESHOLD 128+40  // 50
+       #define T55xx_READ_UPPER_THRESHOLD 128+40  // 40 grph
        #define T55xx_READ_TOL   5
 
        uint8_t *dest = BigBuf_get_addr();
        uint16_t bufsize = BigBuf_max_traceLen();
        
-       if ( bufsize > T55xx_SAMPLES_SIZE )
-               bufsize = T55xx_SAMPLES_SIZE;
+       if ( bufsize > sample_size )
+               bufsize = sample_size;
 
-       //memset(dest, 0, bufsize);
-               
        uint16_t i = 0;
        bool startFound = false;
        bool highFound = false;
        uint8_t curSample = 0;
        uint8_t firstSample = 0;
-       for(;;) {
+       uint16_t skipCnt = 0;
+       while(!BUTTON_PRESS() && skipCnt<1000) {
+               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;
-                       
-                       // find first high sample
+                       LED_D_OFF();
+
+                       // skip until the first high sample above threshold
                        if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
                                if (curSample > firstSample) 
                                        firstSample = curSample;
                                highFound = true;
                        } else if (!highFound) {
+                               skipCnt++;
                                continue;
                        }
 
-                       // skip until samples begin to change
+                       // skip until first high samples begin to change
                        if (startFound || curSample < firstSample-T55xx_READ_TOL){
-                               if (!startFound) 
+                               // if just found start - recover last sample
+                               if (!startFound) {
                                        dest[i++] = firstSample;
-                               startFound = true;
+                                       startFound = true;
+                               }
+                               // collect samples
                                dest[i++] = curSample;
-                       LED_D_OFF();
-                       if (i >= bufsize) break;
+                               if (i >= bufsize-1) break;
                        }
                }
        }