projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'graphwork2' into graphwork
[proxmark3-svn]
/
client
/
ui.c
diff --git
a/client/ui.c
b/client/ui.c
index c0d01bc32983a2efb313f99640d745ce3af8cde9..05e29dc70d927e48264f049fa41164c06c2dd32c 100644
(file)
--- a/
client/ui.c
+++ b/
client/ui.c
@@
-12,16
+12,20
@@
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
-#include <
time
.h>
+#include <
stdbool
.h>
#include <readline/readline.h>
#include <pthread.h>
#include "ui.h"
#include <readline/readline.h>
#include <pthread.h>
#include "ui.h"
-double CursorScaleFactor;
-int PlotGridX
, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64
;
+double CursorScaleFactor
= 1
;
+int PlotGridX
=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0
;
int offline;
int flushAfterWrite = 0; //buzzy
int offline;
int flushAfterWrite = 0; //buzzy
+int GridOffset = 0;
+bool GridLocked = false;
+bool showDemod = true;
+
extern pthread_mutex_t print_lock;
static char *logfilename = "proxmark3.log";
extern pthread_mutex_t print_lock;
static char *logfilename = "proxmark3.log";
@@
-34,7
+38,7
@@
void PrintAndLog(char *fmt, ...)
static FILE *logfile = NULL;
static int logging=1;
static FILE *logfile = NULL;
static int logging=1;
- // lock this section to avoid interlacing prints from different threa
t
s
+ // lock this section to avoid interlacing prints from different threa
d
s
pthread_mutex_lock(&print_lock);
if (logging && !logfile) {
pthread_mutex_lock(&print_lock);
if (logging && !logfile) {
Impressum
,
Datenschutz