diff --git a/Doxyfile b/Doxyfile
index 2f889bcf63e0123a2f4efdafe885a9c7bd55ee5b..fa2ee117f0a8b7b2cd949a442afa92d5dc355cac 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -866,7 +866,7 @@ WARN_LOGFILE = "DoxygenWarningLog.txt"
INPUT = \
sim/src \
- ../deps/direct_deploy/mantleapi/include \
+ $(OP_DEPS_DIR)/direct_deploy/mantleapi/include \
sim/include \
# This tag can be used to specify the character encoding of the source files
diff --git a/cmake/global.cmake b/cmake/global.cmake
index 1a1ea7963a04d737e501d185c2b6fa5abd29170b..146086955c79ed1fc648ef221ea4ff35c78d26f7 100644
--- a/cmake/global.cmake
+++ b/cmake/global.cmake
@@ -130,7 +130,18 @@ if(WIN32)
else()
set(CMAKE_INSTALL_PREFIX "/openPASS" CACHE PATH "Destination directory")
add_compile_definitions(unix)
+ if(WITH_ADDRESS_SANITIZER OR WITH_MEMORY_SANITIZER)
+ if(WITH_ADDRESS_SANITIZER)
+ add_compile_options(-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls)
+ add_link_options(-fsanitize=address)
+ endif()
+ if(WITH_MEMORY_SANITIZER)
+ add_compile_options(-fsanitize=memory -fno-omit-frame-pointer -fno-optimize-sibling-calls)
+ add_link_options(-fsanitize=memory)
+ endif()
+else()
add_link_options(LINKER:-z,defs) # fail during link time on undefined references (instead of runtime)
+endif()
option(OPENPASS_ADJUST_OUTPUT "Adjust output directory" OFF)
endif()
diff --git a/doc/source/user_guide/tutorials/10_scenario_simulation.rst b/doc/source/user_guide/tutorials/10_scenario_simulation.rst
index 14b2f2dd11303f472f1918eb243b9a6f0e41d88b..ceaeaf66488540fcc9e2a5efd8e2048dad9a7415 100644
--- a/doc/source/user_guide/tutorials/10_scenario_simulation.rst
+++ b/doc/source/user_guide/tutorials/10_scenario_simulation.rst
@@ -18,13 +18,13 @@ Scenario-based simulation
This guide describes how to execute an exemplary simulation with openPASS.
-The simulation runs a scenario which is set up for triggering an AEB (Autonomous Emergency Break) system.
-The scenario contains two agents: The ego agent and a scenario agent.
-The ego vehicle is equipped with an AEB system (the system under test).
-The scenario agent performs a cut-in and triggers as a result the AEB system of the ego agent.
+The simulation runs a scenario which is set up for triggering an AEB (Autonomous Emergency Break) system.
+The scenario contains two agents: The ego agent and a scenario agent.
+The ego vehicle is equipped with an AEB system (the system under test).
+The scenario agent performs a cut-in and triggers as a result the AEB system of the ego agent.
To force this exact maneuver, the scenario agent is set up to follow a predefined trajectory.
-The opGUI is not yet capable of configuring and executing a scenario based simulation as this is currently work in progress.
+The opGUI is not yet capable of configuring and executing a scenario based simulation as this is currently work in progress.
Thus, an existing simulation configuration is used and the simulation is started manually.
**Step-by-step instructions**
@@ -42,15 +42,15 @@ Thus, an existing simulation configuration is used and the simulation is started
│ └── Configurations
└── doc
└── examples
- └── lib
+ └── lib
│ ...
└── opSimulation.exe
-
+
.. note::
The folder ``examples`` might not be existent right after the installation. In this case one can find it in the checkout repository of openPASS under ``deps/os/sim/contrib``. From there one can copy it into the installation folder.
-#. Create a new folder named "configs" for the configuration files within the |op| install directory
+#. Create a new folder named "configs" for the configuration files within the |op| install directory
#. Copy configuration files
@@ -63,9 +63,9 @@ Thus, an existing simulation configuration is used and the simulation is started
b. The *specific configuration* files located under ``examples/Configurations`` complement the default configuration files. Examples are provided for different simulations.
- i. Ensure all files from directory ``examples/Common`` have been copied to ``configs`` (this has been done in the previous step). Repeat this step every time another simulation is chosen.
-
- ii. Navigate to the directory ``examples/Configurations``. Here, all folders contain special pre-configured simulations (which either can be used as demo cases or as end-to-end test cases primarily used for development).
+ i. Ensure all files from directory ``examples/Common`` have been copied to ``configs`` (this has been done in the previous step). Repeat this step every time another simulation is chosen.
+
+ ii. Navigate to the directory ``examples/Configurations``. Here, all folders contain special pre-configured simulations (which either can be used as demo cases or as end-to-end test cases primarily used for development).
iii. Copy all files from the directory specifying the specific scenario you want to simulate (in our case all files from directory ``examples/Configurations/AEB_CutIn``) to the directory ``configs``. Overwrite existing files when prompted. The catalogs for vehicles or pedestrian parameters must be stored in a child folder ``Vehicles``.
@@ -73,10 +73,10 @@ Thus, an existing simulation configuration is used and the simulation is started
A detailed description of the various configuration files can be found under see :ref:`configs_in_depth`.
-#. Learn how to modify configuration files
+#. Learn how to modify configuration files
If one wants to edit the configurations (e.g. experiment set-up or parameters of specific scenario) placed under ``configs``, one can do so by changing any of the following files:
-
+
::
configs
@@ -94,9 +94,9 @@ Thus, an existing simulation configuration is used and the simulation is started
The following list describes some relevant adjustments that may be useful.
a. ``ProfilesCatalog.xml``:
-
+
* The AEB system and sensor parameters, e.g. „TTC“, „DetectionRange“, can be adjusted.
- * The spawner parameters, such as the traffic volume or the velocity of the surrounding traffic, can be modified in the existing spawner profiles.
+ * The spawner parameters, such as the traffic volume or the velocity of the surrounding traffic, can be modified in the existing spawner profiles.
b. ``Scenario.xosc``:
@@ -116,8 +116,8 @@ Thus, an existing simulation configuration is used and the simulation is started
* ``simulationOutput.xml``: Contains general information about the experiment and an overview on all agents from the simulation. Further, an event log is contained. If the csv-output is set to false in the ``simulationConfig.xml``, the ``simulationOutput.xml`` will also include the „cyclics†(state in each time step) of the simulation.
* ``Cyclics_Run_xxx.csv``: In case the csv-output is activated, the „cyclics†of each run in the simulation are logged to a separated csv-file. This file is missing, if "cyclics" are written directly to the ``simulationOutput.xml`` (i.e. when "LoggingCyclicsToCsv" is set to false).
- * ``Repository_Run_xxx.csv``: Overview of the agents and objects from the simulation as well as some details on scenery components like lane markings, guard rails, etc.
-
+ * ``Repository_Run_xxx.csv``: Overview of the agents and objects from the simulation as well as some details on scenery components like lane markings, guard rails, etc.
+
.. note::
-
- The outputs do not contain the ``SceneryConfiguration.xodr``, i.e. the static environment given in the scenery file in configs. In order to make the world around the simulation results available, we need to copy ``SceneryConfiguration.xodr`` file from ``configs`` to ``results``.
\ No newline at end of file
+
+ The outputs do not contain the ``SceneryConfiguration.xodr``, i.e. the static environment given in the scenery file in configs. In order to make the world around the simulation results available, we need to copy ``SceneryConfiguration.xodr`` file from ``configs`` to ``results``.
diff --git a/doc/source/user_guide/tutorials/20_pcm_simulation.rst b/doc/source/user_guide/tutorials/20_pcm_simulation.rst
index 63d18196bc4dc802ee274157be8100c2fecdd8e7..0664fb07a484a9222c0f834110e944871152bbe3 100644
--- a/doc/source/user_guide/tutorials/20_pcm_simulation.rst
+++ b/doc/source/user_guide/tutorials/20_pcm_simulation.rst
@@ -15,4 +15,4 @@ PCM Simulation
==============
.. todo::
- Include link and explaination to opGUI documentation how to run PCM simulations
\ No newline at end of file
+ Include link and explaination to opGUI documentation how to run PCM simulations
diff --git a/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml b/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml
index 8fd97e31b60c346a30f6abeb9efe33ae88d0aac4..001030480232580565534bafae571ce0df0f0837 100644
--- a/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml
+++ b/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml
@@ -784,7 +784,6 @@
<input>3</input>
</target>
</connection>
-
</connections>
</system>
</systems>
diff --git a/sim/src/components/Action_BrakeSystem/CMakeLists.txt b/sim/src/components/Action_BrakeSystem/CMakeLists.txt
index c86d429171e9efb82e89bc898a79168795fe8baa..d7912e1ea423d6d72790a265eac77bd26ba99a93 100644
--- a/sim/src/components/Action_BrakeSystem/CMakeLists.txt
+++ b/sim/src/components/Action_BrakeSystem/CMakeLists.txt
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
- GUIXML
- Action_BrakeSystem.xml
+
+ GUIXML
+ Action_BrakeSystem.xml
)
diff --git a/sim/src/components/Action_LongitudinalDriver/CMakeLists.txt b/sim/src/components/Action_LongitudinalDriver/CMakeLists.txt
index 8354a4c24ea21f30ea6d2ef78919e331e1974b4f..eda267659f2f68318ea6daac0dd674380493f8fd 100644
--- a/sim/src/components/Action_LongitudinalDriver/CMakeLists.txt
+++ b/sim/src/components/Action_LongitudinalDriver/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
- GUIXML
- Action_LongitudinalDriver.xml
+
+ GUIXML
+ Action_LongitudinalDriver.xml
)
diff --git a/sim/src/components/Action_Powertrain/CMakeLists.txt b/sim/src/components/Action_Powertrain/CMakeLists.txt
index f6963b6a09a9d2f070fb4db99bcadbae989a108a..65259be9ef4df5d2b1672fd572c1eb8985855d4b 100644
--- a/sim/src/components/Action_Powertrain/CMakeLists.txt
+++ b/sim/src/components/Action_Powertrain/CMakeLists.txt
@@ -29,7 +29,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
Action_Powertrain.xml
)
diff --git a/sim/src/components/Action_SecondaryDriverTasks/CMakeLists.txt b/sim/src/components/Action_SecondaryDriverTasks/CMakeLists.txt
index ce42607e4564c199855bb39b732c7c53008e7721..20e19b7e0d12865fafd7b35e702da3de411c8dde 100644
--- a/sim/src/components/Action_SecondaryDriverTasks/CMakeLists.txt
+++ b/sim/src/components/Action_SecondaryDriverTasks/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Action_SecondaryDriverTasks.xml
+ Action_SecondaryDriverTasks.xml
)
diff --git a/sim/src/components/Action_SteeringSystem/CMakeLists.txt b/sim/src/components/Action_SteeringSystem/CMakeLists.txt
index 189224ee61c23314c370c256737221fd4518a38c..b2ac6d7c15c476e74a8209354c4ce5431ddc207c 100644
--- a/sim/src/components/Action_SteeringSystem/CMakeLists.txt
+++ b/sim/src/components/Action_SteeringSystem/CMakeLists.txt
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Action_SteeringSystem.xml
+ Action_SteeringSystem.xml
)
diff --git a/sim/src/components/AgentUpdater/CMakeLists.txt b/sim/src/components/AgentUpdater/CMakeLists.txt
index e983cecacd227425e3a773988f89bbf61c81b51a..0e1b129242ec24a5f74ccd43293b1c2a109f2177 100644
--- a/sim/src/components/AgentUpdater/CMakeLists.txt
+++ b/sim/src/components/AgentUpdater/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
- GUIXML
- AgentUpdater.xml
+
+ GUIXML
+ AgentUpdater.xml
)
diff --git a/sim/src/components/AlgorithmAFDM/CMakeLists.txt b/sim/src/components/AlgorithmAFDM/CMakeLists.txt
index 42bbfc128d64e0c3203b6e96dab7e7a51be2ef35..514b17f751810bd16e1d57d3490c693c9b652481 100644
--- a/sim/src/components/AlgorithmAFDM/CMakeLists.txt
+++ b/sim/src/components/AlgorithmAFDM/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
- GUIXML
- Algorithm_AgentFollowingDriverModel.xml
+
+ GUIXML
+ Algorithm_AgentFollowingDriverModel.xml
)
diff --git a/sim/src/components/AlgorithmCar2XSender/CMakeLists.txt b/sim/src/components/AlgorithmCar2XSender/CMakeLists.txt
index 4d848a15d6400ac4e2961045fb0402918f844e61..5b823268ba1204eac688fc5c361a7644addc3d07 100644
--- a/sim/src/components/AlgorithmCar2XSender/CMakeLists.txt
+++ b/sim/src/components/AlgorithmCar2XSender/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2022-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,7 @@ add_openpass_target(
LIBRARIES
open_simulation_interface::open_simulation_interface_shared
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_Car2XSender.xml
+ Algorithm_Car2XSender.xml
)
diff --git a/sim/src/components/Algorithm_AEB/CMakeLists.txt b/sim/src/components/Algorithm_AEB/CMakeLists.txt
index d25a6dab3e02ba02cf2f9814ed043bb00f940086..33b05b60e199d8d7a92b28c301b360bdb1337d3e 100644
--- a/sim/src/components/Algorithm_AEB/CMakeLists.txt
+++ b/sim/src/components/Algorithm_AEB/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -30,7 +30,7 @@ add_openpass_target(
Boost::headers
Common
MantleAPI::MantleAPI
-
- GUIXML
- Algorithm_AEB.xml
+
+ GUIXML
+ Algorithm_AEB.xml
)
diff --git a/sim/src/components/Algorithm_ECU/CMakeLists.txt b/sim/src/components/Algorithm_ECU/CMakeLists.txt
index 18b3f2eadf0b6adb3659017aeba3e056a964b808..cdb547158ac1d3b3d8e882fedc0c541a3cb59938 100644
--- a/sim/src/components/Algorithm_ECU/CMakeLists.txt
+++ b/sim/src/components/Algorithm_ECU/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -28,7 +28,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_ECU.xml
+ Algorithm_ECU.xml
)
diff --git a/sim/src/components/Algorithm_FmuWrapper/CMakeLists.txt b/sim/src/components/Algorithm_FmuWrapper/CMakeLists.txt
index 45c5a215dabbe88fd6213c0b72638f46a7f7d120..bea16605d07e87b763d3515316e94f5a1aa3f276 100644
--- a/sim/src/components/Algorithm_FmuWrapper/CMakeLists.txt
+++ b/sim/src/components/Algorithm_FmuWrapper/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -84,7 +84,7 @@ add_openpass_target(
Common
CoreCommon
MantleAPI::MantleAPI
-
- GUIXML
- Algorithm_FmuWrapper.xml
+
+ GUIXML
+ Algorithm_FmuWrapper.xml
)
diff --git a/sim/src/components/Algorithm_FmuWrapper/src/FmiImporter/src/Common/fmuChecker.c b/sim/src/components/Algorithm_FmuWrapper/src/FmiImporter/src/Common/fmuChecker.c
index 671dc8b179b059d6bf217d543fdcaf73682f6d16..bb5a2561fbf9d5adc0f1a4b4aca277c3c3ed7427 100644
--- a/sim/src/components/Algorithm_FmuWrapper/src/FmiImporter/src/Common/fmuChecker.c
+++ b/sim/src/components/Algorithm_FmuWrapper/src/FmiImporter/src/Common/fmuChecker.c
@@ -27,6 +27,7 @@
#ifdef CROSS_COMPILING
#include <shlwapi.h>
+#include <wchar.h>
#endif
// #include <config_test.h>
diff --git a/sim/src/components/Algorithm_Lateral/CMakeLists.txt b/sim/src/components/Algorithm_Lateral/CMakeLists.txt
index cbcfeec20830b7e87641df59d6b83d46e6c56682..d28b5af6b7c898045867904a410d76657ad25420 100644
--- a/sim/src/components/Algorithm_Lateral/CMakeLists.txt
+++ b/sim/src/components/Algorithm_Lateral/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -28,8 +28,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_Lateral.xml
+ Algorithm_Lateral.xml
)
-
diff --git a/sim/src/components/Algorithm_Longitudinal/CMakeLists.txt b/sim/src/components/Algorithm_Longitudinal/CMakeLists.txt
index 8b252526859a40e6051c9dbb4bea6265b0130504..ed8a5950ee960fae9a0840a7c736faeaabbcaf5a 100644
--- a/sim/src/components/Algorithm_Longitudinal/CMakeLists.txt
+++ b/sim/src/components/Algorithm_Longitudinal/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_Longitudinal.xml
+ Algorithm_Longitudinal.xml
)
diff --git a/sim/src/components/Algorithm_Routecontrol/CMakeLists.txt b/sim/src/components/Algorithm_Routecontrol/CMakeLists.txt
index b3501fd534992d3416105cb20848a15fda045d0f..b260e475e0dfcfdf022c56702313a810186d431c 100644
--- a/sim/src/components/Algorithm_Routecontrol/CMakeLists.txt
+++ b/sim/src/components/Algorithm_Routecontrol/CMakeLists.txt
@@ -29,7 +29,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_RouteControl.xml
+ Algorithm_RouteControl.xml
)
diff --git a/sim/src/components/Algorithm_SspWrapper/CMakeLists.txt b/sim/src/components/Algorithm_SspWrapper/CMakeLists.txt
index 44696b94fc989f623db0e8a48600a2e0e7efb053..c23c3c63d4bf216df6ebf26efc0fff79b3fc43ab 100644
--- a/sim/src/components/Algorithm_SspWrapper/CMakeLists.txt
+++ b/sim/src/components/Algorithm_SspWrapper/CMakeLists.txt
@@ -193,7 +193,7 @@ add_openpass_target(NAME ${COMPONENT_NAME} TYPE library LINKAGE shared COMPONENT
Common
MantleAPI::MantleAPI
- GUIXML
+ GUIXML
Algorithm_SspWrapper.xml
)
diff --git a/sim/src/components/Algorithm_Switch/CMakeLists.txt b/sim/src/components/Algorithm_Switch/CMakeLists.txt
index c623fe4e65f1a17a205b24faefd462ed05c268d8..5c7c81713aa0ba35fb3d56589479bde835209eee 100644
--- a/sim/src/components/Algorithm_Switch/CMakeLists.txt
+++ b/sim/src/components/Algorithm_Switch/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -33,7 +33,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Algorithm_Switch.xml
+ Algorithm_Switch.xml
)
diff --git a/sim/src/components/ComponentController/CMakeLists.txt b/sim/src/components/ComponentController/CMakeLists.txt
index 5fc180a7f8679d73a742532b190508f0fb883b43..c4dd593b640f1a23ecc86af8acad564cef5fbd90 100644
--- a/sim/src/components/ComponentController/CMakeLists.txt
+++ b/sim/src/components/ComponentController/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -32,7 +32,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- ComponentController.xml
+ ComponentController.xml
)
diff --git a/sim/src/components/ControllerSwitch/CMakeLists.txt b/sim/src/components/ControllerSwitch/CMakeLists.txt
index fb353c63d4a3acef7a59fd44ad37166e1dca6493..dd9d5d27a88d0c5930f52fcfa88a6caa1576f1e8 100644
--- a/sim/src/components/ControllerSwitch/CMakeLists.txt
+++ b/sim/src/components/ControllerSwitch/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2022-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- ControllerSwitch.xml
+ ControllerSwitch.xml
)
diff --git a/sim/src/components/Dynamics_Chassis/CMakeLists.txt b/sim/src/components/Dynamics_Chassis/CMakeLists.txt
index 1d1723fa457036bcdd3b47648bb6e1bf4004530a..395aea7d630cd159bbcb9986ad2f989e101896a5 100644
--- a/sim/src/components/Dynamics_Chassis/CMakeLists.txt
+++ b/sim/src/components/Dynamics_Chassis/CMakeLists.txt
@@ -32,5 +32,5 @@ add_openpass_target(
MantleAPI::MantleAPI
GUIXML
- Dynamics_Chassis.xml
+ Dynamics_Chassis.xml
)
diff --git a/sim/src/components/Dynamics_Collision/CMakeLists.txt b/sim/src/components/Dynamics_Collision/CMakeLists.txt
index 1ddbc64bb3f32890fddcb18fc526e60754be3fd9..1224231910cd4719b37502ec5f42a3123fe910e2 100644
--- a/sim/src/components/Dynamics_Collision/CMakeLists.txt
+++ b/sim/src/components/Dynamics_Collision/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_Collision.xml
+ Dynamics_Collision.xml
)
diff --git a/sim/src/components/Dynamics_CollisionPCM/CMakeLists.txt b/sim/src/components/Dynamics_CollisionPCM/CMakeLists.txt
index bdf7879fee5729058228ac7be215ccf10e4a816a..85b66a4b01c1bbb2797bbeb1825a419e0cc556b9 100644
--- a/sim/src/components/Dynamics_CollisionPCM/CMakeLists.txt
+++ b/sim/src/components/Dynamics_CollisionPCM/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
- GUIXML
- Dynamics_CollisionPCM.xml
+
+ GUIXML
+ Dynamics_CollisionPCM.xml
)
diff --git a/sim/src/components/Dynamics_CollisionPostCrash/CMakeLists.txt b/sim/src/components/Dynamics_CollisionPostCrash/CMakeLists.txt
index a0aa24f780f759a7127344e01cbab530a3d37bf0..b87c36edd0ac4fff8cbc436efeb969d243392a81 100644
--- a/sim/src/components/Dynamics_CollisionPostCrash/CMakeLists.txt
+++ b/sim/src/components/Dynamics_CollisionPostCrash/CMakeLists.txt
@@ -29,7 +29,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_CollisionPostCrash.xml
+ Dynamics_CollisionPostCrash.xml
)
diff --git a/sim/src/components/Dynamics_CopyTrajectory/CMakeLists.txt b/sim/src/components/Dynamics_CopyTrajectory/CMakeLists.txt
index 4b41fb203bc8e060d8cd7c1ff55b5c43ef84b90a..21ada98fbab5fb684291604b08df499581f86574 100644
--- a/sim/src/components/Dynamics_CopyTrajectory/CMakeLists.txt
+++ b/sim/src/components/Dynamics_CopyTrajectory/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_CopyTrajectory.xml
+ Dynamics_CopyTrajectory.xml
)
diff --git a/sim/src/components/Dynamics_MotionModel/CMakeLists.txt b/sim/src/components/Dynamics_MotionModel/CMakeLists.txt
index a73e97ecfc9c575e309b504e1192f18a7ddabcef..24a3ec299394b1e6fc9d28349d1ccb4fb8a1d7e4 100644
--- a/sim/src/components/Dynamics_MotionModel/CMakeLists.txt
+++ b/sim/src/components/Dynamics_MotionModel/CMakeLists.txt
@@ -27,7 +27,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_MotionModel.xml
+ Dynamics_MotionModel.xml
)
diff --git a/sim/src/components/Dynamics_MotionModel/src/motionmodel.h b/sim/src/components/Dynamics_MotionModel/src/motionmodel.h
index 21099ed06098274e5497754abc38ccd8b47c4824..9e9869ad79a028d97349968c8c5edc0c72495062 100644
--- a/sim/src/components/Dynamics_MotionModel/src/motionmodel.h
+++ b/sim/src/components/Dynamics_MotionModel/src/motionmodel.h
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2020-2021 ITK Engineering GmbH
- * 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * 2023-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* 2023-2024 Volkswagen AG
*
* This program and the accompanying materials are made available under the
@@ -100,7 +100,6 @@ public:
//! @param[in] localLinkId Corresponds to "id" of "ComponentInput"
//! @param[in] data Referenced signal (copied by sending component)
//! @param[in] time Current scheduling time
- //! @return True on success
void UpdateInput(int localLinkId, const std::shared_ptr<SignalInterface const> &data, int time) override;
//! Function is called by framework when this component has to deliver a signal over
@@ -109,14 +108,12 @@ public:
//! @param[in] localLinkId Corresponds to "id" of "ComponentOutput"
//! @param[out] data Referenced signal (copied by this component)
//! @param[in] time Current scheduling time
- //! @return True on success
void UpdateOutput(int localLinkId, std::shared_ptr<SignalInterface const> &data, int time) override;
//! Function is called by framework when the scheduler calls the trigger task
//! of this component
//!
//! @param[in] time Current scheduling time
- //! @return True on success
void Trigger(int time) override;
private:
diff --git a/sim/src/components/Dynamics_RegularDriving/CMakeLists.txt b/sim/src/components/Dynamics_RegularDriving/CMakeLists.txt
index b81cd00d55a253243fcf2311c9836fc4f06df748..73b4a86da591145500fa72cf0449a554e1cb5ea1 100644
--- a/sim/src/components/Dynamics_RegularDriving/CMakeLists.txt
+++ b/sim/src/components/Dynamics_RegularDriving/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
- GUIXML
- Dynamics_RegularDriving.xml
+
+ GUIXML
+ Dynamics_RegularDriving.xml
)
diff --git a/sim/src/components/Dynamics_Scenario/CMakeLists.txt b/sim/src/components/Dynamics_Scenario/CMakeLists.txt
index 28256cd595098cf494e6ec85e5cc8a6e6ac99586..c6150594d9e316cdb0fffae4eb32e2212e3e5f14 100644
--- a/sim/src/components/Dynamics_Scenario/CMakeLists.txt
+++ b/sim/src/components/Dynamics_Scenario/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2022-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_Scenario.xml
+ Dynamics_Scenario.xml
)
diff --git a/sim/src/components/Dynamics_TF/CMakeLists.txt b/sim/src/components/Dynamics_TF/CMakeLists.txt
index 991f5efef33ea930bb9135c2f3d4f419073e3b24..db506c0f205468a0d8f02e76824b376c68bb79cb 100644
--- a/sim/src/components/Dynamics_TF/CMakeLists.txt
+++ b/sim/src/components/Dynamics_TF/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -22,12 +22,12 @@ add_openpass_target(
SOURCES
dynamics_tf.cpp
src/tfImplementation.cpp
-
+
LIBRARIES
Common
CoreCommon
MantleAPI::MantleAPI
-
+
GUIXML
- Dynamics_TrajectoryFollower.xml
+ Dynamics_TrajectoryFollower.xml
)
diff --git a/sim/src/components/Dynamics_TireModel/src/tiremodel.h b/sim/src/components/Dynamics_TireModel/src/tiremodel.h
index 466366dd0f0b65a79ace17298d237377f602dd86..e50bac1e9ff43e9a364f0a318bfd27c70db075ea 100644
--- a/sim/src/components/Dynamics_TireModel/src/tiremodel.h
+++ b/sim/src/components/Dynamics_TireModel/src/tiremodel.h
@@ -81,7 +81,6 @@ public:
//! @param[in] localLinkId Corresponds to "id" of "ComponentInput"
//! @param[in] data Referenced signal (copied by sending component)
//! @param[in] time Current scheduling time
- //! @return True on success
void UpdateInput(int localLinkId, const std::shared_ptr<SignalInterface const> &data, int time) override;
//! Function is called by framework when this component has to deliver a signal over
@@ -90,14 +89,12 @@ public:
//! @param[in] localLinkId Corresponds to "id" of "ComponentOutput"
//! @param[out] data Referenced signal (copied by this component)
//! @param[in] time Current scheduling time
- //! @return True on success
void UpdateOutput(int localLinkId, std::shared_ptr<SignalInterface const> &data, int time) override;
//! Function is called by framework when the scheduler calls the trigger task
//! of this component
//!
//! @param[in] time Current scheduling time
- //! @return True on success
void Trigger(int time) override;
private:
diff --git a/sim/src/components/LimiterAccVehComp/CMakeLists.txt b/sim/src/components/LimiterAccVehComp/CMakeLists.txt
index aad79abcd1775aa998969a3ce0c7c0705cfce438..aaf48b56624513249a8bf054a70c9a65a262a27a 100644
--- a/sim/src/components/LimiterAccVehComp/CMakeLists.txt
+++ b/sim/src/components/LimiterAccVehComp/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@ add_openpass_target(
LIBRARIES
Common
MantleAPI::MantleAPI
-
+
GUIXML
- LimiterAccelerationVehicleComponents.xml
+ LimiterAccelerationVehicleComponents.xml
)
diff --git a/sim/src/components/Parameters_Vehicle/CMakeLists.txt b/sim/src/components/Parameters_Vehicle/CMakeLists.txt
index aa983d689c04cc6dbf8ec898cd20ee0fcec0166b..eee126c49161e94d6db90a72a43d4f6f8c69b2ba 100644
--- a/sim/src/components/Parameters_Vehicle/CMakeLists.txt
+++ b/sim/src/components/Parameters_Vehicle/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Parameters_Vehicle.xml
+ Parameters_Vehicle.xml
)
diff --git a/sim/src/components/SensorAggregation_OSI/CMakeLists.txt b/sim/src/components/SensorAggregation_OSI/CMakeLists.txt
index 68040e768466165d275e886bd9bc8794c2387538..523434a8b8aad2d0b2431b95efb3e3b9a97159da 100644
--- a/sim/src/components/SensorAggregation_OSI/CMakeLists.txt
+++ b/sim/src/components/SensorAggregation_OSI/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,7 @@ add_openpass_target(
open_simulation_interface::open_simulation_interface_shared
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Sensor_Aggregation_OSI.xml
+ Sensor_Aggregation_OSI.xml
)
diff --git a/sim/src/components/SensorFusionErrorless_OSI/CMakeLists.txt b/sim/src/components/SensorFusionErrorless_OSI/CMakeLists.txt
index 69fbdfdd1ef955630f3a9fda6b95d7b443da823c..c56ccad7dcc90a09d8ff24282623641542e89497 100644
--- a/sim/src/components/SensorFusionErrorless_OSI/CMakeLists.txt
+++ b/sim/src/components/SensorFusionErrorless_OSI/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,7 @@ add_openpass_target(
open_simulation_interface::open_simulation_interface_shared
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Sensor_Fusion_OSI.xml
+ Sensor_Fusion_OSI.xml
)
diff --git a/sim/src/components/Sensor_Collision/CMakeLists.txt b/sim/src/components/Sensor_Collision/CMakeLists.txt
index 35080e52f26c65d8f6a4b99f4b2ea861efbae0c9..aa162ca8a44a8e9aa7ce3eb3d71a5aee46739b2e 100644
--- a/sim/src/components/Sensor_Collision/CMakeLists.txt
+++ b/sim/src/components/Sensor_Collision/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2021-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Sensor_Collision.xml
+ Sensor_Collision.xml
)
diff --git a/sim/src/components/Sensor_Driver/CMakeLists.txt b/sim/src/components/Sensor_Driver/CMakeLists.txt
index 9830b5853462b9c8739f3e9269164491c100156c..cb6c1c665162e5662555493beec2eba4500f96b0 100644
--- a/sim/src/components/Sensor_Driver/CMakeLists.txt
+++ b/sim/src/components/Sensor_Driver/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -33,7 +33,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- Sensor_Driver.xml
+ Sensor_Driver.xml
)
diff --git a/sim/src/components/Sensor_OSI/CMakeLists.txt b/sim/src/components/Sensor_OSI/CMakeLists.txt
index f0a5084d0975b5a708a773d55e620fc768c82bc8..fc5bd04de300b4cf92bb243a5b7354e8fe634f66 100644
--- a/sim/src/components/Sensor_OSI/CMakeLists.txt
+++ b/sim/src/components/Sensor_OSI/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Copyright (c) 2020-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# 2024 Volkswagen AG
+# 2024 Volkswagen AG
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
@@ -34,7 +34,7 @@ add_openpass_target(
open_simulation_interface::open_simulation_interface_shared
Common
MantleAPI::MantleAPI
-
+
GUIXML
- Sensor_OSI.xml
+ Sensor_OSI.xml
)
diff --git a/sim/src/components/SignalPrioritizer/CMakeLists.txt b/sim/src/components/SignalPrioritizer/CMakeLists.txt
index 21956bb1325baef7487c544ff4ddaee232a937cd..e22fad31022cc9bb5ec40c62f017f53d1c2b4d38 100644
--- a/sim/src/components/SignalPrioritizer/CMakeLists.txt
+++ b/sim/src/components/SignalPrioritizer/CMakeLists.txt
@@ -25,7 +25,7 @@ add_openpass_target(
LIBRARIES
MantleAPI::MantleAPI
-
+
GUIXML
- SignalPrioritizer.xml
+ SignalPrioritizer.xml
)
diff --git a/sim/src/core/opSimulation/modules/World_OSI/AgentNetwork.cpp b/sim/src/core/opSimulation/modules/World_OSI/AgentNetwork.cpp
index 0de52df891fbb320b1c67aac65781c568f366edc..c6b9ff444010b37158e125d5d81f2f25f2cb52a8 100644
--- a/sim/src/core/opSimulation/modules/World_OSI/AgentNetwork.cpp
+++ b/sim/src/core/opSimulation/modules/World_OSI/AgentNetwork.cpp
@@ -128,7 +128,7 @@ void AgentNetwork::PublishGlobalData(const Publisher &publish)
publish(agentId, "YawAngle", agent.GetYaw().value());
publish(agentId, "RollAngle", agent.GetRoll().value());
publish(agentId, "YawRate", agent.GetYawRate().value());
- publish(agentId, "SteeringAngle", agent.GetSteeringWheelAngle().value());
+ publish(agentId, "SteeringWheelAngle", agent.GetSteeringWheelAngle().value());
publish(agentId, "TotalDistanceTraveled", agent.GetDistanceTraveled().value());
const auto &egoAgent = agent.GetEgoAgent();
diff --git a/sim/tests/unitTests/components/Action_SteeringSystem/Steeringsystem_Tests.cpp b/sim/tests/unitTests/components/Action_SteeringSystem/Steeringsystem_Tests.cpp
index 482db8d39e0cfaedb6a7f3cbe46410e65bc9d635..bae2923b497668a413109f17552bf22e6df62e30 100644
--- a/sim/tests/unitTests/components/Action_SteeringSystem/Steeringsystem_Tests.cpp
+++ b/sim/tests/unitTests/components/Action_SteeringSystem/Steeringsystem_Tests.cpp
@@ -143,4 +143,4 @@ TEST(SteeringSystem, CalculationOfWheelAngleWithSelfAligningTorque)
- fakeLateralTireForce[1] * fakeCaster[0] / fakeElasticity[0]);
ASSERT_DOUBLE_EQ(wheelAngle[2], -fakeToe[1] - fakeLateralTireForce[2] * fakeCaster[1] / fakeElasticity[1]);
ASSERT_DOUBLE_EQ(wheelAngle[3], fakeToe[1] - fakeLateralTireForce[3] * fakeCaster[1] / fakeElasticity[1]);
-}
\ No newline at end of file
+}
diff --git a/sim/tests/unitTests/components/Algorithm_FmuWrapper/OsmpFmuUnitTests.cpp b/sim/tests/unitTests/components/Algorithm_FmuWrapper/OsmpFmuUnitTests.cpp
index 6e09771690e4e336761fa022d76c565bfacc48f0..8bce57f450908b4afd7dc1da959ed46bf7f25b8c 100644
--- a/sim/tests/unitTests/components/Algorithm_FmuWrapper/OsmpFmuUnitTests.cpp
+++ b/sim/tests/unitTests/components/Algorithm_FmuWrapper/OsmpFmuUnitTests.cpp
@@ -121,4 +121,4 @@ TEST(OsmpFmuUnitTests, GetTrafficCommandFromOpenScenarioPosition)
ASSERT_FALSE(positionAction.orientation().has_pitch());
ASSERT_FALSE(positionAction.orientation().has_yaw());
ASSERT_FALSE(positionAction.has_action_header());
-}
\ No newline at end of file
+}
diff --git a/sim/tests/unitTests/components/Algorithm_RouteControl/CMakeLists.txt b/sim/tests/unitTests/components/Algorithm_RouteControl/CMakeLists.txt
index e5386f3eb73b493198c71b68f3a79f4b585a4625..a76d194b54a3768c3611b3d465b17c42242a5ea3 100644
--- a/sim/tests/unitTests/components/Algorithm_RouteControl/CMakeLists.txt
+++ b/sim/tests/unitTests/components/Algorithm_RouteControl/CMakeLists.txt
@@ -18,12 +18,12 @@ add_openpass_target(
DEFAULT_MAIN
SOURCES
- RouteControl_ut_test.cpp
+ RouteControl_ut_test.cpp
${COMPONENT_SOURCE_DIR}/algorithm_RouteControl_implementation.cpp
${COMPONENT_SOURCE_DIR}/routeControl.cpp
HEADERS
- ${COMPONENT_SOURCE_DIR}/algorithm_RouteControl_implementation.h
+ ${COMPONENT_SOURCE_DIR}/algorithm_RouteControl_implementation.h
${COMPONENT_SOURCE_DIR}/routeControl.h
INCDIRS
diff --git a/utils/ci/scripts/25_check_inline_docu.sh b/utils/ci/scripts/25_check_inline_docu.sh
index 4931d1707875b7def1536aee6f0ecdc2d4058da7..514ec0d98efa29ff8e79a52f1daea9472c1ac1a5 100755
--- a/utils/ci/scripts/25_check_inline_docu.sh
+++ b/utils/ci/scripts/25_check_inline_docu.sh
@@ -68,6 +68,7 @@ filter()
MYDIR="$(dirname "$(readlink -f $0)")"
cd "$MYDIR/../../.." || exit 1
+export OP_DEPS_DIR="${OP_DEPS_DIR:=$MYDIR/../../../../deps}"
doxy_version="$(doxygen --version | grep -oP '[0-9]+\.[0-9]+\.[0-9]+')"
echo "Doxygen Version $doxy_version"