Commit 5c8800d5 authored by Reinhard Biegel's avatar Reinhard Biegel Committed by Dmitri Fix
Browse files

Merge branch 'intech' into servant

Change-Id: Iff8b3f8e366e28d3a2a4898363462ef68a2255ca
parents 7dca356b af37a0a1
...@@ -37,14 +37,25 @@ ...@@ -37,14 +37,25 @@
<parameters/> <parameters/>
</component> </component>
<component> <component>
<id>SensorFusion</id> <id>SensorAggregation</id>
<schedule>
<priority>351</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>SensorAggregation_OSI</library>
<parameters/>
</component>
<component>
<id>SensorFusionErrorless</id>
<schedule> <schedule>
<priority>350</priority> <priority>350</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
</schedule> </schedule>
<library>SensorFusion_OSI</library> <library>SensorFusionErrorless_OSI</library>
<parameters/> <parameters/>
</component> </component>
<component> <component>
...@@ -550,17 +561,6 @@ ...@@ -550,17 +561,6 @@
<input>2</input> <input>2</input>
</target> </target>
</connection> </connection>
<connection>
<id>9190</id>
<source>
<component>SensorFusion</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>9292</id> <id>9292</id>
<source> <source>
...@@ -588,6 +588,28 @@ ...@@ -588,6 +588,28 @@
<input>100</input> <input>100</input>
</target> </target>
</connection> </connection>
<connection>
<id>9390</id>
<source>
<component>SensorAggregation</component>
<output>0</output>
</source>
<target>
<component>SensorFusionErrorless</component>
<input>0</input>
</target>
</connection>
<connection>
<id>9490</id>
<source>
<component>SensorFusionErrorless</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>9581</id> <id>9581</id>
<source> <source>
...@@ -618,7 +640,7 @@ ...@@ -618,7 +640,7 @@
<output>0</output> <output>0</output>
</source> </source>
<target> <target>
<component>SensorFusion</component> <component>SensorAggregation</component>
<input>0</input> <input>0</input>
</target> </target>
</connection> </connection>
......
<masterConfig> <masterConfig>
<logLevel>0</logLevel> <logLevel>0</logLevel>
<logFileMaster>OpenPassMaster.log</logFileMaster> <logFileMaster>OpenPassMaster.log</logFileMaster>
<slave>OpenPassSlave</slave> <slave>OpenPassSlave.exe</slave>
<libraries>lib</libraries> <libraries>lib</libraries>
<slaveConfigs> <slaveConfigs>
<slaveConfig> <slaveConfig>
......
...@@ -37,14 +37,25 @@ ...@@ -37,14 +37,25 @@
<parameters/> <parameters/>
</component> </component>
<component> <component>
<id>SensorFusion</id> <id>SensorAggregation</id>
<schedule>
<priority>351</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>SensorAggregation_OSI</library>
<parameters/>
</component>
<component>
<id>SensorFusionErrorless</id>
<schedule> <schedule>
<priority>350</priority> <priority>350</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
</schedule> </schedule>
<library>SensorFusion_OSI</library> <library>SensorFusionErrorless_OSI</library>
<parameters/> <parameters/>
</component> </component>
<component> <component>
...@@ -550,17 +561,6 @@ ...@@ -550,17 +561,6 @@
<input>2</input> <input>2</input>
</target> </target>
</connection> </connection>
<connection>
<id>9190</id>
<source>
<component>SensorFusion</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>9292</id> <id>9292</id>
<source> <source>
...@@ -588,6 +588,28 @@ ...@@ -588,6 +588,28 @@
<input>100</input> <input>100</input>
</target> </target>
</connection> </connection>
<connection>
<id>9390</id>
<source>
<component>SensorAggregation</component>
<output>0</output>
</source>
<target>
<component>SensorFusionErrorless</component>
<input>0</input>
</target>
</connection>
<connection>
<id>9490</id>
<source>
<component>SensorFusionErrorless</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>9581</id> <id>9581</id>
<source> <source>
...@@ -618,7 +640,7 @@ ...@@ -618,7 +640,7 @@
<output>0</output> <output>0</output>
</source> </source>
<target> <target>
<component>SensorFusion</component> <component>SensorAggregation</component>
<input>0</input> <input>0</input>
</target> </target>
</connection> </connection>
......
<masterConfig> <masterConfig>
<logLevel>0</logLevel> <logLevel>0</logLevel>
<logFileMaster>OpenPassMaster.log</logFileMaster> <logFileMaster>OpenPassMaster.log</logFileMaster>
<slave>OpenPassSlave</slave> <slave>OpenPassSlave.exe</slave>
<libraries>lib</libraries> <libraries>lib</libraries>
<slaveConfigs> <slaveConfigs>
<slaveConfig> <slaveConfig>
......
...@@ -37,14 +37,25 @@ ...@@ -37,14 +37,25 @@
<parameters/> <parameters/>
</component> </component>
<component> <component>
<id>SensorFusion</id> <id>SensorAggregation</id>
<schedule>
<priority>351</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>SensorAggregation_OSI</library>
<parameters/>
</component>
<component>
<id>SensorFusionErrorless</id>
<schedule> <schedule>
<priority>350</priority> <priority>350</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
</schedule> </schedule>
<library>SensorFusion_OSI</library> <library>SensorFusionErrorless_OSI</library>
<parameters/> <parameters/>
</component> </component>
<component> <component>
...@@ -110,7 +121,7 @@ ...@@ -110,7 +121,7 @@
</parameters> </parameters>
</component> </component>
<component> <component>
<id>PrioritizerLateralVehicleComponents</id> <id>PrioritizerSteeringVehicleComponents</id>
<schedule> <schedule>
<priority>150</priority> <priority>150</priority>
<offset>0</offset> <offset>0</offset>
...@@ -154,17 +165,6 @@ ...@@ -154,17 +165,6 @@
<library>Algorithm_Longitudinal</library> <library>Algorithm_Longitudinal</library>
<parameters/> <parameters/>
</component> </component>
<component>
<id>Algorithm_LateralVehicleComponents</id>
<schedule>
<priority>100</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>Algorithm_Lateral</library>
<parameters/>
</component>
<component> <component>
<id>Algorithm_LateralAfdm</id> <id>Algorithm_LateralAfdm</id>
<schedule> <schedule>
...@@ -417,17 +417,6 @@ ...@@ -417,17 +417,6 @@
<input>1</input> <input>1</input>
</target> </target>
</connection> </connection>
<connection>
<id>1412</id>
<source>
<component>Algorithm_LateralVehicleComponents</component>
<output>0</output>
</source>
<target>
<component>PrioritizerSteering</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>1512</id> <id>1512</id>
<source> <source>
...@@ -494,11 +483,11 @@ ...@@ -494,11 +483,11 @@
<connection> <connection>
<id>2414</id> <id>2414</id>
<source> <source>
<component>PrioritizerLateralVehicleComponents</component> <component>PrioritizerSteeringVehicleComponents</component>
<output>0</output> <output>0</output>
</source> </source>
<target> <target>
<component>Algorithm_LateralVehicleComponents</component> <component>PrioritizerSteering</component>
<input>0</input> <input>0</input>
</target> </target>
<target> <target>
...@@ -572,17 +561,6 @@ ...@@ -572,17 +561,6 @@
<input>2</input> <input>2</input>
</target> </target>
</connection> </connection>
<connection>
<id>9190</id>
<source>
<component>SensorFusion</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target>
</connection>
<connection> <connection>
<id>9292</id> <id>9292</id>
<source> <source>
...@@ -606,12 +584,30 @@ ...@@ -606,12 +584,30 @@
<input>100</input> <input>100</input>
</target> </target>
<target> <target>
<component>Algorithm_LateralVehicleComponents</component> <component>Dynamics_RegularDriving</component>
<input>100</input> <input>100</input>
</target> </target>
</connection>
<connection>
<id>9390</id>
<source>
<component>SensorAggregation</component>
<output>0</output>
</source>
<target> <target>
<component>Dynamics_RegularDriving</component> <component>SensorFusionErrorless</component>
<input>100</input> <input>0</input>
</target>
</connection>
<connection>
<id>9490</id>
<source>
<component>SensorFusionErrorless</component>
<output>0</output>
</source>
<target>
<component>AEB</component>
<input>0</input>
</target> </target>
</connection> </connection>
<connection> <connection>
...@@ -636,10 +632,6 @@ ...@@ -636,10 +632,6 @@
<component>Algorithm_LateralAfdm</component> <component>Algorithm_LateralAfdm</component>
<input>101</input> <input>101</input>
</target> </target>
<target>
<component>Algorithm_LateralVehicleComponents</component>
<input>101</input>
</target>
</connection> </connection>
<connection> <connection>
<id>9900</id> <id>9900</id>
...@@ -648,7 +640,7 @@ ...@@ -648,7 +640,7 @@
<output>0</output> <output>0</output>
</source> </source>
<target> <target>
<component>SensorFusion</component> <component>SensorAggregation</component>
<input>0</input> <input>0</input>
</target> </target>
</connection> </connection>
......
<masterConfig> <masterConfig>
<logLevel>0</logLevel> <logLevel>0</logLevel>
<logFileMaster>OpenPassMaster.log</logFileMaster> <logFileMaster>OpenPassMaster.log</logFileMaster>
<slave>OpenPassSlave</slave> <slave>OpenPassSlave.exe</slave>
<libraries>lib</libraries> <libraries>lib</libraries>
<slaveConfigs> <slaveConfigs>
<slaveConfig> <slaveConfig>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<component> <component>
<id>Sensor_Driver</id> <id>Sensor_Driver</id>
<schedule> <schedule>
<priority>490</priority> <priority>390</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
...@@ -37,14 +37,25 @@ ...@@ -37,14 +37,25 @@
<parameters/> <parameters/>
</component> </component>
<component> <component>
<id>SensorFusion</id> <id>SensorAggregation</id>
<schedule>
<priority>351</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>SensorAggregation_OSI</library>
<parameters/>
</component>
<component>
<id>SensorFusionErrorless</id>
<schedule> <schedule>
<priority>350</priority> <priority>350</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
</schedule> </schedule>
<library>SensorFusion_OSI</library> <library>SensorFusionErrorless_OSI</library>
<parameters/> <parameters/>
</component> </component>
<component> <component>
...@@ -61,7 +72,7 @@ ...@@ -61,7 +72,7 @@
<component> <component>
<id>ComponentController</id> <id>ComponentController</id>
<schedule> <schedule>
<priority>1</priority> <priority>200</priority>
<offset>0</offset> <offset>0</offset>
<cycle>100</cycle> <cycle>100</cycle>
<response>0</response> <response>0</response>
...@@ -69,6 +80,17 @@ ...@@ -69,6 +80,17 @@
<library>ComponentController</library> <library>ComponentController</library>
<parameters/> <parameters/>
</component> </component>
<component>
<id>OpenScenarioActions</id>
<schedule>
<priority>400</priority>
<offset>0</offset>
<cycle>100</cycle>
<response>0</response>
</schedule>
<library>OpenScenarioActions</library>
<parameters/>
</component>
<component> <component>
<id>AEB</id> <id>AEB</id>
<schedule> <schedule>
...@@ -340,17 +362,6 @@ ...@@ -340,17 +362,6 @@
<input>2</input> <input>2</input>
</target> </target>
</connection> </connection>
<connection>
<id>283</id>
<source>
<component>Dynamics_TrajectoryFollower</component>
<output>83</output>
</source>
<target>
<component>ComponentController</component>
<input>100</input>
</target>
</connection>
<connection> <connection>
<id>301</id> <id>301</id>
<source> <source>
...@@ -540,14 +551,14 @@ ...@@ -540,14 +551,14 @@
</target> </target>
</connection> </connection>
<connection> <connection>
<id>9190</id> <id>8471</id>
<source> <source>
<component>SensorFusion</component> <component>OpenScenarioActions</component>
<output>0</output> <output>0</output>
</source> </source>
<target> <target>
<component>AEB</component> <component>Dynamics_TrajectoryFollower</component>
<input>0</input> <input>2</input>
</target> </target>
</connection> </connection>
<connection> <connection>
...@@ -577,6 +588,28 @@ ...@@ -577,6 +588,28 @@
<input>100</input> <input>100</input>
</target> </target>
</connection> </connection>