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

Revert part of the commit 12a0837

Browse Source 
I forgot I have designed "Keep the client active" for issue #22
isBusy() is deprecated for blocking the port, but it doesn't matter.
This commit is contained in:
wh201906 2021-09-19 21:33:53 +08:00
parent 85ea3fd744
commit 0c339e91af
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/pm3process.cpp
View File

@ -107,15 +107,15 @@ void PM3Process::setSerialListener(bool state)
void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly terminated or the PM3 hardware is removed, the isBusy() will return false(only tested on Windows); void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly terminated or the PM3 hardware is removed, the isBusy() will return false(only tested on Windows);
{ {
// isBusy() is a deprecated function. // isBusy() is a deprecated function because it will block the serial port when the port is not in use.
// It will always return false on Raspbian. // However, the PM3 client is supposed to use the serial port exclusively, so it should be fine
// SerialListener needs to be removed. // isBusy() will always return false on Raspbian, in this case, check "Keep the client active" in the Settings panel.
// //
// qDebug()<<portInfo->isBusy(); // qDebug()<<portInfo->isBusy();
// if(!portInfo->isBusy()) if(!portInfo->isBusy())
// { {
// killPM3(); killPM3();
// } }
} }
void PM3Process::testThread() void PM3Process::testThread()

2
ui/mainwindow.ui
View File

@ -2833,7 +2833,7 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Keep te client active even the PM3 hardware is disconnected.(Experimental)</string> <string>Keep the client active even the PM3 hardware is disconnected.(Experimental)</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>