Compare commits

..

No commits in common. "b74ad1b0de83af93523ce6fbe766ad7a274d840e" and "e2fb18970e360da2b7cfc29388287f6710efe772" have entirely different histories.

2 changed files with 4 additions and 12 deletions

View File

@ -82,8 +82,6 @@ open Proxmark3GUI.app
> In order for the GUI to connect to the device in macOS, you'd need to tweak the settings a little bit > In order for the GUI to connect to the device in macOS, you'd need to tweak the settings a little bit
Client Path must be path to pm3 console client like "/usr/local/bin/pm3/"
![macOS_settings](doc/README/macOS_settings.png) ![macOS_settings](doc/README/macOS_settings.png)
*** ***

View File

@ -22,7 +22,6 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
QString result; QString result;
Util::ClientType clientType; Util::ClientType clientType;
setRequiringOutput(true); setRequiringOutput(true);
QRegularExpression osPattern("(os:\\s+|OS\\.+\\s+)");
// stash for reconnect // stash for reconnect
currPath = path; currPath = path;
@ -45,8 +44,7 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{ {
waitForReadyRead(200); waitForReadyRead(200);
result += *requiredOutput; result += *requiredOutput;
// if(result.contains("os: ")) if(result.contains("os: "))
if(osPattern.match(result).hasMatch())
break; break;
} }
setRequiringOutput(false); setRequiringOutput(false);
@ -55,16 +53,12 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{ {
clientType = Util::CLIENTTYPE_OFFICIAL; clientType = Util::CLIENTTYPE_OFFICIAL;
} }
// if(result.contains("os: ")) // make sure the PM3 is connected if(result.contains("os: ")) // make sure the PM3 is connected
if(osPattern.match(result).hasMatch())
{ {
emit changeClientType(clientType); emit changeClientType(clientType);
// result = result.mid(result.indexOf("os: ")); result = result.mid(result.indexOf("os: "));
QRegularExpressionMatch osMatch = osPattern.match(result);
result = result.mid(osMatch.capturedStart());
result = result.left(result.indexOf("\n")); result = result.left(result.indexOf("\n"));
// result = result.mid(4, result.indexOf(" ", 4) - 4); result = result.mid(4, result.indexOf(" ", 4) - 4);
result = result.mid(osMatch.capturedLength(), result.indexOf(" ", osMatch.capturedLength()) - osMatch.capturedLength());
emit PM3StatedChanged(true, result); emit PM3StatedChanged(true, result);
} }
else else