Skip to content

Commit

Permalink
[trik-runtime] update
Browse files Browse the repository at this point in the history
  • Loading branch information
@iakov
iakov committed Jun 17, 2024
1 parent b026aeb commit 0def6da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion plugins/robots/thirdparty/trikRuntime/trikRuntime
Submodule trikRuntime updated 59 files
+13 −3 .github/dependabot.yml
+10 −8 .github/workflows/main.yml
+23 −24 .github/workflows/rockylinux.yml
+154 −0 .github/workflows/trik-toolchain.yml
+3 −0 README.md
+6 −3 azure-pipelines.yml
+1 −1 deploy.sh
+17 −22 global.pri
+1 −1 qslog/QsLogSharedLibrary.pro
+2 −2 scripts/azure/install_Linux.sh
+1 −1 tests/thirdparty/googletest
+1 −1 tests/thirdparty/googletest.pri
+1 −1 tests/thirdparty/googletest.pro
+52 −0 translations/ADDING_TRANSLATIONS.en.md
+0 −1 translations/fr/locale.ini
+0 −44 translations/fr/trikKernel_fr.ts
+0 −43 translations/fr/trikRun_fr.ts
+0 −33 translations/fr/trikScriptRunner_fr.ts
+0 −1 translations/ru/locale.ini
+0 −46 translations/ru/trikKernel_ru.ts
+0 −48 translations/ru/trikRun_ru.ts
+0 −33 translations/ru/trikScriptRunner_ru.ts
+10 −13 translations/translations.pro
+700 −0 translations/trikRuntime_de.ts
+186 −137 translations/trikRuntime_fr.ts
+189 −133 translations/trikRuntime_ru.ts
+4 −0 translations/trikRuntime_sample.ts
+1 −1 trikCommunicator/trikCommunicator.pro
+6 −6 trikControl/configs/kernel-3.6/system-config.xml
+12 −2 trikControl/include/trikControl/pwmCaptureInterface.h
+20 −0 trikControl/src/configurerHelper.cpp
+8 −0 trikControl/src/configurerHelper.h
+1 −1 trikControl/src/event.cpp
+1 −1 trikControl/src/moduleLoader.h
+44 −2 trikControl/src/pwmCapture.cpp
+15 −2 trikControl/src/pwmCapture.h
+1 −1 trikControl/trikControl.pro
+1 −2 trikControl/trikControlExport.pri
+17 −11 trikGui/languageSelectionWidget.cpp
+63 −0 trikGui/pwmCaptureIndicator.cpp
+54 −0 trikGui/pwmCaptureIndicator.h
+4 −0 trikGui/sensorsWidget.cpp
+1 −0 trikGui/sensorsWidget.h
+10 −0 trikGui/startWidget.cpp
+5 −7 trikGui/trikGui.pro
+2 −2 trikHal/trikHal.pro
+5 −20 trikKernel/include/trikKernel/exceptions/trikRuntimeException.h
+30 −12 trikKernel/include/trikKernel/timeVal.h
+0 −41 trikKernel/src/timeVal.cpp
+6 −6 trikKernel/src/translationsHelper.cpp
+5 −6 trikKernel/trikKernel.pro
+1 −1 trikNetwork/trikNetwork.pro
+1 −5 trikRun/trikRun.pro
+22 −17 trikRuntime.pro
+1 −0 trikScriptRunner/include/trikScriptRunner/trikScriptRunnerInterface.h
+3 −1 trikScriptRunner/src/pythonEngineWorker.cpp
+1 −5 trikScriptRunner/trikScriptRunner.pro
+1 −1 trikServer/trikServer.pro
+1 −1 trikWiFi/trikWiFi.pro
6 changes: 4 additions & 2 deletions plugins/robots/thirdparty/trikRuntime/trikRuntime.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ TEMPLATE = subdirs
include(../../../../global.pri)

SUBDIRS += \
trikRuntimeQsLog \
trikKernel \
trikNetwork \
trikControl \
Expand All @@ -26,7 +27,7 @@ SUBDIRS += \

tests {
SUBDIRS *= tests
tests.depends = trikScriptRunner trikCommunicator trikKernel
tests.depends = trikScriptRunner trikCommunicator trikKernel trikRuntimeQsLog
tests.subdir = $$PWD/trikRuntime/tests
}

Expand All @@ -43,8 +44,9 @@ trikNetwork.subdir = $$PWD/trikRuntime/trikNetwork
trikControl.subdir = $$PWD/trikRuntime/trikControl
translations.subdir = $$PWD/trikRuntime/translations
trikHal.subdir = $$PWD/trikRuntime/trikHal
trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
trikControl.depends = trikKernel trikHal
trikKernel.depends =
trikKernel.depends = trikRuntimeQsLog
trikNetwork.depends = trikKernel
trikScriptRunner.depends += trikControl trikKernel trikNetwork
trikHal.depends = trikKernel
Expand Down

0 comments on commit 0def6da

Please sign in to comment.