From 036abe921cbd4994f28a7991a6da92cae7857d75 Mon Sep 17 00:00:00 2001 From: Raghunandan Netrapalli Madhusudhan <raghunandan.madhusudhan@in-tech.com> Date: Tue, 4 Feb 2025 21:43:51 +0100 Subject: [PATCH] feat(CI): Add empty line at the end of file and remove trailing whitespaces --- Doxyfile | 2 +- cmake/global.cmake | 11 ++++++ .../tutorials/10_scenario_simulation.rst | 38 +++++++++---------- .../tutorials/20_pcm_simulation.rst | 2 +- .../StaticAgentCollision/SystemConfig.xml | 1 - .../Action_BrakeSystem/CMakeLists.txt | 6 +-- .../Action_LongitudinalDriver/CMakeLists.txt | 8 ++-- .../Action_Powertrain/CMakeLists.txt | 2 +- .../CMakeLists.txt | 6 +-- .../Action_SteeringSystem/CMakeLists.txt | 4 +- .../components/AgentUpdater/CMakeLists.txt | 8 ++-- .../components/AlgorithmAFDM/CMakeLists.txt | 8 ++-- .../AlgorithmCar2XSender/CMakeLists.txt | 6 +-- .../components/Algorithm_AEB/CMakeLists.txt | 8 ++-- .../components/Algorithm_ECU/CMakeLists.txt | 6 +-- .../Algorithm_FmuWrapper/CMakeLists.txt | 8 ++-- .../src/FmiImporter/src/Common/fmuChecker.c | 1 + .../Algorithm_Lateral/CMakeLists.txt | 7 ++-- .../Algorithm_Longitudinal/CMakeLists.txt | 6 +-- .../Algorithm_Routecontrol/CMakeLists.txt | 4 +- .../Algorithm_SspWrapper/CMakeLists.txt | 2 +- .../Algorithm_Switch/CMakeLists.txt | 6 +-- .../ComponentController/CMakeLists.txt | 6 +-- .../ControllerSwitch/CMakeLists.txt | 6 +-- .../Dynamics_Chassis/CMakeLists.txt | 2 +- .../Dynamics_Collision/CMakeLists.txt | 6 +-- .../Dynamics_CollisionPCM/CMakeLists.txt | 8 ++-- .../CMakeLists.txt | 4 +- .../Dynamics_CopyTrajectory/CMakeLists.txt | 6 +-- .../Dynamics_MotionModel/CMakeLists.txt | 4 +- .../Dynamics_MotionModel/src/motionmodel.h | 5 +-- .../Dynamics_RegularDriving/CMakeLists.txt | 8 ++-- .../Dynamics_Scenario/CMakeLists.txt | 6 +-- sim/src/components/Dynamics_TF/CMakeLists.txt | 8 ++-- .../Dynamics_TireModel/src/tiremodel.h | 3 -- .../LimiterAccVehComp/CMakeLists.txt | 6 +-- .../Parameters_Vehicle/CMakeLists.txt | 6 +-- .../SensorAggregation_OSI/CMakeLists.txt | 6 +-- .../SensorFusionErrorless_OSI/CMakeLists.txt | 6 +-- .../Sensor_Collision/CMakeLists.txt | 6 +-- .../components/Sensor_Driver/CMakeLists.txt | 6 +-- sim/src/components/Sensor_OSI/CMakeLists.txt | 6 +-- .../SignalPrioritizer/CMakeLists.txt | 4 +- .../modules/World_OSI/AgentNetwork.cpp | 2 +- .../Steeringsystem_Tests.cpp | 2 +- .../Algorithm_FmuWrapper/OsmpFmuUnitTests.cpp | 2 +- .../Algorithm_RouteControl/CMakeLists.txt | 4 +- utils/ci/scripts/25_check_inline_docu.sh | 1 + 48 files changed, 142 insertions(+), 137 deletions(-) diff --git a/Doxyfile b/Doxyfile index 2f889bcf6..fa2ee117f 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 1a1ea7963..146086955 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 14b2f2dd1..ceaeaf664 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 63d18196b..0664fb07a 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 8fd97e31b..001030480 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 c86d42917..d7912e1ea 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 8354a4c24..eda267659 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 f6963b6a0..65259be9e 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 ce42607e4..20e19b7e0 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 189224ee6..b2ac6d7c1 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 e983cecac..0e1b12924 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 42bbfc128..514b17f75 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 4d848a15d..5b823268b 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 d25a6dab3..33b05b60e 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 18b3f2ead..cdb547158 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 45c5a215d..bea16605d 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 671dc8b17..bb5a2561f 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 cbcfeec20..d28b5af6b 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 8b2525268..ed8a5950e 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 b3501fd53..b260e475e 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 44696b94f..c23c3c63d 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 c623fe4e6..5c7c81713 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 5fc180a7f..c4dd593b6 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 fb353c63d..dd9d5d27a 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 1d1723fa4..395aea7d6 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 1ddbc64bb..122423191 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 bdf7879fe..85b66a4b0 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 a0aa24f78..b87c36edd 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 4b41fb203..21ada98fb 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 a73e97ecf..24a3ec299 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 21099ed06..9e9869ad7 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 b81cd00d5..73b4a86da 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 28256cd59..c6150594d 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 991f5efef..db506c0f2 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 466366dd0..e50bac1e9 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 aad79abcd..aaf48b566 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 aa983d689..eee126c49 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 68040e768..523434a8b 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 69fbdfdd1..c56ccad7d 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 35080e52f..aa162ca8a 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 9830b5853..cb6c1c665 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 f0a5084d0..fc5bd04de 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 21956bb13..e22fad310 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 0de52df89..c6b9ff444 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 482db8d39..bae2923b4 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 6e0977169..8bce57f45 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 e5386f3eb..a76d194b5 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 4931d1707..514ec0d98 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" -- GitLab