Skip to content

Commit

Permalink
Remove easy_fleet param from launch (#194)
Browse files Browse the repository at this point in the history
Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>
Co-authored-by: Yadu <yadunund@openrobotics.org>
  • Loading branch information
xiyuoh and Yadunund authored Jan 30, 2024
1 parent bff8391 commit 5f0c6c1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
28 changes: 1 addition & 27 deletions rmf_demos_fleet_adapter/launch/fleet_adapter.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<arg name="config_file" description="The config file that provides important parameters for setting up the adapter"/>
<arg name="nav_graph_file" description="The graph that this fleet should use for navigation"/>
<arg name="server_uri" default="" description="The URI of the api server to transmit state and task information."/>
<arg name="easy_fleet" default="false" description="Set to true if using the EasyFullControl fleet adapter"/>
<arg name="output" default="screen"/>

<!-- Fleet manager -->
Expand All @@ -18,33 +17,8 @@
<param name="use_sim_time" value="$(var use_sim_time)"/>
</node>

<!-- EasyFullControl fleet adapter -->
<group if="$(var easy_fleet)">
<group if="$(var use_sim_time)">
<node pkg="rmf_demos_fleet_adapter"
exec="easy_fleet_adapter"
args="-c $(var config_file) -n $(var nav_graph_file) -sim"
output="both">

<param name="use_sim_time" value="$(var use_sim_time)"/>
<param name="server_uri" value="$(var server_uri)"/>
</node>
</group>

<group unless="$(var use_sim_time)">
<node pkg="rmf_demos_fleet_adapter"
exec="easy_fleet_adapter"
args="-c $(var config_file) -n $(var nav_graph_file)"
output="both">

<param name="use_sim_time" value="$(var use_sim_time)"/>
<param name="server_uri" value="$(var server_uri)"/>
</node>
</group>
</group>

<!-- Fleet adapter -->
<group unless="$(var easy_fleet)">
<group>
<group if="$(var use_sim_time)">
<node pkg="rmf_demos_fleet_adapter"
exec="fleet_adapter"
Expand Down
2 changes: 0 additions & 2 deletions rmf_demos_fleet_adapter/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
'console_scripts': [
'fleet_adapter=rmf_demos_fleet_adapter.fleet_adapter:main',
'fleet_manager=rmf_demos_fleet_adapter.fleet_manager:main',
'easy_fleet_adapter='
'rmf_demos_fleet_adapter.easy_fleet_adapter:main',
],
},
)

0 comments on commit 5f0c6c1

Please sign in to comment.