X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/be2d41b73a10f52c319dcf2c0664ff071fb753f1..39d56ec88be1ee4c8d13f1a08aa40daccab273d6:/armsrc/lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 91572563..88df543f 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -10,7 +10,7 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-
+#include "usb_cdc.h" // for usb_poll_validate_length
 #include "lfsampling.h"
 
 sample_config config = { 1, 8, 1, 95, 0 } ;
@@ -124,7 +124,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 	uint8_t *dest = BigBuf_get_addr();
     int bufsize = BigBuf_max_traceLen();
 
-	memset(dest, 0, bufsize);
+	//memset(dest, 0, bufsize); //creates issues with cmdread (marshmellow)
 
 	if(bits_per_sample < 1) bits_per_sample = 1;
 	if(bits_per_sample > 8) bits_per_sample = 8;
@@ -253,27 +253,26 @@ 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+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 > 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;
+	bool lowFound = false;
 	uint8_t curSample = 0;
-	uint8_t firstSample = 0;
+	uint8_t lastSample = 0;
 	uint16_t skipCnt = 0;
-	while(!BUTTON_PRESS() && skipCnt<1000) {
+	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;
@@ -283,25 +282,36 @@ void doT55x7Acquisition(void){
 			curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 			LED_D_OFF();
 
-			// find first high sample
+			// skip until the first high sample above threshold
 			if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-				if (curSample > firstSample) 
-					firstSample = curSample;
+				//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 samples begin to change
-			if (startFound || curSample < firstSample-T55xx_READ_TOL){
-				if (!startFound) 
-					dest[i++] = firstSample;
-				startFound = true;
+			// 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;
-				if (i >= bufsize-1) break;
 			}
 		}
-		//skipCnt++;
 	}
 }