X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d16b33feb5b22c16334b44e3c51747328f783124..01c78dabc3c80c89ad6ff623bb66f5b3c6067e67:/client/ui.c diff --git a/client/ui.c b/client/ui.c index 0dc9118b..9c24f17d 100644 --- a/client/ui.c +++ b/client/ui.c @@ -9,20 +9,7 @@ // UI utilities //----------------------------------------------------------------------------- -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <stdbool.h> -#include <time.h> -#include <readline/readline.h> -#include <pthread.h> -#include "loclass/cipherutils.h" #include "ui.h" -#include "cmdmain.h" -#include "cmddata.h" -#include "graph.h" -#define M_PI 3.14159265358979323846264338327 - double CursorScaleFactor; int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64; int offline; @@ -93,13 +80,13 @@ void SetLogFilename(char *fn) { logfilename = fn; } -void iceFsk3(int * data, const size_t len){ +void iceIIR_Butterworth(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 + float fc = 0.1125f; // center frequency size_t adjustedLen = len; // create very simple low-pass filter to remove images (2nd-order Butterworth) @@ -107,13 +94,13 @@ void iceFsk3(int * data, const size_t len){ 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 sample = 0; // input sample read from array float complex x_prime = 1.0f; // save sample for estimating frequency float complex x; for (i=0; i<adjustedLen; ++i) { - sample = data[i]+128; + sample = data[i]; // remove DC offset and mix to complex baseband x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i ); @@ -138,63 +125,6 @@ void iceFsk3(int * data, const size_t len){ 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; - - for (;j<adjustedLen; ++j){ - if ( data[j] == -10 ) break; - } - int stopOne = j-1; - - int fieldlen = stopOne-startOne; - - 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; - } - - // 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]; - } - if (dec == 0) { - startPos = i; - break; - } - } - - printf("000111 position: %d \n", startPos); - - startPos += 6*fieldlen+5; - - 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"); - - printf("R/50 : "); - for (i =startPos ; i < adjustedLen; i += 50){ - bit = data[i]>0 ? 1:0; - printf("%d", bit ); } - printf("\n"); - free(output); }