CHG: iso14443b.c got some more love. using the "hf 14b raw" command gives now...

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 1eb877d84e1a8875f203f53910bd5d1d910f1de4..9c24f17d1bdd2aa5155397dc54fb9fafcff646fc 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,17 +9,12 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <readline/readline.h>
-
 #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);
-  vprintf("          ", 0); // 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,77 @@ 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 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<adjustedLen; ++i) {
+
+               sample = data[i];
+               
+        // 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];
+               
+       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;
+}