X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e6b8c965bb27650b3ead5738ba46dd4c82f937de..a75d63f19b93f22faeff886f9f2568f3d7531d55:/client/ui.c diff --git a/client/ui.c b/client/ui.c index 554230cb..48a55b1f 100644 --- a/client/ui.c +++ b/client/ui.c @@ -9,17 +9,12 @@ // UI utilities //----------------------------------------------------------------------------- -#include -#include -#include -#include -#include - #include "ui.h" - double CursorScaleFactor; -int PlotGridX, PlotGridY; +int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64; int offline; +int flushAfterWrite = 0; +extern pthread_mutex_t print_lock; static char *logfilename = "proxmark3.log"; @@ -27,17 +22,20 @@ void PrintAndLog(char *fmt, ...) { char *saved_line; int saved_point; - va_list argptr, argptr2; - static FILE *logfile = NULL; - static int logging=1; + va_list argptr, argptr2; + static FILE *logfile = NULL; + static int logging = 1; - if (logging && !logfile) { - logfile=fopen(logfilename, "a"); - if (!logfile) { - fprintf(stderr, "Can't open logfile, logging disabled!\n"); - logging=0; - } - } + // lock this section to avoid interlacing prints from different threats + pthread_mutex_lock(&print_lock); + + if (logging && !logfile) { + logfile = fopen(logfilename, "a"); + if (!logfile) { + fprintf(stderr, "Can't open logfile, logging disabled!\n"); + logging=0; + } + } int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0; @@ -49,12 +47,12 @@ void PrintAndLog(char *fmt, ...) rl_redisplay(); } - va_start(argptr, fmt); - va_copy(argptr2, argptr); - vprintf(fmt, argptr); - printf(" "); // cleaning prompt - va_end(argptr); - printf("\n"); + va_start(argptr, fmt); + va_copy(argptr2, argptr); + vprintf(fmt, argptr); + printf(" "); // cleaning prompt + va_end(argptr); + printf("\n"); if (need_hack) { rl_restore_prompt(); @@ -64,15 +62,134 @@ void PrintAndLog(char *fmt, ...) free(saved_line); } - if (logging && logfile) { - vfprintf(logfile, fmt, argptr2); - fprintf(logfile,"\n"); - fflush(logfile); - } - va_end(argptr2); + if (logging && logfile) { + vfprintf(logfile, fmt, argptr2); + fprintf(logfile,"\n"); + fflush(logfile); + } + va_end(argptr2); + + if (flushAfterWrite == 1) { + fflush(NULL); + } + //release lock + pthread_mutex_unlock(&print_lock); } -void SetLogFilename(char *fn) -{ +void SetLogFilename(char *fn) { logfilename = fn; } + +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 0)? 10 : -10; + } + + // show data + for (j=0; j0 ? 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); +} + +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; +}