X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..0db11b71efad3781186cc2da9f31686a6562d065:/client/ui.c

diff --git a/client/ui.c b/client/ui.c
index 4f1b5d85..48a55b1f 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,19 +9,11 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <readline/readline.h>
-#include <pthread.h>
-
 #include "ui.h"
-
 double CursorScaleFactor;
 int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
 int offline;
-int flushAfterWrite = 0;  //buzzy
+int flushAfterWrite = 0;
 extern pthread_mutex_t print_lock;
 
 static char *logfilename = "proxmark3.log";
@@ -32,13 +24,13 @@ void PrintAndLog(char *fmt, ...)
 	int saved_point;
 	va_list argptr, argptr2;
 	static FILE *logfile = NULL;
-	static int logging=1;
+	static int logging = 1;
 
 	// lock this section to avoid interlacing prints from different threats
 	pthread_mutex_lock(&print_lock);
   
 	if (logging && !logfile) {
-		logfile=fopen(logfilename, "a");
+		logfile = fopen(logfilename, "a");
 		if (!logfile) {
 			fprintf(stderr, "Can't open logfile, logging disabled!\n");
 			logging=0;
@@ -77,292 +69,127 @@ void PrintAndLog(char *fmt, ...)
 	}
 	va_end(argptr2);
 
-	if (flushAfterWrite == 1)  //buzzy
-	{
+	if (flushAfterWrite == 1) {
 		fflush(NULL);
 	}
 	//release lock
 	pthread_mutex_unlock(&print_lock);  
 }
 
-
-void SetLogFilename(char *fn)
-{
+void SetLogFilename(char *fn) {
   logfilename = fn;
 }
-
-
-int manchester_decode(const int * data, const size_t len, uint8_t * dataout){
-	
-	int bitlength = 0;
-	int i, clock, high, low, startindex;
-	low = startindex = 0;
-	high = 1;
-	uint8_t bitStream[len];
-
-	memset(bitStream, 0x00, len);	
-	
-	/* Detect high and lows */
-	for (i = 0; i < len; i++) {
-		if (data[i] > high)
-			high = data[i];
-		else if (data[i] < low)
-			low = data[i];
+ 
+void iceFsk3(int * data, const size_t len){
+
+	int i,j;
+	
+	int * output =  (int* ) malloc(sizeof(int) * len);	
+	memset(output, 0x00, len);
+	float fc           = 0.1125f;          // center frequency
+	size_t adjustedLen = len;
+	
+    // create very simple low-pass filter to remove images (2nd-order Butterworth)
+    float complex iir_buf[3] = {0,0,0};
+    float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
+    float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
+    
+    float sample           = 0;      // input sample read from file
+    float complex x_prime  = 1.0f;   // save sample for estimating frequency
+    float complex x;
+		
+	for (i=0; i<adjustedLen; ++i) {
+
+		sample = data[i]+128;
+		
+        // remove DC offset and mix to complex baseband
+        x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
+
+        // apply low-pass filter, removing spectral image (IIR using direct-form II)
+        iir_buf[2] = iir_buf[1];
+        iir_buf[1] = iir_buf[0];
+        iir_buf[0] = x - a[1]*iir_buf[1] - a[2]*iir_buf[2];
+        x          = b[0]*iir_buf[0] +
+                     b[1]*iir_buf[1] +
+                     b[2]*iir_buf[2];
+					 
+        // compute instantaneous frequency by looking at phase difference
+        // between adjacent samples
+        float freq = cargf(x*conjf(x_prime));
+        x_prime = x;    // retain this sample for next iteration
+
+		output[i] =(freq > 0)? 10 : -10;
+    } 
+
+	// show data
+	for (j=0; j<adjustedLen; ++j)
+		data[j] = output[j];
+		
+	CmdLtrim("30");
+	adjustedLen -= 30;
+	
+	// zero crossings.
+	for (j=0; j<adjustedLen; ++j){
+		if ( data[j] == 10) break;
 	}
+	int startOne =j;
 	
-	/* get clock */
-	clock = GetT55x7Clock( data, len, high );	
-	startindex = DetectFirstTransition(data, len, high, low);
-  
-	PrintAndLog(" Clock      : %d", clock);
-	PrintAndLog(" startindex : %d", startindex);
-	
-	if (high != 1)
-		bitlength = ManchesterConvertFrom255(data, len, bitStream, high, low, clock, startindex);
-	else
-		bitlength= ManchesterConvertFrom1(data, len, bitStream, clock, startindex);
-
-	if ( bitlength > 0 ){
-		PrintPaddedManchester(bitStream, bitlength, clock);
+	for (;j<adjustedLen; ++j){
+		if ( data[j] == -10 ) break;
 	}
-
-	memcpy(dataout, bitStream, bitlength);
+	int stopOne = j-1;
 	
-	free(bitStream);
-	return bitlength;
-}
-
- int GetT55x7Clock( const int * data, const size_t len, int peak ){ 
- 
- 	int i,lastpeak,clock;
-	clock = 0xFFFF;
-	lastpeak = 0;
+	int fieldlen = stopOne-startOne;
 	
-	/* Detect peak if we don't have one */
-	if (!peak) {
-		for (i = 0; i < len; ++i) {
-			if (data[i] > peak) {
-				peak = data[i];
-			}
-		}
+	fieldlen = (fieldlen == 39 || fieldlen == 41)? 40 : fieldlen;
+	fieldlen = (fieldlen == 59 || fieldlen == 51)? 50 : fieldlen;
+	if ( fieldlen != 40 && fieldlen != 50){
+		printf("Detected field Length: %d \n", fieldlen);
+		printf("Can only handle 40 or 50.  Aborting...\n");
+		free(output);
+		return;
 	}
 	
-	for (i = 1; i < len; ++i) {
-		/* if this is the beginning of a peak */
-		if ( data[i-1] != data[i] &&  data[i] == peak) {
-		  /* find lowest difference between peaks */
-			if (lastpeak && i - lastpeak < clock)
-				clock = i - lastpeak;
-			lastpeak = i;
+	// FSK sequence start == 000111
+	int startPos = 0;
+	for (i =0; i<adjustedLen; ++i){
+		int dec = 0;
+		for ( j = 0; j < 6*fieldlen; ++j){
+			dec += data[i + j];
 		}
-	}
-	//return clock;  
- 	//defaults clock to precise values.
-	switch(clock){
-		case 8:
-		case 16:
-		case 32:
-		case 40:
-		case 50:
-		case 64:
-		case 100:
-		case 128:
-		return clock;
-		break;
-		default:  break;
-	}
-	return 32;
- }
- 
- int DetectFirstTransition(const int * data, const size_t len, int high, int low){
-
-	int i, retval;
-	retval = 0;
-	/* 
-		Detect first transition Lo-Hi (arbitrary)       
-		skip to the first high
-	*/
-	  for (i = 0; i < len; ++i)
-		if (data[i] == high)
-		  break;
-		  
-	  /* now look for the first low */
-	  for (; i < len; ++i) {
-		if (data[i] == low) {
-			retval = i;
+		if (dec == 0) {
+			startPos = i;
 			break;
 		}
-	  }
-	return retval;
- }
-
- int ManchesterConvertFrom255(const int * data, const size_t len, uint8_t * dataout, int high, int low, int clock, int startIndex){
-
-	int i, j, hithigh, hitlow, first, bit, bitIndex;
-	i = startIndex;
-	bitIndex = 0;
-
-	/*
-	* We assume the 1st bit is zero, it may not be
-	* the case: this routine (I think) has an init problem.
-	* Ed.
-	*/
-	bit = 0; 
-
-	for (; i < (int)(len / clock); i++)
-	{
-		hithigh = 0;
-		hitlow = 0;
-		first = 1;
-
-		/* Find out if we hit both high and low peaks */
-		for (j = 0; j < clock; j++)
-		{
-			if (data[(i * clock) + j] == high)
-				hithigh = 1;
-			else if (data[(i * clock) + j] == low)
-				hitlow = 1;
-
-			/* it doesn't count if it's the first part of our read
-			   because it's really just trailing from the last sequence */
-			if (first && (hithigh || hitlow))
-			  hithigh = hitlow = 0;
-			else
-			  first = 0;
-
-			if (hithigh && hitlow)
-			  break;
-		}
-
-		/* If we didn't hit both high and low peaks, we had a bit transition */
-		if (!hithigh || !hitlow)
-			bit ^= 1;
-
-		dataout[bitIndex++] = bit;
-	}
-	return bitIndex;
- }
- 
- int ManchesterConvertFrom1(const int * data, const size_t len, uint8_t * dataout, int clock, int startIndex){
-
-	int i,j, bitindex, lc, tolerance, warnings;
-	warnings = 0;
-	int upperlimit = len*2/clock+8;
-	i = startIndex;
-	j = 0;
-	tolerance = clock/4;
-	uint8_t decodedArr[len];
-	
-	/* Then detect duration between 2 successive transitions */
-	for (bitindex = 1; i < len; i++) {
-	
-		if (data[i-1] != data[i]) {
-			lc = i - startIndex;
-			startIndex = i;
-
-			// Error check: if bitindex becomes too large, we do not
-			// have a Manchester encoded bitstream or the clock is really wrong!
-			if (bitindex > upperlimit ) {
-				PrintAndLog("Error: the clock you gave is probably wrong, aborting.");
-				return 0;
-			}
-			// Then switch depending on lc length:
-			// Tolerance is 1/4 of clock rate (arbitrary)
-			if (abs((lc-clock)/2) < tolerance) {
-				// Short pulse : either "1" or "0"
-				decodedArr[bitindex++] = data[i-1];
-			} else if (abs(lc-clock) < tolerance) {
-				// Long pulse: either "11" or "00"
-				decodedArr[bitindex++] = data[i-1];
-				decodedArr[bitindex++] = data[i-1];
-			} else {
-				++warnings;
-				PrintAndLog("Warning: Manchester decode error for pulse width detection.");
-				if (warnings > 10) {
-					PrintAndLog("Error: too many detection errors, aborting.");
-					return 0; 
-				}
-			}
-		}
 	}
 	
-	/* 
-	* We have a decodedArr of "01" ("1") or "10" ("0")
-	* parse it into final decoded dataout
-    */ 
-    for (i = 0; i < bitindex; i += 2) {
+	printf("000111 position: %d \n", startPos);
 
-	    if ((decodedArr[i] == 0) && (decodedArr[i+1] == 1)) {
-			dataout[j++] = 1;
-		} else if ((decodedArr[i] == 1) && (decodedArr[i+1] == 0)) {
-			dataout[j++] = 0;
-		} else {
-			i++;
-			warnings++;
-			PrintAndLog("Unsynchronized, resync...");
-			PrintAndLog("(too many of those messages mean the stream is not Manchester encoded)");
-
-			if (warnings > 10) {	
-				PrintAndLog("Error: too many decode errors, aborting.");
-				return 0;
-			}
-		}
-    }
+	startPos += 6*fieldlen+5;
 	
-	PrintAndLog("%s", sprint_hex(dataout, j));
-	return j;
- }
- 
- void ManchesterDiffDecodedString(const uint8_t* bitstream, size_t len, uint8_t invert){
-	/* 
-	* We have a bitstream of "01" ("1") or "10" ("0")
-	* parse it into final decoded bitstream
-    */ 
-	int i, j, warnings; 
-	uint8_t decodedArr[(len/2)+1];
-
-	j = warnings = 0;
-	
-	uint8_t lastbit = 0;
+	int bit =0;
+	printf("BINARY\n");
+	printf("R/40 :  ");
+	for (i =startPos ; i < adjustedLen; i += 40){
+		bit = data[i]>0 ? 1:0;
+		printf("%d", bit );
+	}
+	printf("\n");	
 	
-    for (i = 0; i < len; i += 2) {
+	printf("R/50 :  ");
+	for (i =startPos ; i < adjustedLen; i += 50){
+		bit = data[i]>0 ? 1:0;
+		printf("%d", bit );	}
+	printf("\n");	
 	
-		uint8_t first = bitstream[i];
-		uint8_t second = bitstream[i+1];
-
-		if ( first == second ) {
-			++i;
-			++warnings;
-			if (warnings > 10) {
-				PrintAndLog("Error: too many decode errors, aborting.");
-				return;
-			}
-		} 
-		else if ( lastbit != first ) {
-			decodedArr[j++] = 0 ^ invert;
-		}
-		else {
-			decodedArr[j++] = 1 ^ invert;
-		}
-		lastbit = second;
-    }
-	
-	PrintAndLog("%s", sprint_hex(decodedArr, j));
+	free(output);
 }
- 
- 
-void PrintPaddedManchester( uint8_t* bitStream, size_t len, size_t blocksize){
 
-	  PrintAndLog(" Manchester decoded bitstream : %d bits", len);
-	  
-	  uint8_t mod = len % blocksize;
-	  uint8_t div = len / blocksize;
-	  int i;
-	  // Now output the bitstream to the scrollback by line of 16 bits
-	  for (i = 0; i < div*blocksize; i+=blocksize) {
-		PrintAndLog(" %s", sprint_bin(bitStream+i,blocksize) );
-	  }
-	  if ( mod > 0 ){
-		PrintAndLog(" %s", sprint_bin(bitStream+i, mod) );
-	  }
+float complex cexpf (float complex Z)
+{
+  float complex  Res;
+  double rho = exp (__real__ Z);
+  __real__ Res = rho * cosf(__imag__ Z);
+  __imag__ Res = rho * sinf(__imag__ Z);
+  return Res;
 }