github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 02:26:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

proxmark3 refactoring command line parameters (#417)

Browse source 
* add -c (execute command from command line)
* fix: sometimes proxmark executes command twice...
* fix: start proxmark from QT was in a strange way (if we issue command very fast - it hangs)
* added -l (execute lua script)
* rework help
* small memory management bugfix
* small fix in executing command files
* enable piping from STDIN
This commit is contained in:
Oleg Moiseenko 2017-10-20 07:49:53 +03:00 • committed by pwpiwi
commit aa757f71d9
9 changed files with 241 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/proxguiqt.h
View file

@ -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,6 +125,7 @@ class ProxGuiQT : public QObject
void _RepaintGraphWindow(void);
void _HideGraphWindow(void);
void _Exit(void);
void _StartProxmarkThread(void);
signals:
void ShowGraphWindowSignal(void);
void RepaintGraphWindowSignal(void);
@ -119,16 +133,4 @@ class ProxGuiQT : public QObject
void ExitSignal(void);
};
class WorkerThread : public QThread {
Q_OBJECT;
public:
WorkerThread(char*, bool);
~WorkerThread();
void run();
private:
char *script_cmds_file = NULL;
bool usb_present;
};
#endif // PROXGUI_QT