Skip to content

Commit

Permalink
add param for psim v2 (autowarefoundation#197)
Browse files Browse the repository at this point in the history
* add param for psim v2

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* Update to pass var 'scenario_simulation' to dummy_perception_publisher

* Update dummy_perception_publisher's arg-name

Co-authored-by: yamacir-kit <httperror@404-notfound.jp>
  • Loading branch information
2 people authored and tkimura4 committed Dec 13, 2021
1 parent 602712e commit b0dcc16
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions launch/autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
<arg name="sensor_model"/>
<!-- Optional parameters -->
<arg name="rviz" default="true" description="launch rviz"/>
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
<arg name="lanelet2_map_file" default="lanelet2_map.osm" />
<arg name="pointcloud_map_file" default="pointcloud_map.pcd" />
<!-- Optional parameters for scenario simulation -->
<arg name="initial_engage_state" default="true"/>
<arg name="perception/enable_detection_failure" default="true"/>
<arg name="perception/enable_object_recognition" default="true"/>
<arg name="sensing/visible_range" default="300.0"/>
<arg name="scenario_simulation" default="false"/>
<arg name="use_sim_time" default="false" />
<set_parameter name="use_sim_time" value="$(var use_sim_time)" />

Expand All @@ -22,6 +24,7 @@
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="simulation" value="true"/>
<arg name="scenario_simulation" value="$(var scenario_simulation)"/>
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
</include>

Expand All @@ -39,6 +42,7 @@
<!-- Dummy Perception -->
<include file="$(find-pkg-share dummy_perception_publisher)/launch/dummy_perception_publisher.launch.xml">
<arg name="real" value="$(var perception/enable_detection_failure)"/>
<arg name="disable_dummy_perception_publisher_node" value="$(var scenario_simulation)"/>
<arg name="use_object_recognition" value="$(var perception/enable_object_recognition)"/>
<arg name="visible_range" value="$(var sensing/visible_range)"/>
</include>
Expand All @@ -57,11 +61,10 @@
<include file="$(find-pkg-share awapi_awiv_adapter)/launch/awapi_awiv_adapter.launch.xml" />

<!-- Rviz -->
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)">
</node>
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)"/>

<!-- Web Controller -->
<include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" />
<include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" unless="$(var scenario_simulation)"/>

<!-- Clock Publisher For Rosbag -->
<!-- TODO(mitsudome-r): remove this after ROSBAG2 can automatically record clock -->
Expand Down

0 comments on commit b0dcc16

Please sign in to comment.