From 57013583aca0b4e919c74a35bae3ff84caa14e6b Mon Sep 17 00:00:00 2001
From: Jacob Walser <jwalser90@gmail.com>
Date: Fri, 25 Nov 2016 16:34:23 -0500
Subject: [PATCH] Sub: Remove TELEM_DELAY parameter

---
 ArduSub/GCS_Mavlink.h  | 2 +-
 ArduSub/Parameters.cpp | 9 ---------
 ArduSub/Parameters.h   | 2 --
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_Mavlink.h
index d473f4366b..099ef84e51 100644
--- a/ArduSub/GCS_Mavlink.h
+++ b/ArduSub/GCS_Mavlink.h
@@ -11,7 +11,7 @@ public:
 
 protected:
 
-    uint32_t telem_delay() const override;
+    uint32_t telem_delay() const override { return 0; };
 
 private:
 
diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index cc6fe109bc..54cbf15db9 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -96,15 +96,6 @@ const AP_Param::Info Sub::var_info[] = {
     // @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp
     GOBJECT(serial_manager, "SERIAL",   AP_SerialManager),
 
-    // @Param: TELEM_DELAY
-    // @DisplayName: Telemetry startup delay
-    // @Description: The amount of time (in seconds) to delay radio telemetry to prevent an Xbee bricking on power up
-    // @User: Advanced
-    // @Units: seconds
-    // @Range: 0 10
-    // @Increment: 1
-    GSCALAR(telem_delay,            "TELEM_DELAY",     0),
-
     // @Param: GCS_PID_MASK
     // @DisplayName: GCS PID tuning mask
     // @Description: bitmask of PIDs to send MAVLink PID_TUNING messages for
diff --git a/ArduSub/Parameters.h b/ArduSub/Parameters.h
index c2ff1ec423..8db55520dd 100644
--- a/ArduSub/Parameters.h
+++ b/ArduSub/Parameters.h
@@ -138,7 +138,6 @@ public:
         k_param_gcs1,
         k_param_sysid_this_mav,
         k_param_sysid_my_gcs,
-        k_param_telem_delay,
         k_param_gcs2,
         k_param_serial_manager,
         k_param_ch9_option,
@@ -297,7 +296,6 @@ public:
     //
     AP_Int16        sysid_this_mav;
     AP_Int16        sysid_my_gcs;
-    AP_Int8         telem_delay;
 #if CLI_ENABLED == ENABLED
     AP_Int8         cli_enabled;
 #endif