Skip to content

New trikRuntime with mailboxes [AUTOZIP] #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 4 commits into from
Sep 14, 2020
Merged

New trikRuntime with mailboxes [AUTOZIP] #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dbb6c0
New trikRuntime with mailboxes
iakov Aug 27, 2020
6479e14
New trikRuntime
iakov Aug 28, 2020
14dbf2a
Travis: Fix CA problem for Trusty
iakov Aug 28, 2020
6d2c722
[googletest] submodule update
iakov Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ matrix:
- stage: test
dist: xenial
name: "Linux tests in clean env"
before_install:
# - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
addons:
apt:
sources:
Expand All @@ -98,15 +96,20 @@ matrix:
- python3.7
- p7zip-full
- libxkbcommon-x11-0
before_install:
install:
script:
- ./buildScripts/travis/run_clean_env_test.sh
after_script:
- os: osx
name: "MacOS tests in clean env"
before_install:
install:
- env HOMEBREW_NO_AUTO_UPDATE=1 brew install p7zip
before_script:
script:
- ./buildScripts/travis/run_clean_env_test.sh
after_script:

before_install:
- if [[ $TRAVIS_OS_NAME == osx ]] ; then [[ -n ${TRIK_PYTHON3_VERSION_MINOR:-} ]] || export TRIK_PYTHON3_VERSION_MINOR="$(python3 -V | sed 's#^Python [0-9]\.\([0-9]\)\.[0-9]*$#\1#g')" ; fi
Expand All @@ -120,7 +123,7 @@ install:

before_script:
- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then export EXECUTOR="time docker exec -i builder " ; else export EXECUTOR="time " ;fi
- export CCACHE_DIR=$HOME/.ccache/$TRAVIS_OS_NAME-$CONFIG
- export CCACHE_DIR="$HOME/.ccache/$TRAVIS_OS_NAME-$CONFIG"

script:
- ./buildScripts/travis/script.sh & WPID=$!
Expand Down
1 change: 1 addition & 0 deletions ...reters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikTextualInterpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "robotModel/twoD/trikTwoDRobotModel.h"
#include "trikKitInterpreterCommon/trikbrick.h"
#include "trikScriptRunner/trikScriptRunner.h"
#include <trikNetwork/mailboxInterface.h>

#include "declSpec.h"

Expand Down
4 changes: 3 additions & 1 deletion plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <twoDModel/engine/model/timeline.h>
#include <qrgui/textEditor/languageInfo.h>
#include <trikKernel/fileUtils.h>
#include <trikNetwork/mailboxFactory.h>


Q_DECLARE_METATYPE(utils::AbstractTimer*)
Expand Down Expand Up @@ -69,7 +70,8 @@ const QString pyOverrides ="\n__import__('sys').stdout = type('trik_studio_stdou
trik::TrikTextualInterpreter::TrikTextualInterpreter(
const QSharedPointer<trik::robotModel::twoD::TrikTwoDRobotModel> &model
, bool enablePython)
: mRunning(false), mBrick(model), mScriptRunner(mBrick, nullptr), mErrorReporter(nullptr)
: mBrick(model), mMailbox(trikNetwork::MailboxFactory::create(8889))
, mScriptRunner(mBrick, mMailbox)
{
connect(&mBrick, &TrikBrick::error, this, &TrikTextualInterpreter::reportError);
connect(&mBrick, &TrikBrick::warning, this, &TrikTextualInterpreter::reportWarning);
Expand Down
6 changes: 3 additions & 3 deletions plugins/robots/interpreters/trikKitInterpreterCommon/src/trikbrick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ trikControl::MotorInterface *TrikBrick::motor(const QString &port)
{
using namespace kitBase::robotModel;
if (!mMotors.contains(port)) {
robotParts::Motor * mot =
robotParts::Motor * motor =
RobotModelUtils::findDevice<robotParts::Motor>(*mTwoDRobotModel, port);
if (mot == nullptr) {
if (motor == nullptr) {
emit error(tr("No configured motor on port: %1").arg(port));
return nullptr;
}
mMotors[port].reset(new TrikMotorEmu(mot));
mMotors[port].reset(new TrikMotorEmu(motor));
}
return mMotors[port].get();
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/robots/thirdparty/trikRuntime/trikRuntime
Open in desktop
Submodule trikRuntime updated 7 files
+1 −1 tests/thirdparty/googletest
+4 −4 trikHal/src/trik/trikV4l2VideoDevice.cpp
+3 −13 trikNetwork/src/connection.cpp
+8 −0 trikNetwork/src/mailbox.cpp
+16 −13 trikNetwork/src/mailbox.h
+40 −27 trikNetwork/src/mailboxServer.cpp
+3 −0 trikNetwork/src/mailboxServer.h
2 changes: 1 addition & 1 deletion qrtest/thirdparty/googletest/googletest
Open in desktop
Submodule googletest updated 8 files
+6 −4 googlemock/docs/cook_book.md
+4 −0 googlemock/include/gmock/gmock-actions.h
+25 −0 googlemock/include/gmock/gmock-generated-actions.h
+21 −1 googlemock/include/gmock/gmock-generated-actions.h.pump
+3 −0 googletest/include/gtest/internal/gtest-string.h
+15 −48 googletest/src/gtest.cc
+6 −6 googletest/test/gtest_unittest.cc
+1 −1 googletest/test/gtest_xml_test_utils.py
2 changes: 1 addition & 1 deletion qrtranslations/fr/plugins/robots/trikKitInterpreterCommon_fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<context>
<name>QObject</name>
<message>
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+200"/>
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+202"/>
<source>Bogus input values</source>
<translation type="unfinished"></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/ru/plugins/robots/trikKitInterpreterCommon_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<context>
<name>QObject</name>
<message>
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+200"/>
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+202"/>
<source>Bogus input values</source>
<translation>Неподходящие значения аргументов</translation>
</message>
Expand Down