Add autodocking to default robot launch (#28)

Also update package.xml
ZebraDevs · Feb 13, 2019 · 6e08176 · 6e08176
1 parent 0d547bb
commit 6e08176
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/fetch_bringup/launch/fetch.launch b/fetch_bringup/launch/fetch.launch
@@ -56,6 +56,9 @@
   <!-- Teleop -->
   <include file="$(find fetch_bringup)/launch/include/teleop.launch.xml" />
 
+  <!-- Autodocking -->
+  <include file="$(find fetch_open_auto_dock)/launch/auto_dock.launch" />
+
   <!-- Software Runstop -->
   <include file="$(find fetch_bringup)/launch/include/runstop.launch.xml">
     <arg name="flags" value="-a -b -g" />

diff --git a/fetch_bringup/package.xml b/fetch_bringup/package.xml
@@ -5,13 +5,15 @@
     Bringup for fetch
   </description>
   <author>Michael Ferguson</author>
-  <maintainer email="[email protected]">Michael Ferguson</maintainer>
+  <maintainer email="[email protected]">Eric Relson</maintainer>
+  <maintainer email="[email protected]">Fetch Robotics Open Source Team</maintainer>
   <license>Proprietary</license>
   <buildtool_depend>catkin</buildtool_depend>
   <run_depend>depth_image_proc</run_depend>
   <run_depend>diagnostic_aggregator</run_depend>
   <run_depend>fetch_description</run_depend>
   <run_depend>fetch_drivers</run_depend>
+  <run_depend>fetch_open_auto_dock</run_depend>
   <run_depend>fetch_teleop</run_depend>
   <run_depend>graft</run_depend>
   <run_depend>image_proc</run_depend>

diff --git a/freight_bringup/launch/freight.launch b/freight_bringup/launch/freight.launch
@@ -35,6 +35,9 @@
   <!-- Teleop -->
   <include file="$(find freight_bringup)/launch/include/teleop.launch.xml" />
 
+  <!-- Autodocking -->
+  <include file="$(find fetch_open_auto_dock)/launch/auto_dock.launch" />
+
   <!-- Diagnostics Aggregator -->
   <include file="$(find freight_bringup)/launch/include/aggregator.launch.xml" />
 

diff --git a/freight_bringup/package.xml b/freight_bringup/package.xml
@@ -5,12 +5,14 @@
     Bringup for freight
   </description>
   <author>Michael Ferguson</author>
-  <maintainer email="[email protected]">Michael Ferguson</maintainer>
+  <maintainer email="[email protected]">Eric Relson</maintainer>
+  <maintainer email="[email protected]">Fetch Robotics Open Source Team</maintainer>
   <license>Proprietary</license>
   <buildtool_depend>catkin</buildtool_depend>
   <run_depend>diagnostic_aggregator</run_depend>
   <run_depend>fetch_description</run_depend>
   <run_depend>fetch_drivers</run_depend>
+  <run_depend>fetch_open_auto_dock</run_depend>
   <run_depend>fetch_teleop</run_depend>
   <run_depend>graft</run_depend>
   <run_depend>joy</run_depend>