From 1ce531b921f7149338d27d8e38a343b4f4aac65c Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Sat, 2 Mar 2019 11:09:34 +1100
Subject: [PATCH] Sub: move base_mode and frame_type into GCS from GCS_MAVLink

---
 ArduSub/GCS_Mavlink.cpp | 4 ++--
 ArduSub/GCS_Mavlink.h   | 2 --
 ArduSub/GCS_Sub.h       | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp
index 7f5d11c412..da13017832 100644
--- a/ArduSub/GCS_Mavlink.cpp
+++ b/ArduSub/GCS_Mavlink.cpp
@@ -17,7 +17,7 @@ void Sub::gcs_send_heartbeat()
  *  pattern below when adding any new messages
  */
 
-MAV_TYPE GCS_MAVLINK_Sub::frame_type() const
+MAV_TYPE GCS_Sub::frame_type() const
 {
     return MAV_TYPE_SUBMARINE;
 }
@@ -62,7 +62,7 @@ MAV_MODE GCS_MAVLINK_Sub::base_mode() const
     return (MAV_MODE)_base_mode;
 }
 
-uint32_t GCS_MAVLINK_Sub::custom_mode() const
+uint32_t GCS_Sub::custom_mode() const
 {
     return sub.control_mode;
 }
diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_Mavlink.h
index c06bc74321..c724428af7 100644
--- a/ArduSub/GCS_Mavlink.h
+++ b/ArduSub/GCS_Mavlink.h
@@ -50,9 +50,7 @@ private:
 
     bool send_info(void);
 
-    MAV_TYPE frame_type() const override;
     MAV_MODE base_mode() const override;
-    uint32_t custom_mode() const override;
     MAV_STATE system_status() const override;
 
     int16_t vfr_hud_throttle() const override;
diff --git a/ArduSub/GCS_Sub.h b/ArduSub/GCS_Sub.h
index 73542eb6cd..859b91cdeb 100644
--- a/ArduSub/GCS_Sub.h
+++ b/ArduSub/GCS_Sub.h
@@ -22,6 +22,9 @@ public:
 
     void update_sensor_status_flags() override;
 
+    uint32_t custom_mode() const override;
+    MAV_TYPE frame_type() const override;
+
 private:
 
     GCS_MAVLINK_Sub _chan[MAVLINK_COMM_NUM_BUFFERS];