From 6e08176459bdef35d6c8ec0234825d467c31f81a Mon Sep 17 00:00:00 2001
From: Eric Relson <gertlex@gmail.com>
Date: Wed, 13 Feb 2019 11:21:49 -0800
Subject: [PATCH] Add autodocking to default robot launch (#28)

Also update package.xml
---
 fetch_bringup/launch/fetch.launch     | 3 +++
 fetch_bringup/package.xml             | 4 +++-
 freight_bringup/launch/freight.launch | 3 +++
 freight_bringup/package.xml           | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fetch_bringup/launch/fetch.launch b/fetch_bringup/launch/fetch.launch
index deb5e2f..37519d6 100644
--- 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
index a765cdf..3ff829c 100644
--- a/fetch_bringup/package.xml
+++ b/fetch_bringup/package.xml
@@ -5,13 +5,15 @@
     Bringup for fetch
   </description>
   <author>Michael Ferguson</author>
-  <maintainer email="mferguson@fetchrobotics.com">Michael Ferguson</maintainer>
+  <maintainer email="erelson@fetchrobotics.com">Eric Relson</maintainer>
+  <maintainer email="opensource@fetchrobotics.com">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
index 37d9dd0..628893e 100644
--- 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
index b5ec631..190fa48 100644
--- a/freight_bringup/package.xml
+++ b/freight_bringup/package.xml
@@ -5,12 +5,14 @@
     Bringup for freight
   </description>
   <author>Michael Ferguson</author>
-  <maintainer email="mferguson@fetchrobotics.com">Michael Ferguson</maintainer>
+  <maintainer email="erelson@fetchrobotics.com">Eric Relson</maintainer>
+  <maintainer email="opensource@fetchrobotics.com">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>