From dbc85806112192734c3942751656034d28d18cf1 Mon Sep 17 00:00:00 2001
From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Date: Mon, 28 Feb 2022 14:06:29 +0900
Subject: [PATCH] fix(tier4_simulator_launch, tier4_vehicle_launch)!: fix
 launch args (#443)

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>
---
 .../tier4_simulator_launch/launch/simulator.launch.xml | 10 ++++------
 launch/tier4_vehicle_launch/launch/vehicle.launch.xml  |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/launch/tier4_simulator_launch/launch/simulator.launch.xml b/launch/tier4_simulator_launch/launch/simulator.launch.xml
index 0bec3d13b6a3..6d6048239121 100644
--- a/launch/tier4_simulator_launch/launch/simulator.launch.xml
+++ b/launch/tier4_simulator_launch/launch/simulator.launch.xml
@@ -1,12 +1,12 @@
 <launch>
+  <arg name="launch_dummy_perception" />
+  <arg name="launch_dummy_vehicle"/>
   <arg name="vehicle_info_param_file" />
-  <arg name="scenario_simulation" default="" description="use scenario simulation"/>
 
   <arg name="perception/enable_detection_failure" default="true" description="enable to simulate detection failure when using dummy perception"/>
   <arg name="perception/enable_object_recognition" default="false" description="enable object recognition when using dummy perception"/>
   <arg name="sensing/visible_range" default="300.0" description="visible range when using dummy perception"/>
 
-  <arg name="vehicle_simulation" default="true" description="use vehicle simulation"/>
   <arg name="vehicle_model" description="vehicle model name"/>
   <arg name="initial_engage_state" default="true" description="/vehicle/engage state after starting Autoware"/>
 
@@ -17,7 +17,7 @@
   </group>
 
   <!-- Dummy Perception -->
-  <group unless="$(var scenario_simulation)">
+  <group if="$(var launch_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="use_object_recognition" value="$(var perception/enable_object_recognition)"/>
@@ -26,15 +26,13 @@
   </group>
 
   <!-- Simulator model -->
-  <group if="$(var vehicle_simulation)">
-    <group unless="$(var scenario_simulation)">
+  <group if="$(var launch_dummy_vehicle)">
       <arg name="simulator_model" default="$(var vehicle_model_pkg)/config/simulator_model.param.yaml" description="path to the file of simulator model"/>
       <include file="$(find-pkg-share simple_planning_simulator)/launch/simple_planning_simulator.launch.py">
         <arg name="vehicle_info_param_file" value="$(var vehicle_info_param_file)" />
         <arg name="simulator_model_param_file" value="$(var simulator_model)"/>
         <arg name="initial_engage_state" value="$(var initial_engage_state)"/>
       </include>
-    </group>
   </group>
 
 </launch>
diff --git a/launch/tier4_vehicle_launch/launch/vehicle.launch.xml b/launch/tier4_vehicle_launch/launch/vehicle.launch.xml
index f696e6b33d73..b33eac296abc 100644
--- a/launch/tier4_vehicle_launch/launch/vehicle.launch.xml
+++ b/launch/tier4_vehicle_launch/launch/vehicle.launch.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launch>
+  <arg name="launch_vehicle_interface"/>
   <arg name="vehicle_model" description="vehicle model name"/>
   <arg name="sensor_model" description="sensor model name"/>
   <arg name="vehicle_id" default="$(env VEHICLE_ID default)" description="vehicle specific ID"/>
-  <arg name="simulation" default="false" description="use simulation"/>
   <arg name="initial_engage_state" default="false" description="/vehicle/engage state after starting Autoware"/>
 
   <let name="vehicle_launch_pkg" value="$(find-pkg-share $(var vehicle_model)_launch)"/>
@@ -17,7 +17,7 @@
   </group>
 
   <!-- vehicle interface -->
-  <group unless="$(var simulation)">
+  <group if="$(var launch_vehicle_interface)">
     <include file="$(var vehicle_launch_pkg)/launch/vehicle_interface.launch.xml">
       <arg name="vehicle_id" value="$(var vehicle_id)"/>
       <arg name="initial_engage_state" value="$(var initial_engage_state)"/>