X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..0956e0dba568044b63636151999c817e76f47964:/armsrc/lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 2a763a50..6eecf407 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -141,7 +141,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 	uint32_t sample_total_numbers =0 ;
 	uint32_t sample_total_saved =0 ;
 
-	while(!BUTTON_PRESS()) {
+	while(!BUTTON_PRESS() && !usb_poll_validate_length() ) {
 		WDT_HIT();
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
 			AT91C_BASE_SSC->SSC_THR = 0x43;
@@ -252,26 +252,24 @@ 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;
 
-	//int adcval = 0;
 	uint16_t i = 0;
 	bool startFound = false;
 	bool highFound = false;
 	uint8_t curSample = 0;
 	uint8_t firstSample = 0;
 	uint16_t skipCnt = 0;
-	while(!BUTTON_PRESS() && skipCnt<1000) {
+	while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt<1000) {
 		WDT_HIT();		
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
 			AT91C_BASE_SSC->SSC_THR = 0x43;
@@ -281,7 +279,7 @@ 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;
@@ -291,16 +289,18 @@ void doT55x7Acquisition(void){
 				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;
 				if (i >= bufsize-1) break;
 			}
 		}
-		
 	}
 }
 			
\ No newline at end of file