b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-02-16 22:21:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from setime/workaround-ubuntu-22_04

Browse Source 
Workaround to get the GUI working on Ubuntu 22.04
This commit is contained in:
Self Not Found 2023-10-29 02:27:54 +08:00 committed by GitHub
commit 38c7916715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/pm3process.cpp
View File

@ -35,19 +35,19 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
waitForReadyRead(10000);
setRequiringOutput(false);
result = *requiredOutput;
// Workaround for wayland system, e.g. Ubuntu 22.04
// The issue is that the warning is read and nothing else, hence the process is killed.
if(result.contains("Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway."))
{
setRequiringOutput(true);
readWaitForConnection(&result);
}
if(result.contains("[=]"))
{
clientType = Util::CLIENTTYPE_ICEMAN;
setRequiringOutput(true);
write("hw version\n");
for(int i = 0; i < 50; i++)
{
waitForReadyRead(200);
result += *requiredOutput;
if(result.contains("os: "))
break;
}
setRequiringOutput(false);
readWaitForConnection(&result);
}
else
{
@ -72,6 +72,18 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
setRequiringOutput(false);
}
void PM3Process::readWaitForConnection(QString *result)
{
for(int i = 0; i < 50; i++)
{
waitForReadyRead(200);
(*result) += *requiredOutput;
if(result->contains("os: "))
break;
}
setRequiringOutput(false);
}
void PM3Process::reconnectPM3()
{
connectPM3(currPath, currArgs);

1
src/common/pm3process.h
View File

@ -38,6 +38,7 @@ private:
bool isRequiringOutput;
QString* requiredOutput; // It only works in this class now
void setRequiringOutput(bool st);// It only works in this class now
void readWaitForConnection(QString *result);
QTimer* serialListener;
QSerialPortInfo* portInfo;
QString currPath;