Merge branch 'master' into fix_printf

[proxmark3-svn] / client / proxgui.h

diff --git a/client/proxgui.h b/client/proxgui.h
index ea3abf32497a34f2aa95d1464f7ae67c9bc17c06..77bcbf011e4c0cd320043d26d96b2ab9d0372539 100644 (file)
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -14,13 +14,12 @@ extern "C" {
 
 #include <stdint.h>
 #include <string.h>
 
 #include <stdint.h>
 #include <string.h>

-#include "uart.h"

 
 void ShowGraphWindow(void);
 void HideGraphWindow(void);
 void RepaintGraphWindow(void);
 void MainGraphics(void);
 
 void ShowGraphWindow(void);
 void HideGraphWindow(void);
 void RepaintGraphWindow(void);
 void MainGraphics(void);

-void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present, serial_port* sp);
+void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present);

 void ExitGraphics(void);
 
 #define MAX_GRAPH_TRACE_LEN (40000*8)
 void ExitGraphics(void);
 
 #define MAX_GRAPH_TRACE_LEN (40000*8)


@@ -31,6 +30,7 @@ extern int s_Buff[MAX_GRAPH_TRACE_LEN];
 extern double CursorScaleFactor;
 extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
 extern int CommandFinished;
 extern double CursorScaleFactor;
 extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
 extern int CommandFinished;

+extern int offline;

 extern bool GridLocked;
 
 //Operations defined in data_operations
 extern bool GridLocked;
 
 //Operations defined in data_operations