X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a739812e899f9107ed7220965539c61705dc54c8..c2731f37bef482bde1a87d79566c0b3bde658c98:/armsrc/lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 8b4ab778..ab3a187f 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -121,11 +121,11 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
  */
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
 {
-	//.
+	//bigbuf, to hold the aquired raw data signal
 	uint8_t *dest = BigBuf_get_addr();
-    int bufsize = BigBuf_max_traceLen();
+    uint16_t bufsize = BigBuf_max_traceLen();
 
-	memset(dest, 0, bufsize);
+	BigBuf_Clear_ext(false);
 
 	if(bits_per_sample < 1) bits_per_sample = 1;
 	if(bits_per_sample > 8) bits_per_sample = 8;
@@ -244,7 +244,6 @@ uint32_t SampleLF(bool printCfg)
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-
 uint32_t SnoopLF() {
 	return ReadLF(false, true);
 }
@@ -253,52 +252,55 @@ 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
-	//#define T55xx_READ_LOWER_THRESHOLD 128-40  //-50
 
 	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
+			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 > 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;
+				}
+				// collect samples
 				dest[i++] = curSample;
-			LED_D_OFF();
-			if (i >= bufsize) break;
+				if (i >= bufsize-1) break;
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+			
\ No newline at end of file