X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db8296025f78251ffa2c28d6fe995bbb0a386c77..5bac3d9b3cb3f262752ae2b7c0908b1ea6872087:/armsrc/lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 7c541282..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;
@@ -255,7 +255,8 @@ uint32_t SnoopLF()
 **/
 void doT55x7Acquisition(size_t sample_size) {
 
-	#define T55xx_READ_UPPER_THRESHOLD 128+40  // 40 grph
+	#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();
@@ -267,10 +268,11 @@ void doT55x7Acquisition(size_t 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() && 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;
@@ -282,15 +284,26 @@ void doT55x7Acquisition(size_t sample_size) {
 
 			// skip until the first high sample above threshold
 			if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-				if (curSample > lastSample) 
-					lastSample = 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 first high samples begin to change
-			if (startFound || curSample < T55xx_READ_UPPER_THRESHOLD-T55xx_READ_TOL){
+			if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD+T55xx_READ_TOL){
 				// if just found start - recover last sample
 				if (!startFound) {
 					dest[i++] = lastSample;
@@ -298,7 +311,6 @@ void doT55x7Acquisition(size_t sample_size) {
 				}
 				// collect samples
 				dest[i++] = curSample;
-				if (i >= bufsize-1) break;
 			}
 		}
 	}