Always use communicator with SerialPort in its QThread

MinyazevR · MinyazevR · commit e686676b6f1e · 2025-02-05T21:57:46.000+03:00
diff --git a/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp b/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp
@@ -37,12 +37,18 @@ RobotCommunicator::~RobotCommunicator()
 
 void RobotCommunicator::send(QObject *addressee, const QByteArray &buffer, const unsigned responseSize)
 {
-	mRobotCommunicationThreadObject->send(addressee, buffer, responseSize);
+	auto blockingConnectionType = mRobotCommunicationThreadObject->thread() == QThread::currentThread()
+			? Qt::DirectConnection : Qt::BlockingQueuedConnection;
+	QMetaObject::invokeMethod(mRobotCommunicationThreadObject.get(), [&](){mRobotCommunicationThreadObject->send(addressee, buffer, responseSize);},
+	blockingConnectionType);
 }
 
 void RobotCommunicator::send(const QByteArray &buffer, const unsigned responseSize, QByteArray &outputBuffer)
 {
-	mRobotCommunicationThreadObject->send(buffer, responseSize, outputBuffer);
+	auto blockingConnectionType = mRobotCommunicationThreadObject->thread() == QThread::currentThread()
+			? Qt::DirectConnection : Qt::BlockingQueuedConnection;
+	QMetaObject::invokeMethod(mRobotCommunicationThreadObject.get(), [&](){mRobotCommunicationThreadObject->send(buffer, responseSize, outputBuffer);},
+	blockingConnectionType);
 }
 
 void RobotCommunicator::connect()
diff --git a/qrtest/thirdparty/googletest/googletest b/qrtest/thirdparty/googletest/googletest
@@ -1 +1 @@
-Subproject commit e235eb34c6c4fed790ccdad4b16394301360dcd4
+Subproject commit 7d76a231b0e29caf86e68d1df858308cd53b2a66

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,18 @@ RobotCommunicator::~RobotCommunicator()`
`37`	`37`
`38`	`38`	`void RobotCommunicator::send(QObject *addressee, const QByteArray &buffer, const unsigned responseSize)`
`39`	`39`	`{`
`40`		`- mRobotCommunicationThreadObject->send(addressee, buffer, responseSize);`
	`40`	`+ auto blockingConnectionType = mRobotCommunicationThreadObject->thread() == QThread::currentThread()`
	`41`	`+ ? Qt::DirectConnection : Qt::BlockingQueuedConnection;`
	`42`	`+ QMetaObject::invokeMethod(mRobotCommunicationThreadObject.get(), [&](){mRobotCommunicationThreadObject->send(addressee, buffer, responseSize);},`
	`43`	`+ blockingConnectionType);`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`void RobotCommunicator::send(const QByteArray &buffer, const unsigned responseSize, QByteArray &outputBuffer)`
`44`	`47`	`{`
`45`		`- mRobotCommunicationThreadObject->send(buffer, responseSize, outputBuffer);`
	`48`	`+ auto blockingConnectionType = mRobotCommunicationThreadObject->thread() == QThread::currentThread()`
	`49`	`+ ? Qt::DirectConnection : Qt::BlockingQueuedConnection;`
	`50`	`+ QMetaObject::invokeMethod(mRobotCommunicationThreadObject.get(), [&](){mRobotCommunicationThreadObject->send(buffer, responseSize, outputBuffer);},`
	`51`	`+ blockingConnectionType);`
`46`	`52`	`}`
`47`	`53`
`48`	`54`	`void RobotCommunicator::connect()`