From 0c339e91af567372f6902cfeecfa49014a038860 Mon Sep 17 00:00:00 2001 From: wh201906 Date: Sun, 19 Sep 2021 21:33:53 +0800 Subject: [PATCH] Revert part of the commit 12a0837 I forgot I have designed "Keep the client active" for issue #22 isBusy() is deprecated for blocking the port, but it doesn't matter. --- common/pm3process.cpp | 14 +++++++------- ui/mainwindow.ui | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/pm3process.cpp b/common/pm3process.cpp index 3a7b405..171b761 100644 --- a/common/pm3process.cpp +++ b/common/pm3process.cpp @@ -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); { -// isBusy() is a deprecated function. -// It will always return false on Raspbian. -// SerialListener needs to be removed. +// isBusy() is a deprecated function because it will block the serial port when the port is not in use. +// However, the PM3 client is supposed to use the serial port exclusively, so it should be fine +// isBusy() will always return false on Raspbian, in this case, check "Keep the client active" in the Settings panel. // // qDebug()<isBusy(); -// if(!portInfo->isBusy()) -// { -// killPM3(); -// } + if(!portInfo->isBusy()) + { + killPM3(); + } } void PM3Process::testThread() diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 4fc0dd5..dc004a1 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -2833,7 +2833,7 @@ or "-p <port> -f" - Keep te client active even the PM3 hardware is disconnected.(Experimental) + Keep the client active even the PM3 hardware is disconnected.(Experimental) true