fix: use sim time option (autowarefoundation#69)

* fix: use sim time option Signed-off-by: tanaka3 <[email protected]> * fix: minimum usesim time option Signed-off-by: tanaka3 <[email protected]> * ci(pre-commit): autofix * fix: add simulation flag to distinguish Signed-off-by: tanaka3 <[email protected]> * ci(pre-commit): autofix * Revert "ci(pre-commit): autofix" This reverts commit 291770d114baae38c7645b51c2569a66fa6353d3. * Revert "Merge commit '7b1424eaeb2b06a6fb2921ff242a3c4e5fef6169' into fix/use_sim_time_option" This reverts commit 02fede2df4099d5019b60fddb585e53357e62535, reversing changes made to 9aeaa88f39c152333cac658a908f9ab8d7dcd037. * Revert "fix: add simulation flag to distinguish" This reverts commit 9aeaa88f39c152333cac658a908f9ab8d7dcd037. * fix: remove duplicated arg Signed-off-by: tanaka3 <[email protected]> * fix: use sim time option Signed-off-by: tanaka3 <[email protected]> * ci(pre-commit): autofix * fix: ungroup autoware launch * Revert "fix: ungroup autoware launch" This reverts commit cb3e3aa536ae2aa740cd846c97fe6cf373ba8744. * fix: to scoped false * chore: better comment Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
keiota · Aug 1, 2022 · f434f80 · f434f80
1 parent 3fb59c3
commit f434f80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml
@@ -36,11 +36,12 @@
   <arg name="launch_web_controller" default="true" description="launch web controller"/>
 
   <!-- Global parameters -->
-  <!-- Do not add "group" in order to propagate global parameters -->
-  <include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
-    <arg name="use_sim_time" value="$(var use_sim_time)"/>
-    <arg name="vehicle_model" value="$(var vehicle_model)"/>
-  </include>
+  <group scoped="false">
+    <include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
+      <arg name="use_sim_time" value="$(var use_sim_time)"/>
+      <arg name="vehicle_model" value="$(var vehicle_model)"/>
+    </include>
+  </group>
 
   <!-- Pointcloud container -->
   <group if="$(var use_pointcloud_container)">

diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml
@@ -29,7 +29,7 @@
   <!-- Scenario simulation -->
   <arg name="scenario_simulation" default="false" description="use scenario simulation"/>
 
-  <group>
+  <group scoped="false">
     <include file="$(find-pkg-share autoware_launch)/launch/autoware.launch.xml">
       <!-- Common -->
       <arg name="map_path" value="$(var map_path)"/>

diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml
@@ -21,7 +21,7 @@
   <!-- Vcu emulation -->
   <arg name="vehicle_simulation" default="true" description="use vehicle simulation"/>
 
-  <group>
+  <group scoped="false">
     <!-- Vehicle -->
     <let name="launch_vehicle_interface" value="false" if="$(var vehicle_simulation)"/>
     <let name="launch_vehicle_interface" value="true" unless="$(var vehicle_simulation)"/>