Merge branch 'master' into master

trikset · Feb 5, 2025 · 684a0fa · 684a0fa
2 parents 4e576cb + fd7e8c9
commit 684a0fa
Show file tree

Hide file tree

Showing 57 changed files with 334 additions and 336 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,10 +25,8 @@
 	url = https://bitbucket.org/codeimproved/qslog.git
 [submodule "installer/nxt-tools"]
 	path = installer/nxt-tools
-	url = https://github.com/trikset/nxt-tools
+	url = https://github.com/trikset/nxt-tools.git
+	branch = main
 [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/NOTICE b/NOTICE
@@ -5,8 +5,6 @@ This software may use following third-party components:
 * QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in installer/licenses/QtPropertyBrowser-license.txt.
 * QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in installer/licenses/QsKineticScroller-license.txt.
 * WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in installer/licenses/WindowsModernStyle-license.txt.
-* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang. 
-  It is licensed under MIT License. Copy of this license can be found in installer/licenses/QextSerialPort-license.txt.
 
 It also uses Pfennig font by Daniel Johnson, licensed under SIL Open Font License (OFL). Copy of this license can be found in installer/licenses/OFL.txt.
 
@@ -15,4 +13,4 @@ Some icons are provided by Tatiana Yanchuk and are available under Creative Comm
 We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
 
 Considering license information, our product is licensed under Apache License v2.0 (installer/licenses/ApacheLicense-v2.0.txt).
-Its source code is available at our GitHub repository: https://github.com/qreal/qreal
+Its source code is available at our GitHub repository: https://github.com/qreal/qreal
diff --git a/installer/licenses/QextSerialPort-license.txt b/installer/licenses/QextSerialPort-license.txt
diff --git a/installer/licenses/acknowledgements.txt b/installer/licenses/acknowledgements.txt
@@ -5,8 +5,6 @@ This software may use following third-party components:
 * QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in licenses/QtPropertyBrowser-license.txt.
 * QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in licenses/QsKineticScroller-license.txt.
 * WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in licenses/WindowsModernStyle-license.txt.
-* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang. 
-  It is licensed under MIT License. Copy of this license can be found in licenses/QextSerialPort-license.txt.
 
 It also uses Pfennig font by Daniel Johnson, licensed under SIL Open Font License (OFL). Copy of this license can be found in licenses/OFL.txt.
 
@@ -21,4 +19,4 @@ Thanks to ALT Linux maintainer Anton Midyukov for his work on integration TRIK S
 We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
 
 Considering license information, our product is licensed under Apache License v2.0 (licenses/ApacheLicense-v2.0.txt).
-Its source code is available at our GitHub repository: https://github.com/qreal/qreal
+Its source code is available at our GitHub repository: https://github.com/qreal/qreal
diff --git a/installer/nxt-tools b/installer/nxt-tools
diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml
@@ -6,9 +6,6 @@
     <Description xml:lang="ru_ru">Установите это для работы с конструктором Lego EV3</Description>
     <Version></Version>
     <ReleaseDate>2017-11-14</ReleaseDate>
-    <Licenses>
-        <License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
-    </Licenses>
     <SortingPriority>17</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-common.sh b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-common.sh
@@ -4,9 +4,6 @@ set -o errexit
 
 cd "$(dirname "$0")"
 
-rsync -a "$INSTALLER_ROOT"/licenses/QextSerialPort-license*.txt              "$PWD"
-
-
 mkdir -p "$PWD"/../data/plugins/editors
 mkdir -p "$PWD"/../data/plugins/tools/kitPlugins
 mkdir -p "$PWD"/../data/examples

diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-linux-gnu.sh b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-linux-gnu.sh
@@ -12,7 +12,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-interpreter.so   "$PW
 rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-rbf-generator.so "$PWD"/../data/lib/plugins/tools/kitPlugins/
 rsync -a "$BIN_DIR"/librobots-ev3-kit.so*                                   "$PWD"/../data/lib
 rsync -a "$BIN_DIR"/librobots-ev3-generator-base.so*                        "$PWD"/../data/lib
-rsync -a "$BIN_DIR"/libqextserialport.so*                                   "$PWD"/../data/lib
 
 cp -L  "$(pkg-config --variable=libdir libusb-1.0)/libusb-1.0.so"         "$PWD"/../data/lib/libusb-1.0.so
 

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
@@ -13,15 +13,13 @@ 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"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-ev3-interpreter.dylib"
 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
@@ -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/package.xml b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/package.xml
@@ -6,9 +6,6 @@
     <Description xml:lang="ru_ru">Поддержка конструктора Lego NXT</Description>
     <Version></Version>
     <ReleaseDate>2017-11-14</ReleaseDate>
-    <Licenses>
-        <License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
-    </Licenses>
     <SortingPriority>9</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-common.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-common.sh
@@ -4,7 +4,5 @@ set -o errexit
 
 cd "$(dirname "$0")"
 
-rsync -a "$INSTALLER_ROOT"/licenses/QextSerialPort-license*.txt              "$PWD"
-
 mkdir -p "$PWD"/../data/plugins/editors
 mkdir -p "$PWD"/../data/plugins/tools/kitPlugins
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
@@ -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
@@ -13,15 +13,13 @@ 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"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-nxt-interpreter.dylib"
 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
@@ -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.nxt.tools/meta/prebuild-linux-gnu.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.tools/meta/prebuild-linux-gnu.sh
@@ -6,4 +6,4 @@ cd "$(dirname "$0")"
 source "$INSTALLER_ROOT"/utils/common_utils.sh
 mkdir "$PWD"/../data/bin
 cd "$PWD"/../data/bin
-rsync -a "$INSTALLER_ROOT"/nxt-tools/linux/nxt-tools  ./
+rsync -a "$INSTALLER_ROOT"/nxt-tools  ./
diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.tools/meta/prebuild-win32.sh b/installer/packages/trik-studio/ru.qreal.root.nxt.tools/meta/prebuild-win32.sh
@@ -7,6 +7,6 @@ source "$INSTALLER_ROOT"/utils/common_utils.sh
 
 cd "$PWD"/../data
 
-rsync -aR "$INSTALLER_ROOT"/nxt-tools/win/./nxt-tools .
+rsync -aR "$INSTALLER_ROOT"/./nxt-tools .
 dos2unix nxt-tools/compile.sh
 rm -rf bin
diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-win32.sh b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-win32.sh
@@ -17,8 +17,9 @@ rsync -a "$BIN_DIR"/vcruntime*.dll
 rsync -a "$BIN_DIR"/{system.js,TRIK.py,2D-model.exe,checkapp.exe}                    "$PWD/../data/"
 rsync -a "$QT_LIB"/Qt5SerialPort.dll                                                 "$PWD"/../data
 
-winscp_ver=5.17.10
-putty_ver=0.75
+winscp_ver=6.3.6
+putty_ver=0.82
+
 cache_dir="$(cygpath "$APPDATA")"/"$PRODUCT"/installer_cache
 mkdir -p "$cache_dir"
 cd "$cache_dir"

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
@@ -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
@@ -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
@@ -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
@@ -127,17 +127,15 @@ $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* \
 $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
@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QT += widgets
+QT += widgets serialport
 
 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 \
 		plugins/robots/common/kitBase \

diff --git a/...ins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h b/...ins/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;