b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2026-07-14 22:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace QRegExp with QRegularExpression(Uncompleted)

Browse Source
This commit is contained in:
wh201906
2020-08-05 22:46:41 +08:00
parent ef6ebea568
commit eb5fa7ec9a
5 changed files with 77 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/pm3process.cpp
+3 -1
View File
@@ -17,6 +17,7 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
void PM3Process::connectPM3(const QString path, const QString port)
{
QString result;
Util::ClientType clientType = Util::CLIENTTYPE_OFFICIAL;
setRequiringOutput(true);
// using "-f" option to make the client output flushed after every print.
@@ -28,7 +29,7 @@ void PM3Process::connectPM3(const QString path, const QString port)
result = *requiredOutput;
if(result.indexOf("[=]") != -1)
{
emit changeClientType(Util::CLIENTTYPE_ICEMAN);
clientType = Util::CLIENTTYPE_ICEMAN;
setRequiringOutput(true);
write("hw version\r\n");
waitForReadyRead(1000);
@@ -37,6 +38,7 @@ void PM3Process::connectPM3(const QString path, const QString port)
}
if(result.indexOf("os: ") != -1) // make sure the PM3 is connected
{
emit changeClientType(clientType);
result = result.mid(result.indexOf("os: "));
result = result.left(result.indexOf("\r\n"));
result = result.mid(3, result.lastIndexOf(" ") - 3);