From bae4c9f5be2cedd4d0d33f41685b8324496b3511 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Sat, 1 Feb 2025 15:34:56 +0300 Subject: [PATCH] Switch from QextSerialPort to QSerialPort --- .gitmodules | 3 -- .../ru.qreal.root.ev3/meta/prebuild-mac.sh | 2 - .../ru.qreal.root.ev3/meta/prebuild-win32.sh | 1 - .../meta/prebuild-linux-gnu.sh | 1 - .../meta/prebuild-mac.sh | 2 - .../meta/prebuild-win32.sh | 1 - .../meta/prebuild-linux-gnu.sh | 1 - .../meta/prebuild-mac.sh | 2 - .../meta/prebuild-win32.sh | 1 - .../scripts/build-checker-installer.sh | 6 +-- plugins/robots/common/ev3Kit/ev3Kit.pri | 2 +- .../bluetoothRobotCommunicationThread.h | 4 +- .../bluetoothRobotCommunicationThread.cpp | 22 +++++---- .../bluetoothRobotCommunicationThread.h | 4 +- plugins/robots/common/nxtKit/nxtKit.pri | 2 +- .../bluetoothRobotCommunicationThread.cpp | 20 ++++---- .../src/ev3KitInterpreter.pri | 2 +- .../src/nxtKitInterpreter.pri | 2 +- .../thirdparty/qextserialport/.gitignore | 47 ------------------- .../thirdparty/qextserialport/qextserialport | 1 - .../qextserialport/qextserialport.pro | 13 ----- plugins/robots/thirdparty/thirdparty.pro | 1 - .../robotCommunication/robotCommunicator.h | 2 - .../robotCommunication/robotCommunicator.cpp | 3 -- .../utils/src/widgets/comPortPicker.cpp | 8 ++-- plugins/robots/utils/utils.pri | 4 +- 26 files changed, 39 insertions(+), 118 deletions(-) delete mode 100644 plugins/robots/thirdparty/qextserialport/.gitignore delete mode 160000 plugins/robots/thirdparty/qextserialport/qextserialport delete mode 100644 plugins/robots/thirdparty/qextserialport/qextserialport.pro diff --git a/.gitmodules b/.gitmodules index dd7e078495..eab587d050 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,6 +30,3 @@ [submodule "trik-checkapp"] path = thirdparty/checkapp/checkapp url = https://github.com/trikset/trik-checkapp -[submodule "plugins/robots/thirdparty/qextserialport/qextserialport"] - path = plugins/robots/thirdparty/qextserialport/qextserialport - url = https://github.com/qextserialport/qextserialport diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-mac.sh b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-mac.sh index c1a881ce1d..10db33e793 100755 --- a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-mac.sh +++ b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-mac.sh @@ -13,7 +13,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-interpreter.dylib rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-rbf-generator.dylib "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/" rsync -a "$BIN_DIR"/librobots-ev3-kit*.dylib "$BUNDLE_CONTENTS/Lib/" rsync -a "$BIN_DIR"/librobots-ev3-generator-base*.dylib "$BUNDLE_CONTENTS/Lib/" -rsync -a "$BIN_DIR"/libqextserialport*.dylib "$BUNDLE_CONTENTS/Lib/" rsync -a "$BIN_DIR"/libusb-1.*.dylib "$BUNDLE_CONTENTS/Lib/" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/libev3Metamodel.dylib" @@ -21,7 +20,6 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots- fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitplugins/librobots-ev3-rbf-generator.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-ev3-kit.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-ev3-generator-base.1.0.0.dylib" -fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqextserialport.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libusb-1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libusb-1.0.dylib" diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-win32.sh b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-win32.sh index 2c0c2989a0..4013598bb0 100644 --- a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-win32.sh +++ b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-win32.sh @@ -10,5 +10,4 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-ev3-interpreter.dll "$PWD" rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-ev3-rbf-generator.dll "$PWD"/../data/plugins/tools/kitPlugins/ rsync -a "$BIN_DIR"/robots-ev3-kit.dll "$PWD"/../data rsync -a "$BIN_DIR"/robots-ev3-generator-base.dll "$PWD"/../data -rsync -a "$BIN_DIR"/qextserialport.dll "$PWD"/../data rsync -a "$BIN_DIR"/libusb-1.0.dll "$PWD"/../data diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-linux-gnu.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-linux-gnu.sh index d304b823df..1f82291356 100755 --- a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-linux-gnu.sh +++ b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-linux-gnu.sh @@ -12,7 +12,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-nxt-interpreter.so rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.so "$PWD"/../data/lib/plugins/tools/kitPlugins/ rsync -a "$BIN_DIR"/librobots-nxt-generator-base.so* "$PWD"/../data/lib rsync -a "$BIN_DIR"/librobots-nxt-kit.so* "$PWD"/../data/lib -rsync -a "$BIN_DIR"/libqextserialport.so* "$PWD"/../data/lib # Cleaning up prebuild-common.sh results... rm -rf "$PWD"/../data/plugins diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-mac.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-mac.sh index ca5928f338..e9abcad45e 100755 --- a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-mac.sh +++ b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-mac.sh @@ -13,7 +13,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-nxt-interpreter.dylib rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.dylib "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/" rsync -a "$BIN_DIR"/librobots-nxt-generator-base*.dylib "$BUNDLE_CONTENTS/Lib" rsync -a "$BIN_DIR"/librobots-nxt-kit*.dylib "$BUNDLE_CONTENTS/Lib" -rsync -a "$BIN_DIR"/libqextserialport*.dylib "$BUNDLE_CONTENTS/Lib" rsync -a "$BIN_DIR"/libusb-1.*.dylib "$BUNDLE_CONTENTS/Lib/" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/libnxtMetamodel.dylib" @@ -21,7 +20,6 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots- fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-nxt-generator-base.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-nxt-kit.1.0.0.dylib" -fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqextserialport.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libusb-1.0.0.dylib" # Cleaning up prebuild-common.sh results... diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-win32.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-win32.sh index 23ef0899b1..079ff990c1 100644 --- a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-win32.sh +++ b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-win32.sh @@ -10,5 +10,4 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-nxt-interpreter.dll rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-nxt-osek-c-generator.dll "$PWD"/../data/plugins/tools/kitPlugins/ rsync -a "$BIN_DIR"/robots-nxt-generator-base.dll "$PWD"/../data/ rsync -a "$BIN_DIR"/robots-nxt-kit.dll "$PWD"/../data/ -rsync -a "$BIN_DIR"/qextserialport.dll "$PWD"/../data/ rsync -a "$BIN_DIR"/libusb-1.0.dll "$PWD"/../data diff --git a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-linux-gnu.sh b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-linux-gnu.sh index 388a4b5ae7..ac3348638d 100755 --- a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-linux-gnu.sh +++ b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-linux-gnu.sh @@ -20,7 +20,6 @@ rsync -a "$BIN_DIR"/libBox2D.so* "$PW rsync -a "$BIN_DIR"/librobots-generator-base.so* "$PWD"/../data/lib/ rsync -a "$BIN_DIR"/librobots-kit-base.so* "$PWD"/../data/lib/ rsync -a "$BIN_DIR"/librobots-utils.so* "$PWD"/../data/lib/ -rsync -a "$BIN_DIR"/libqextserialport.so* "$PWD/../data/lib" rsync -a --remove-source-files "$PWD"/../data/externalToolsConfig/ "$PWD"/../data/bin/externalToolsConfig/ rsync -a "$BIN_DIR/run_maze_generator.sh" "$PWD/../data/bin/" diff --git a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-mac.sh b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-mac.sh index 1dff21a028..c44bb9ade4 100755 --- a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-mac.sh +++ b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-mac.sh @@ -17,7 +17,6 @@ rsync -a "$BIN_DIR"/libBox2D*.dylib " rsync -a "$BIN_DIR"/librobots-generator-base*.dylib "$BUNDLE_CONTENTS/Lib/" rsync -a "$BIN_DIR"/librobots-kit-base*.dylib "$BUNDLE_CONTENTS/Lib/" rsync -a "$BIN_DIR"/librobots-utils*.dylib "$BUNDLE_CONTENTS/Lib/" -rsync -a "$BIN_DIR"/libqextserialport*.dylib "$BUNDLE_CONTENTS/Lib" copy_qt_lib QtMultimedia copy_qt_lib QtNetwork @@ -31,7 +30,6 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libBox2D.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-generator-base.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-kit-base.1.0.0.dylib" fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-utils.1.0.0.dylib" -fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqextserialport.1.0.0.dylib" # Cleaning up prebuild-common.sh results... rm -rf "$PWD"/../data/plugins/ diff --git a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-win32.sh b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-win32.sh index d0c0deabaa..a7a03c5eb1 100644 --- a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-win32.sh +++ b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-win32.sh @@ -13,7 +13,6 @@ rsync -a "$BIN_DIR"/Box2D.dll "$PWD" rsync -a "$BIN_DIR"/robots-generator-base.dll "$PWD"/../data rsync -a "$BIN_DIR"/robots-kit-base.dll "$PWD"/../data rsync -a "$BIN_DIR"/robots-utils.dll "$PWD"/../data -rsync -a "$BIN_DIR/qextserialport.dll" "$PWD/../data/" rsync -a "$QT_LIB/Qt5Network.dll" "$PWD/../data" diff --git a/plugins/robots/checker/scripts/build-checker-installer.sh b/plugins/robots/checker/scripts/build-checker-installer.sh index 794352ab32..3a983cd42e 100755 --- a/plugins/robots/checker/scripts/build-checker-installer.sh +++ b/plugins/robots/checker/scripts/build-checker-installer.sh @@ -127,8 +127,7 @@ $qRealDir/libtrikqscintilla2.so* \ $qRealDir/libqrtext.so* . # Copying TRIKStudio plugins -rsync -av $qRealDir/libqextserialport.so* \ -$qRealDir/librobots-2d-model.so* \ +rsync -av $qRealDir/librobots-2d-model.so* \ $qRealDir/librobots-interpreter-core.so* \ $qRealDir/librobots-trik-kit-interpreter-common.so* \ $qRealDir/librobots-kit-base.so* \ @@ -136,8 +135,7 @@ $qRealDir/librobots-trik-kit.so* \ $qRealDir/librobots-utils.so* \ $qRealDir/libBox2D.so* . -rsync -av $qRealDir/libqextserialport.so* \ -$qRealDir/librobots-ev3-kit.so* \ +rsync -av $qRealDir/librobots-ev3-kit.so* \ $qRealDir/librobots-utils.so* \ $qRealDir/librobots-kit-base.so* \ . diff --git a/plugins/robots/common/ev3Kit/ev3Kit.pri b/plugins/robots/common/ev3Kit/ev3Kit.pri index e66bbaa346..a8ed5bbbf6 100644 --- a/plugins/robots/common/ev3Kit/ev3Kit.pri +++ b/plugins/robots/common/ev3Kit/ev3Kit.pri @@ -15,7 +15,7 @@ QT += widgets links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ - robots-utils robots-kit-base robots-2d-model qextserialport \ + robots-utils robots-kit-base robots-2d-model \ ) includes(plugins/robots/common/ev3Kit \ diff --git a/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h b/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h index 60f40e7c69..7abf683b6e 100644 --- a/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h +++ b/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h @@ -16,7 +16,7 @@ #include "ev3RobotCommunicationThread.h" -class QextSerialPort; +class QSerialPort; class QTimer; namespace ev3 { @@ -49,7 +49,7 @@ private slots: QByteArray receive(int size) const override; - QextSerialPort *mPort; + QSerialPort *mPort; /// Timer that sends messages to robot to check that connection is still alive QTimer *mKeepAliveTimer; diff --git a/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp b/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp index 9e1d5dcdec..8813f30804 100644 --- a/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp +++ b/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp @@ -18,9 +18,8 @@ #include #include #include - +#include #include -#include #include "ev3Kit/communication/commandConstants.h" #include "ev3Kit/communication/ev3DirectCommand.h" @@ -28,6 +27,7 @@ #include const int keepAliveResponseSize = 5; +const int readTimeoutMsec = 3000; using namespace ev3::communication; @@ -68,13 +68,12 @@ bool BluetoothRobotCommunicationThread::connect() } const QString portName = qReal::SettingsManager::value("Ev3BluetoothPortName").toString(); - mPort = new QextSerialPort(portName, QextSerialPort::Polling, this); - mPort->setBaudRate(BAUD9600); - mPort->setFlowControl(FLOW_OFF); - mPort->setParity(PAR_NONE); - mPort->setDataBits(DATA_8); - mPort->setStopBits(STOP_2); - mPort->setTimeout(3000); + mPort = new QSerialPort(portName, this); + mPort->setBaudRate(QSerialPort::BaudRate::Baud9600); + mPort->setFlowControl(QSerialPort::FlowControl::NoFlowControl); + mPort->setParity(QSerialPort::Parity::NoParity); + mPort->setDataBits(QSerialPort::DataBits::Data8); + mPort->setStopBits(QSerialPort::StopBits::TwoStop); mPort->open(QIODevice::ReadWrite | QIODevice::Unbuffered); @@ -123,7 +122,10 @@ bool BluetoothRobotCommunicationThread::send1(const QByteArray &buffer) const QByteArray BluetoothRobotCommunicationThread::receive(int size) const { - return mPort ? mPort->read(size) : QByteArray(); + if (!mPort || !mPort->waitForReadyRead(readTimeoutMsec)) { + return {}; + } + return mPort->read(size); } void BluetoothRobotCommunicationThread::checkForConnection() diff --git a/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h b/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h index 6e653c3b72..2c03f501a2 100644 --- a/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h +++ b/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h @@ -16,7 +16,7 @@ #include -class QextSerialPort; +class QSerialPort; class QTimer; namespace nxt { @@ -47,7 +47,7 @@ private slots: bool send(const QByteArray &buffer) const; QByteArray receive(int size) const; - QextSerialPort *mPort; + QSerialPort *mPort; /// Timer that sends messages to robot to check that connection is still alive QTimer *mKeepAliveTimer; diff --git a/plugins/robots/common/nxtKit/nxtKit.pri b/plugins/robots/common/nxtKit/nxtKit.pri index 303c241f25..029ef5b830 100644 --- a/plugins/robots/common/nxtKit/nxtKit.pri +++ b/plugins/robots/common/nxtKit/nxtKit.pri @@ -22,7 +22,7 @@ includes(plugins/robots/common/nxtKit \ ) links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ - robots-utils robots-kit-base qextserialport ) + robots-utils robots-kit-base ) PKGCONFIG *= libusb-1.0 CONFIG += link_pkgconfig diff --git a/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp b/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp index 21e6b60c79..c09c6eb07d 100644 --- a/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp +++ b/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp @@ -21,12 +21,12 @@ #include #include -#include - +#include #include "nxtKit/communication/nxtCommandConstants.h" const int keepAliveResponseSize = 9; const int getFirmwareVersionResponseSize = 9; +const int readTimeoutMsec = 3000; using namespace nxt::communication; @@ -71,13 +71,12 @@ bool BluetoothRobotCommunicationThread::connect() } const QString portName = qReal::SettingsManager::value("NxtBluetoothPortName").toString(); - mPort = new QextSerialPort(portName, QextSerialPort::Polling); - mPort->setBaudRate(BAUD9600); - mPort->setFlowControl(FLOW_OFF); - mPort->setParity(PAR_NONE); - mPort->setDataBits(DATA_8); - mPort->setStopBits(STOP_2); - mPort->setTimeout(3000); + mPort = new QSerialPort(portName, this); + mPort->setBaudRate(QSerialPort::BaudRate::Baud9600); + mPort->setFlowControl(QSerialPort::FlowControl::NoFlowControl); + mPort->setParity(QSerialPort::Parity::NoParity); + mPort->setDataBits(QSerialPort::DataBits::Data8); + mPort->setStopBits(QSerialPort::StopBits::TwoStop); mPort->open(QIODevice::ReadWrite | QIODevice::Unbuffered); @@ -128,6 +127,9 @@ bool BluetoothRobotCommunicationThread::send(const QByteArray &buffer) const QByteArray BluetoothRobotCommunicationThread::receive(int size) const { + if (!mPort || !mPort->waitForReadyRead(readTimeoutMsec)) { + return {}; + } return mPort->read(size); } diff --git a/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri b/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri index b5ba543bd0..669c681f4b 100644 --- a/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri +++ b/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri @@ -23,7 +23,7 @@ includes(plugins/robots/common/kitBase \ ) links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ - robots-utils robots-kit-base robots-ev3-kit robots-2d-model qextserialport) + robots-utils robots-kit-base robots-ev3-kit robots-2d-model) win32: QMAKE_CXXFLAGS += -Wno-error=pedantic diff --git a/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri b/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri index ca4ccd81f4..82e5e8be63 100644 --- a/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri +++ b/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri @@ -15,7 +15,7 @@ QT += widgets links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ - robots-utils robots-kit-base robots-2d-model robots-nxt-kit qextserialport ) + robots-utils robots-kit-base robots-2d-model robots-nxt-kit) includes(plugins/robots/common/kitBase \ plugins/robots/common/twoDModel \ diff --git a/plugins/robots/thirdparty/qextserialport/.gitignore b/plugins/robots/thirdparty/qextserialport/.gitignore deleted file mode 100644 index a8c2c5b1ec..0000000000 --- a/plugins/robots/thirdparty/qextserialport/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -syntax: glob -*.pro.user* -*.app -*.moc -*.prl -Makefile* -doc/html/ -*.framework/ -*.xcodeproj/ -debug/ -release/ -qtc-gdbmacros/ -*.rej -*.orig -*.obj -*.swp -*.dll -*.exp -*.ilk -*.pdb -*.lib -Thumbs.db -moc_*.cpp -qrc_*.cpp -*.o -*.so.* -*.so -*.pdb -ui_*.h -*~ -.qmake.cache -extserialport.prf -lib/* -*.orig -*.exe -*.vcproj -*.vcproj.*.user -*_resource.rc -*.sln -*.idb -*.ncb -*.suo -examples/enumerator/enumerator -examples/event/event -examples/qespta/qespta -examples/uartassistant/uartassistant -object_script.* diff --git a/plugins/robots/thirdparty/qextserialport/qextserialport b/plugins/robots/thirdparty/qextserialport/qextserialport deleted file mode 160000 index ada321a9ee..0000000000 --- a/plugins/robots/thirdparty/qextserialport/qextserialport +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ada321a9ee463f628e7b781b8ed00ff219152158 diff --git a/plugins/robots/thirdparty/qextserialport/qextserialport.pro b/plugins/robots/thirdparty/qextserialport/qextserialport.pro deleted file mode 100644 index 29c82141d7..0000000000 --- a/plugins/robots/thirdparty/qextserialport/qextserialport.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib - -include(../../../../global.pri) - -unix:QT = core -else:QT = core gui - -include(qextserialport/src/qextserialport.pri) -#include(qextserialport/doc/doc.pri) - -CONFIG += warn_off - -DEFINES += QEXTSERIALPORT_BUILD_SHARED diff --git a/plugins/robots/thirdparty/thirdparty.pro b/plugins/robots/thirdparty/thirdparty.pro index 7946ac412b..db3d6ffe27 100644 --- a/plugins/robots/thirdparty/thirdparty.pro +++ b/plugins/robots/thirdparty/thirdparty.pro @@ -15,7 +15,6 @@ TEMPLATE = subdirs SUBDIRS += \ - qextserialport \ libusb-1.0 \ trikRuntime \ Box2D \ diff --git a/plugins/robots/utils/include/utils/robotCommunication/robotCommunicator.h b/plugins/robots/utils/include/utils/robotCommunication/robotCommunicator.h index a16ce1c08d..4c2257b4d1 100644 --- a/plugins/robots/utils/include/utils/robotCommunication/robotCommunicator.h +++ b/plugins/robots/utils/include/utils/robotCommunication/robotCommunicator.h @@ -22,8 +22,6 @@ #include "utils/utilsDeclSpec.h" #include "robotCommunicationThreadInterface.h" -class QextSerialPort; - namespace utils { namespace robotCommunication { diff --git a/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp b/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp index 6e97cdc783..88906b2c82 100644 --- a/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp +++ b/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp @@ -17,9 +17,6 @@ #include "utils/robotCommunication/robotCommunicator.h" -#include -#include - using namespace utils::robotCommunication; RobotCommunicator::RobotCommunicator(QObject *parent) diff --git a/plugins/robots/utils/src/widgets/comPortPicker.cpp b/plugins/robots/utils/src/widgets/comPortPicker.cpp index 198a9208b6..3294494fc0 100644 --- a/plugins/robots/utils/src/widgets/comPortPicker.cpp +++ b/plugins/robots/utils/src/widgets/comPortPicker.cpp @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "utils/widgets/comPortPicker.h" #include #include -#include using namespace qReal::ui; @@ -33,13 +33,13 @@ ComPortPicker::ComPortPicker(const QString &key, QObject *parent) void ComPortPicker::populate(QComboBox &box, const QString &settingsKey) { - const QList ports = QextSerialEnumerator::getPorts(); + auto ports = QSerialPortInfo::availablePorts(); const QString defaultPortName = SettingsManager::value(settingsKey).toString(); box.clear(); - for (const QextPortInfo &info : ports) { + for (auto &&info : ports) { const QRegExp portNameRegexp("COM\\d+", Qt::CaseInsensitive); - if (portNameRegexp.indexIn(info.portName) != -1) { + if (portNameRegexp.indexIn(info.portName()) != -1) { const QString portName = portNameRegexp.cap(); box.addItem(portName); } diff --git a/plugins/robots/utils/utils.pri b/plugins/robots/utils/utils.pri index 5486818c49..0b229be0e1 100644 --- a/plugins/robots/utils/utils.pri +++ b/plugins/robots/utils/utils.pri @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += widgets network +QT += widgets network serialport -links(qrkernel qrutils qextserialport qrtext) +links(qrkernel qrutils qrtext) includes(qrtext) DEFINES += ROBOTS_UTILS_LIBRARY