github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-30 19:40:09 -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
parent 36b1cdd1b4
commit aa757f71d9
9 changed files with 241 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/proxguiqt.cpp
View file

@ -85,6 +85,17 @@ void ProxGuiQT::_Exit(void) {
delete this;
}
void ProxGuiQT::_StartProxmarkThread(void) {
if (!proxmarkThread)
return;
// if thread finished delete self and delete application
QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
// start proxmark thread
proxmarkThread->start();
}
void ProxGuiQT::MainLoop()
{
plotapp = new QApplication(argc, argv);
@ -94,11 +105,14 @@ void ProxGuiQT::MainLoop()
connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
//start proxmark thread after starting event loop
QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
plotapp->exec();
}
ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
argc(argc), argv(argv)
ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
argc(argc), argv(argv), proxmarkThread(wthread)
{
}