From acc6c81be13d1572cf37fdcb91aed17536a3c547 Mon Sep 17 00:00:00 2001
From: David Soto <d.soto@ufl.edu>
Date: Mon, 10 Apr 2017 13:15:59 -0400
Subject: [PATCH 1/3] GREAT MERGE: make DepthStamped.msg (mil_msgs)

This is new mesage should be used by the depth driver instead of
Float64Stamped
---
 utils/mil_msgs/msg/DepthStamped.msg   | 4 ++++
 utils/mil_msgs/msg/Float64Stamped.msg | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 utils/mil_msgs/msg/DepthStamped.msg
 delete mode 100644 utils/mil_msgs/msg/Float64Stamped.msg

diff --git a/utils/mil_msgs/msg/DepthStamped.msg b/utils/mil_msgs/msg/DepthStamped.msg
new file mode 100644
index 00000000..87158d40
--- /dev/null
+++ b/utils/mil_msgs/msg/DepthStamped.msg
@@ -0,0 +1,4 @@
+Header header
+
+# A depth in meters
+float64 depth
diff --git a/utils/mil_msgs/msg/Float64Stamped.msg b/utils/mil_msgs/msg/Float64Stamped.msg
deleted file mode 100644
index 5c2f1136..00000000
--- a/utils/mil_msgs/msg/Float64Stamped.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Header header
-float64 data

From f9bf045bb57d901a0ba21f3ed944035a8a8fec2e Mon Sep 17 00:00:00 2001
From: David Soto <d.soto@ufl.edu>
Date: Mon, 10 Apr 2017 13:35:44 -0400
Subject: [PATCH 2/3] GREAT MERGE: deprecate Float64Stamped.msg

Replaced with RangeStamped. DVL related cold that previously used
Float64Stamped should be transitioned to use RangeStamped instead.

Other depth driver related code should be changed to use
DepthStamped.

The only usage of Float64Stamped that is not DVL or depth or depth
driver related is in the start gate mission and should be removed
(@RustyBamboo).
---
 utils/mil_msgs/msg/RangeStamped.msg | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 utils/mil_msgs/msg/RangeStamped.msg

diff --git a/utils/mil_msgs/msg/RangeStamped.msg b/utils/mil_msgs/msg/RangeStamped.msg
new file mode 100644
index 00000000..a9381076
--- /dev/null
+++ b/utils/mil_msgs/msg/RangeStamped.msg
@@ -0,0 +1,4 @@
+Header header
+
+# A range in meters
+float64 range

From 7cd0f5e4dcf131d8f6027da012ec61b52e09c5c1 Mon Sep 17 00:00:00 2001
From: David Soto <d.soto@ufl.edu>
Date: Mon, 10 Apr 2017 23:23:50 -0400
Subject: [PATCH 3/3] GREAT MERGE: include new msgs in mil_msgs cmkaelists

---
 utils/mil_msgs/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/mil_msgs/CMakeLists.txt b/utils/mil_msgs/CMakeLists.txt
index a65ab09c..a023a1dc 100644
--- a/utils/mil_msgs/CMakeLists.txt
+++ b/utils/mil_msgs/CMakeLists.txt
@@ -22,7 +22,8 @@ add_message_files(FILES
   PoseTwistStamped.msg
   PoseTwist.msg
   VelocityMeasurements.msg
-  Float64Stamped.msg
+  DepthStamped.msg
+  RangeStamped.msg
   VelocityMeasurement.msg
   Acceleration.msg
 )