X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a8fd088d8b142520fbb686b315df7216a81d481f..c24364a8a4932f51a9b9e255d2ed0c67b9e37c74:/common/lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 439699c6..c177468f 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -243,6 +243,7 @@ int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *h
 
 //by marshmellow
 //demodulates strong heavily clipped samples
+//RETURN: num of errors.  if 0, is ok.
 int cleanAskRawDemod(uint8_t *BinStream, size_t *size, int clk, int invert, int high, int low)
 {
 	size_t bitCnt=0, smplCnt=0, errCnt=0;
@@ -386,25 +387,30 @@ int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-int manrawdecode(uint8_t * BitStream, size_t *size, uint8_t invert){
+int manrawdecode(uint8_t *BitStream, size_t *size, uint8_t invert){
+
+	// sanity check
+	if (*size < 16) return -1;
+	
 	int errCnt = 0, bestErr = 1000;
 	uint16_t bitnum = 0, MaxBits = 512, bestRun = 0;
 	size_t i, k;
-	if (*size < 16) return -1;
+
 	//find correct start position [alignment]
-	for (k=0; k < 2; ++k){
-		for (i=k; i<*size-3; i += 2)
+	for (k = 0; k < 2; ++k){
+		for (i = k; i < *size-3; i += 2) {
 			if (BitStream[i] == BitStream[i+1])
 				errCnt++;
-
+		}
 		if (bestErr > errCnt){
 			bestErr = errCnt;
 			bestRun = k;
 		}
-		errCnt=0;
+		errCnt = 0;
 	}
+	
 	//decode
-	for (i=bestRun; i < *size-3; i += 2){
+	for (i = bestRun; i < *size-3; i += 2){
 		if (BitStream[i] == 1 && (BitStream[i+1] == 0)){
 			BitStream[bitnum++] = invert;
 		} else if ((BitStream[i] == 0) && BitStream[i+1] == 1){
@@ -412,9 +418,9 @@ int manrawdecode(uint8_t * BitStream, size_t *size, uint8_t invert){
 		} else {
 			BitStream[bitnum++] = 7;
 		}
-		if (bitnum>MaxBits) break;
+		if (bitnum > MaxBits) break;
 	}
-	*size=bitnum;
+	*size = bitnum;
 	return bestErr;
 }
 
@@ -1839,6 +1845,10 @@ bool DetectST(uint8_t buffer[], size_t *size, int *foundclock) {
 			for(i=0; i < clk/2-tol; ++i) {
 				buffer[dataloc+i] = high+5;
 			}
+		} //test for single sample outlier (high between two lows) in the case of very strong waves
+		if (buffer[dataloc] >= high && buffer[dataloc+2] <= low) {
+			buffer[dataloc] = buffer[dataloc+2];
+			buffer[dataloc+1] = buffer[dataloc+2];
 		}
 		for (i=0; i<datalen; ++i) {
 			if (i+newloc < bufsize) {