projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inc timeout
[proxmark3-svn]
/
client
/
proxguiqt.h
diff --git
a/client/proxguiqt.h
b/client/proxguiqt.h
index 8ea4d312a2dda96455091e811b2bfb1ce942eca9..45a65b040c5702dc922644c8deb18bbbbe6206a0 100644
(file)
--- a/
client/proxguiqt.h
+++ b/
client/proxguiqt.h
@@
-11,6
+11,9
@@
#ifndef PROXGUI_QT
#define PROXGUI_QT
#ifndef PROXGUI_QT
#define PROXGUI_QT
+#include <stdint.h>
+#include <string.h>
+
#include <QApplication>
#include <QPushButton>
#include <QObject>
#include <QApplication>
#include <QPushButton>
#include <QObject>
@@
-85,6
+88,18
@@
class ProxWidget : public QWidget
void vchange_dthr_down(int v);
};
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;
class ProxGuiQT : public QObject
{
Q_OBJECT;
@@
-95,9
+110,10
@@
class ProxGuiQT : public QObject
int argc;
char **argv;
void (*main_func)(void);
int argc;
char **argv;
void (*main_func)(void);
+ WorkerThread *proxmarkThread;
public:
public:
- ProxGuiQT(int argc, char **argv);
+ ProxGuiQT(int argc, char **argv
, WorkerThread *wthread
);
~ProxGuiQT(void);
void ShowGraphWindow(void);
void RepaintGraphWindow(void);
~ProxGuiQT(void);
void ShowGraphWindow(void);
void RepaintGraphWindow(void);
@@
-109,10
+125,12
@@
class ProxGuiQT : public QObject
void _RepaintGraphWindow(void);
void _HideGraphWindow(void);
void _Exit(void);
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);
};
signals:
void ShowGraphWindowSignal(void);
void RepaintGraphWindowSignal(void);
void HideGraphWindowSignal(void);
void ExitSignal(void);
};
+
#endif // PROXGUI_QT
#endif // PROXGUI_QT
Impressum
,
Datenschutz