Merge pull request #569 from pwpiwi/fix_WDT_crash

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index b3a3e85a3bf4bfec1c6dd764be78972358e4a847..45a65b040c5702dc922644c8deb18bbbbe6206a0 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -88,6 +88,18 @@ class ProxWidget : public QWidget
                void vchange_dthr_down(int v);
 };
 
+class WorkerThread : public QThread {
+               Q_OBJECT;
+       public:
+               WorkerThread(char*, char*, bool);
+               ~WorkerThread();
+               void run();
+       private:
+               char *script_cmds_file = NULL;
+               char *script_cmd = NULL;
+               bool usb_present;
+};
+
 class ProxGuiQT : public QObject
 {
        Q_OBJECT;
@@ -98,9 +110,10 @@ class ProxGuiQT : public QObject
                int argc;
                char **argv;
                void (*main_func)(void);
+               WorkerThread *proxmarkThread;
        
        public:
-               ProxGuiQT(int argc, char **argv);
+               ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
                ~ProxGuiQT(void);
                void ShowGraphWindow(void);
                void RepaintGraphWindow(void);
@@ -112,10 +125,12 @@ class ProxGuiQT : public QObject
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
                void _Exit(void);
+               void _StartProxmarkThread(void);
        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);
                void ExitSignal(void);
 };
+
 #endif // PROXGUI_QT