b612
/
Proxmark3GUI
mirror of https://github.com/wh201906/Proxmark3GUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the basic connect function(using QThread)

Browse Source
pull/2/head
wh201906 5 years ago
parent 80a8db540f
commit 6b8e98b735
4 changed files with 159 additions and 77 deletions
Show Stats Download Patch File Download Diff File

107
mainwindow.cpp
Unescape Escape View File

@ -6,17 +6,27 @@ MainWindow::MainWindow(QWidget *parent)
, ui(new Ui::MainWindow)
{
ui->setupUi(this);
pm3 = new PM3Process;
pm3Thread=new QThread(this);
pm3 = new PM3Process(pm3Thread);
// pm3->moveToThread(pm3Thread);
// pm3->init();
pm3Thread->start();
pm3state=false;
mifare = new Mifare;
connect(pm3, &PM3Process::readyRead, this, &MainWindow::refresh);
connect(pm3, &PM3Process::PM3disconnected, this, &MainWindow::onPM3disconnected);
connect(ui->Raw_CMDEdit, &QLineEdit::editingFinished, this, &MainWindow::sendMSG);
uiInit();
signalInit();
}
MainWindow::~MainWindow()
{
delete ui;
pm3Thread->exit(0);
pm3Thread->wait(5000);
delete pm3;
delete pm3Thread;
}
// ******************** basic functions ********************
@ -25,7 +35,20 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
{
ui->PM3_portBox->clear();
ui->PM3_portBox->addItem("");
foreach(QString port, pm3->findPort())
QSerialPort serial;
QStringList serialList;
foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
{
qDebug()<<info.isBusy()<<info.isNull()<<info.portName();
serial.setPort(info);
if(serial.open(QIODevice::ReadWrite))
{
serialList<<info.portName();
serial.close();
}
}
foreach(QString port, serialList)
{
ui->PM3_portBox->addItem(port);
}
@ -33,36 +56,36 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
void MainWindow::on_PM3_connectButton_clicked()
{
qDebug()<<"Main:"<<QThread::currentThread();
QString port = ui->PM3_portBox->currentText();
if(port == "")
QMessageBox::information(NULL, "Info", "Plz choose a port first", QMessageBox::Ok);
else
{
pm3->setRequiringOutput(true);
if(pm3->start(ui->PM3_pathEdit->text(), port))
emit requiringOutput(true);
emit connectPM3(ui->PM3_pathEdit->text(), port);
}
}
void MainWindow::onPM3StateChanged(bool st, QString info)
{
while(pm3->waitForReadyRead())
;
QString result = pm3->getRequiredOutput();
pm3->setRequiringOutput(false);
result = result.mid(result.indexOf("os: "));
result = result.left(result.indexOf("\r\n"));
result = result.mid(3, result.lastIndexOf(" ") - 3);
setStatusBar(PM3VersionBar, result);
pm3state=st;
if(st==true)
{
setStatusBar(PM3VersionBar,info);
setStatusBar(connectStatusBar,"Connected");
}
else
{
setStatusBar(connectStatusBar,"Not Connected");
}
}
void MainWindow::on_PM3_disconnectButton_clicked()
{
pm3->kill();
pm3->setSerialListener("",false);
onPM3disconnected();
}
void MainWindow::onPM3disconnected()
{
pm3state=false;
emit killPM3();
emit setSerialListener("", false);
setStatusBar(connectStatusBar,"Not Connected");
}
@ -340,6 +363,32 @@ void MainWindow::on_MF_RW_writeBlockButton_clicked()
}
}
void MainWindow::on_MF_RW_writeAllButton_clicked()
{
QString result;
for(int i = 0; i < 16; i++)
{
for(int j = 0; j < 4; j++)
{
result = execCMDWithOutput("hf mf wrbl "
+ QString::number(i * 4 + j)
+ " A "
+ ui->MF_keyWidget->item(i, 1)->text()
+ " "
+ ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
if(result.indexOf("isOk:01") == -1)
{
result = execCMDWithOutput("hf mf wrbl "
+ QString::number(i * 4 + j)
+ " B "
+ ui->MF_keyWidget->item(i, 2)->text()
+ " "
+ ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
}
}
}
}
// ************************************************
@ -365,6 +414,8 @@ void MainWindow::sendMSG()
void MainWindow::uiInit()
{
connect(ui->Raw_CMDEdit, &QLineEdit::editingFinished, this, &MainWindow::sendMSG);
connectStatusBar = new QLabel(this);
programStatusBar = new QLabel(this);
PM3VersionBar = new QLabel(this);
@ -411,6 +462,16 @@ void MainWindow::uiInit()
on_PM3_refreshPortButton_clicked();
}
void MainWindow::signalInit()
{
connect(pm3, &PM3Process::readyRead, this, &MainWindow::refresh);
connect(this,&MainWindow::requiringOutput,pm3,&PM3Process::setRequiringOutput);
connect(this,&MainWindow::connectPM3,pm3,&PM3Process::connectPM3);
connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
connect(this,&MainWindow::killPM3,pm3,&PM3Process::kill);
}
void MainWindow::setStatusBar(QLabel* target, const QString & text)
{
if(target == PM3VersionBar)
@ -452,3 +513,5 @@ bool MainWindow::MF_isKeyValid(const QString key)
}
// ***********************************************

16
mainwindow.h
Unescape Escape View File

@ -2,10 +2,14 @@
#define MAINWINDOW_H
#include <QMainWindow>
#include <QThread>
#include <QProcess>
#include <QDebug>
#include <QMessageBox>
#include <QListWidgetItem>
#include <QtSerialPort/QSerialPortInfo>
#include <QtSerialPort/QSerialPort>
#include "pm3process.h"
#include "mifare.h"
#include "mf_attack_hardnesteddialog.h"
@ -28,7 +32,7 @@ public slots:
void refresh();
void setStatusBar(QLabel* target,const QString & text);
void execCMD(QString cmd, bool gotoRawTab);
void onPM3disconnected();
void onPM3StateChanged(bool st, QString info);
private slots:
void on_PM3_connectButton_clicked();
@ -66,13 +70,23 @@ private slots:
void on_MF_Attack_infoButton_clicked();
void on_MF_RW_writeAllButton_clicked();
private:
Ui::MainWindow *ui;
PM3Process* pm3;
bool pm3state;
QThread* pm3Thread;
Mifare* mifare;
void uiInit();
QLabel* connectStatusBar;
QLabel* programStatusBar;
QLabel* PM3VersionBar;
void signalInit();
signals:
void requiringOutput(bool st);
void connectPM3(const QString path, const QString port);
void killPM3();
void setSerialListener(const QString &name, bool state);
};
#endif // MAINWINDOW_H

55
pm3process.cpp
Unescape Escape View File

@ -1,46 +1,40 @@
#include "pm3process.h"
PM3Process::PM3Process(QObject* parent): QProcess(parent)
PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
{
moveToThread(thread);
setProcessChannelMode(PM3Process::MergedChannels);
isRequiringOutput=false;
requiredOutput=new QString();
serialListener=new QTimer(this);
serialListener=new QTimer(); // if using new QTimer(this), the debug output will show "Cannot create children for a parent that is in a different thread."
serialListener->moveToThread(this->thread());// I've tried many ways to creat a QTimer instance, but all of the instances are in the main thread(UI thread), so I have to move it manually
serialListener->setInterval(1000);
serialListener->setTimerType(Qt::VeryCoarseTimer);
connect(serialListener,&QTimer::timeout,this,&PM3Process::onTimeout);
}
QStringList PM3Process::findPort()
void PM3Process::connectPM3(const QString path, const QString port)
{
QSerialPort serial;
QStringList retList;
foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
{
qDebug()<<info.isBusy()<<info.isNull()<<info.portName();
serial.setPort(info);
if(serial.open(QIODevice::ReadWrite))
{
retList<<info.portName();
serial.close();
}
}
return retList;
}
setRequiringOutput(true);
bool PM3Process::start(const QString path, const QString port)
{
// using "-f" option to make the client output flushed after every print.
QProcess::start(path, QStringList()<<port<<"-f",QProcess::Unbuffered|QProcess::ReadWrite);
if(waitForStarted())
{
start(path, QStringList()<<port<<"-f",QProcess::Unbuffered|QProcess::ReadWrite);
if(waitForStarted(10000))
{
while(waitForReadyRead(1000))
;
setRequiringOutput(false);
QString result = *requiredOutput;
if(result.indexOf("os: ")!=-1)// make sure the PM3 is connected
{
result = result.mid(result.indexOf("os: "));
result = result.left(result.indexOf("\r\n"));
result = result.mid(3, result.lastIndexOf(" ") - 3);
emit PM3StatedChanged(true,result);
setSerialListener(port,true);
return true;
}
else
{
return false;
kill();
}
}
@ -74,6 +68,7 @@ void PM3Process::setSerialListener(const QString& name,bool state)
{
portInfo=new QSerialPortInfo(name);
serialListener->start();
qDebug()<<serialListener->thread();
}
else
{
@ -87,7 +82,13 @@ void PM3Process::onTimeout()
qDebug()<<portInfo->isBusy();
if(!portInfo->isBusy())
{
emit PM3disconnected();
kill();
emit PM3StatedChanged(false);
setSerialListener("",false);
}
}
void PM3Process::testThread()
{
qDebug()<<"PM3:"<<QThread::currentThread();
}

14
pm3process.h
Unescape Escape View File

@ -2,6 +2,7 @@
#define PM3PROCESS_H
#include <QProcess>
#include <QThread>
#include <QString>
#include <QDebug>
#include <QTimer>
@ -12,13 +13,16 @@ class PM3Process : public QProcess
{
Q_OBJECT
public:
explicit PM3Process(QObject* parent=nullptr);
bool start(const QString path, const QString port);
QStringList findPort();
explicit PM3Process(QThread* thread, QObject* parent=nullptr);
QByteArray readLine(qint64 maxlen = 0);
void setRequiringOutput(bool st);
QString getRequiredOutput();
bool waitForReadyRead(int msecs = 2000);
void testThread();
public slots:
void setRequiringOutput(bool st);
void connectPM3(const QString path, const QString port);
void setSerialListener(const QString &name, bool state);
private slots:
void onTimeout();
@ -28,7 +32,7 @@ private:
QTimer* serialListener;
QSerialPortInfo* portInfo;
signals:
void PM3disconnected();
void PM3StatedChanged(bool st, QString info="");
};
#endif // PM3PROCESS_H

Write Preview
Loading…
Cancel
Save