Skip to content

Commit fd7e8c9

Browse files
authored
Switch from QextSerialPort to QSerialPort (#1901)
* Switch from QextSerialPort to QSerialPort * Add serialport to module dependencies * Remove the QextSerialPort license * Don't use Unbuffered mode to read and write to ports * Add Russian translations * Wait for bytes to be written when using bluetooth connection * Update nxt-tools submodule
1 parent e7b5482 commit fd7e8c9

File tree

41 files changed

+97
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+97
-242
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,3 @@
3030
[submodule "trik-checkapp"]
3131
path = thirdparty/checkapp/checkapp
3232
url = https://github.com/trikset/trik-checkapp
33-
[submodule "plugins/robots/thirdparty/qextserialport/qextserialport"]
34-
path = plugins/robots/thirdparty/qextserialport/qextserialport
35-
url = https://github.com/qextserialport/qextserialport

NOTICE

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ This software may use following third-party components:
55
* QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in installer/licenses/QtPropertyBrowser-license.txt.
66
* QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in installer/licenses/QsKineticScroller-license.txt.
77
* WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in installer/licenses/WindowsModernStyle-license.txt.
8-
* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang.
9-
It is licensed under MIT License. Copy of this license can be found in installer/licenses/QextSerialPort-license.txt.
108

119
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.
1210

@@ -15,4 +13,4 @@ Some icons are provided by Tatiana Yanchuk and are available under Creative Comm
1513
We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
1614

1715
Considering license information, our product is licensed under Apache License v2.0 (installer/licenses/ApacheLicense-v2.0.txt).
18-
Its source code is available at our GitHub repository: https://github.com/qreal/qreal
16+
Its source code is available at our GitHub repository: https://github.com/qreal/qreal

installer/licenses/QextSerialPort-license.txt

Lines changed: 0 additions & 94 deletions
This file was deleted.

installer/licenses/acknowledgements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ This software may use following third-party components:
55
* QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in licenses/QtPropertyBrowser-license.txt.
66
* QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in licenses/QsKineticScroller-license.txt.
77
* WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in licenses/WindowsModernStyle-license.txt.
8-
* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang.
9-
It is licensed under MIT License. Copy of this license can be found in licenses/QextSerialPort-license.txt.
108

119
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.
1210

@@ -21,4 +19,4 @@ Thanks to ALT Linux maintainer Anton Midyukov for his work on integration TRIK S
2119
We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
2220

2321
Considering license information, our product is licensed under Apache License v2.0 (licenses/ApacheLicense-v2.0.txt).
24-
Its source code is available at our GitHub repository: https://github.com/qreal/qreal
22+
Its source code is available at our GitHub repository: https://github.com/qreal/qreal

installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<Description xml:lang="ru_ru">Установите это для работы с конструктором Lego EV3</Description>
77
<Version></Version>
88
<ReleaseDate>2017-11-14</ReleaseDate>
9-
<Licenses>
10-
<License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
11-
</Licenses>
129
<SortingPriority>17</SortingPriority>
1310
<Default>true</Default>
1411
<ForcedInstallation>false</ForcedInstallation>

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-common.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ set -o errexit
44

55
cd "$(dirname "$0")"
66

7-
rsync -a "$INSTALLER_ROOT"/licenses/QextSerialPort-license*.txt "$PWD"
8-
9-
107
mkdir -p "$PWD"/../data/plugins/editors
118
mkdir -p "$PWD"/../data/plugins/tools/kitPlugins
129
mkdir -p "$PWD"/../data/examples

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-linux-gnu.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-interpreter.so "$PW
1212
rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-rbf-generator.so "$PWD"/../data/lib/plugins/tools/kitPlugins/
1313
rsync -a "$BIN_DIR"/librobots-ev3-kit.so* "$PWD"/../data/lib
1414
rsync -a "$BIN_DIR"/librobots-ev3-generator-base.so* "$PWD"/../data/lib
15-
rsync -a "$BIN_DIR"/libqextserialport.so* "$PWD"/../data/lib
1615

1716
cp -L "$(pkg-config --variable=libdir libusb-1.0)/libusb-1.0.so" "$PWD"/../data/lib/libusb-1.0.so
1817

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-mac.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-interpreter.dylib
1313
rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-rbf-generator.dylib "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/"
1414
rsync -a "$BIN_DIR"/librobots-ev3-kit*.dylib "$BUNDLE_CONTENTS/Lib/"
1515
rsync -a "$BIN_DIR"/librobots-ev3-generator-base*.dylib "$BUNDLE_CONTENTS/Lib/"
16-
rsync -a "$BIN_DIR"/libqextserialport*.dylib "$BUNDLE_CONTENTS/Lib/"
1716
rsync -a "$BIN_DIR"/libusb-1.*.dylib "$BUNDLE_CONTENTS/Lib/"
1817

1918
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/libev3Metamodel.dylib"
2019
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-ev3-interpreter.dylib"
2120
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitplugins/librobots-ev3-rbf-generator.dylib"
2221
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-ev3-kit.1.0.0.dylib"
2322
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-ev3-generator-base.1.0.0.dylib"
24-
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqextserialport.1.0.0.dylib"
2523
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libusb-1.0.0.dylib"
2624
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libusb-1.0.dylib"
2725

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-win32.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-ev3-interpreter.dll "$PWD"
1010
rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/robots-ev3-rbf-generator.dll "$PWD"/../data/plugins/tools/kitPlugins/
1111
rsync -a "$BIN_DIR"/robots-ev3-kit.dll "$PWD"/../data
1212
rsync -a "$BIN_DIR"/robots-ev3-generator-base.dll "$PWD"/../data
13-
rsync -a "$BIN_DIR"/qextserialport.dll "$PWD"/../data
1413
rsync -a "$BIN_DIR"/libusb-1.0.dll "$PWD"/../data

0 commit comments

Comments
 (0)