Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index cfaec6a510dcfaadfe4edc725a41eeddf461097c..0bab2eb3dc51fa08a7d14b1db38c3425da3efaf5 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -10,8 +10,12 @@
 //-----------------------------------------------------------------------------
 
 #include "ui.h"
 //-----------------------------------------------------------------------------
 
 #include "ui.h"

+
+// set QT vars

 double CursorScaleFactor;
 double CursorScaleFactor;

-int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
+int PlotGridX, PlotGridY, PlotGridXdefault = 64, PlotGridYdefault = 64, CursorCPos = 0, CursorDPos = 0;
+int PlotClock = 0, PlockClockStartIndex = 0;
+

 int offline;
 int flushAfterWrite = 0;
 extern pthread_mutex_t print_lock;
 int offline;
 int flushAfterWrite = 0;
 extern pthread_mutex_t print_lock;


@@ -25,8 +29,11 @@ void PrintAndLog(char *fmt, ...)
        va_list argptr, argptr2;
        static FILE *logfile = NULL;
        static int logging = 1;
        va_list argptr, argptr2;
        static FILE *logfile = NULL;
        static int logging = 1;

-
-       // lock this section to avoid interlacing prints from different threats
+       // time_t current_time;
+       // struct tm* tm_info;
+       // char buffer[26] = {0};
+               
+       // lock this section to avoid interlacing prints from different threads

        pthread_mutex_lock(&print_lock);
   
        if (logging && !logfile) {
        pthread_mutex_lock(&print_lock);
   
        if (logging && !logfile) {


@@ -63,6 +70,16 @@ void PrintAndLog(char *fmt, ...)
        }
        
        if (logging && logfile) {
        }
        
        if (logging && logfile) {

+
+               /*
+               // Obtain current time.
+               current_time = time(NULL);
+               // Convert to local time format.
+               tm_info = localtime(&current_time);             
+               strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+               fprintf(logfile, "%s  ", buffer);
+               */
+               

                vfprintf(logfile, fmt, argptr2);
                fprintf(logfile,"\n");
                fflush(logfile);
                vfprintf(logfile, fmt, argptr2);
                fprintf(logfile,"\n");
                fflush(logfile);


@@ -77,7 +94,7 @@ void PrintAndLog(char *fmt, ...)
 }
 
 void SetLogFilename(char *fn) {
 }
 
 void SetLogFilename(char *fn) {

-  logfilename = fn;
+       logfilename = fn;

 }
  
 void iceIIR_Butterworth(int *data, const size_t len){
 }
  
 void iceIIR_Butterworth(int *data, const size_t len){