X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/91c38cf715f2bbd668cb13f4acfed0cb01293912..56bbb25a4114df189f66dc8c14d233187e40b042:/client/ui.c diff --git a/client/ui.c b/client/ui.c index 99c9f170..9c24f17d 100644 --- a/client/ui.c +++ b/client/ui.c @@ -1,49 +1,138 @@ -#include -#include -#include +//----------------------------------------------------------------------------- +// Copyright (C) 2009 Michael Gernoth +// Copyright (C) 2010 iZsh +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// UI utilities +//----------------------------------------------------------------------------- #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"; -// FIXME: ifndef not really nice... -// We should eventually get rid of it once -// we fully factorize the code between *nix and windows -// (using pthread and alikes...) -#ifndef WIN32 void PrintAndLog(char *fmt, ...) { - 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; - } - } - - va_start(argptr, fmt); - va_copy(argptr2, argptr); - vprintf(fmt, argptr); - va_end(argptr); - printf("\n"); - if (logging && logfile) { - vfprintf(logfile, fmt, argptr2); - fprintf(logfile,"\n"); - fflush(logfile); - } - va_end(argptr2); + char *saved_line; + int saved_point; + va_list argptr, argptr2; + static FILE *logfile = NULL; + 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"); + if (!logfile) { + fprintf(stderr, "Can't open logfile, logging disabled!\n"); + logging=0; + } + } + + int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0; + + if (need_hack) { + saved_point = rl_point; + saved_line = rl_copy_text(0, rl_end); + rl_save_prompt(); + rl_replace_line("", 0); + rl_redisplay(); + } + + 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(); + rl_replace_line(saved_line, 0); + rl_point = saved_point; + rl_redisplay(); + free(saved_line); + } + + 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); } -#endif -void SetLogFilename(char *fn) -{ +void SetLogFilename(char *fn) { logfilename = fn; } + +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 + 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 array + 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; j