b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-02-17 06:31:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop the running command after disconnected

Browse Source
This commit is contained in:
wh201906 2020-08-11 11:51:27 +08:00
parent a3e6aa787b
commit a7985c5c89
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/util.cpp
View File

@ -23,11 +23,14 @@ void Util::processOutput(QString output)
void Util::execCMD(QString cmd) void Util::execCMD(QString cmd)
{ {
qDebug() << cmd; qDebug() << cmd;
emit write(cmd + "\r\n"); if(isRunning)
emit write(cmd + "\r\n");
} }
QString Util::execCMDWithOutput(QString cmd, unsigned long waitTime) QString Util::execCMDWithOutput(QString cmd, unsigned long waitTime)
{ {
if(!isRunning)
return "";
QTime currTime = QTime::currentTime(); QTime currTime = QTime::currentTime();
QTime targetTime = QTime::currentTime().addMSecs(waitTime); QTime targetTime = QTime::currentTime().addMSecs(waitTime);
isRequiringOutput = true; isRequiringOutput = true;
@ -61,3 +64,8 @@ void Util::setClientType(Util::ClientType clientType)
{ {
this->clientType = clientType; this->clientType = clientType;
} }
void Util::setRunningState(bool st)
{
this->isRunning = st;
}

2
common/util.h
View File

@ -31,9 +31,11 @@ public:
public slots: public slots:
void processOutput(QString output); void processOutput(QString output);
void setClientType(Util::ClientType clientType); void setClientType(Util::ClientType clientType);
void setRunningState(bool st);
private: private:
bool isRequiringOutput; bool isRequiringOutput;
bool isRunning;
QString* requiredOutput; QString* requiredOutput;
QTime timeStamp; QTime timeStamp;
ClientType clientType; ClientType clientType;

1
ui/mainwindow.cpp
View File

@ -875,6 +875,7 @@ void MainWindow::signalInit()
connect(this, &MainWindow::connectPM3, pm3, &PM3Process::connectPM3); connect(this, &MainWindow::connectPM3, pm3, &PM3Process::connectPM3);
connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged); connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
connect(pm3, &PM3Process::PM3StatedChanged, util, &Util::setRunningState);
connect(this, &MainWindow::killPM3, pm3, &PM3Process::kill); connect(this, &MainWindow::killPM3, pm3, &PM3Process::kill);
connect(util, &Util::write, pm3, &PM3Process::write); connect(util, &Util::write, pm3, &PM3Process::write);