Skip to content

Fixed latest versions of proxmark3 not working. #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkgeem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed latest versions of proxmark3 not working. #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/common/pm3process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
QString result;
Util::ClientType clientType;
setRequiringOutput(true);
QRegularExpression osPattern("(os:\\s+|OS\\.+\\s+)");

// stash for reconnect
currPath = path;
Expand All @@ -44,7 +45,8 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{
waitForReadyRead(200);
result += *requiredOutput;
if(result.contains("os: "))
// if(result.contains("os: "))
if(osPattern.match(result).hasMatch())
break;
}
setRequiringOutput(false);
Expand All @@ -53,12 +55,16 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{
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);
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.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);
}
else
Expand Down