Merge branch 'main' into charlywrx/support_fleet_task

open-rmf · Jan 25, 2024 · a4b2d7a · a4b2d7a
2 parents dffdd54 + 86b308e
commit a4b2d7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/rmf_demos/launch/airport_terminal.launch.xml b/rmf_demos/launch/airport_terminal.launch.xml
@@ -54,9 +54,6 @@
     </include>
   </group>
 
-    <param name="use_sim_time" value="$(var use_sim_time)"/>
-  </node>
-
   <!-- cleanerBotE fleet adapter -->
   <group>
     <include file="$(find-pkg-share rmf_demos_fleet_adapter)/launch/fleet_adapter.launch.xml">

diff --git a/rmf_demos/launch/common.launch.xml b/rmf_demos/launch/common.launch.xml
@@ -10,6 +10,7 @@
   <arg name="headless" default="false" description="do not launch rviz; launch gazebo in headless mode"/>
   <arg name="bidding_time_window" description="Time window in seconds for task bidding process" default="2.0"/>
   <arg name="use_rmf_panel" default="true" description="launch web and api server for rmf_demos_panel"/>
+  <arg name="use_unique_hex_string_with_task_id" default="true" description="Appends a unique hex string to the task ID"/>
 
   <!-- Traffic Schedule  -->
   <node pkg="rmf_traffic_ros2" exec="rmf_traffic_schedule" output="both" name="rmf_traffic_schedule_primary">
@@ -57,6 +58,7 @@
     <node pkg="rmf_task_ros2" exec="rmf_task_dispatcher"  output="screen">
       <param name="use_sim_time" value="$(var use_sim_time)"/>
       <param name="bidding_time_window" value="$(var bidding_time_window)"/>
+      <param name="use_unique_hex_string_with_task_id" value="$(var use_unique_hex_string_with_task_id)"/>
     </node>
   </group>