From 3403e1b78d850d1169f234679196bef4ccef980e Mon Sep 17 00:00:00 2001
From: Craig Elder <Craig@3Drobotics.com>
Date: Tue, 28 Aug 2012 20:09:10 -0700
Subject: [PATCH] Arducopter: increased MAVLINK delay to 6s to reduce the
 chance of xBee bricking Arduplane:  increased MAVLINK delay to 6s to reduce
 the chance of xBee bricking Ardurover:  increased MAVLINK delay to 6s to
 reduce the chance of xBee bricking

---
 APMrover2/config.h  | 8 ++++----
 ArduCopter/config.h | 2 +-
 ArduPlane/config.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/APMrover2/config.h b/APMrover2/config.h
index d43c5012f7..29aa181806 100644
--- a/APMrover2/config.h
+++ b/APMrover2/config.h
@@ -186,7 +186,7 @@
 #endif
 
 #ifndef SONAR_TYPE
-# define SONAR_TYPE             MAX_SONAR_LV	// MAX_SONAR_XL,  
+# define SONAR_TYPE             MAX_SONAR_LV	// MAX_SONAR_XL,
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@
 #endif
 
 #ifndef SONAR_TRIGGER
-# define SONAR_TRIGGER       60        // trigger distance in cm 
+# define SONAR_TRIGGER       60        // trigger distance in cm
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -236,7 +236,7 @@
 #if HIL_MODE != HIL_MODE_DISABLED	// we are in HIL mode
  # undef GPS_PROTOCOL
  # define GPS_PROTOCOL GPS_PROTOCOL_NONE
- 
+
   #undef CONFIG_SONAR
  #define CONFIG_SONAR DISABLED
 #endif
@@ -892,7 +892,7 @@
 
 // delay to prevent Xbee bricking, in milliseconds
 #ifndef MAVLINK_TELEMETRY_PORT_DELAY
-# define MAVLINK_TELEMETRY_PORT_DELAY 2000
+# define MAVLINK_TELEMETRY_PORT_DELAY 6000
 #endif
 
 // use this to disable gen-fencing
diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 3fd9f4ae71..8538ad14b3 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -1058,7 +1058,7 @@
 
 // delay to prevent Xbee bricking, in milliseconds
 #ifndef MAVLINK_TELEMETRY_PORT_DELAY
- # define MAVLINK_TELEMETRY_PORT_DELAY 2000
+ # define MAVLINK_TELEMETRY_PORT_DELAY 6000
 #endif
 
 
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index a423d8727c..d62390a132 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -818,7 +818,7 @@
 
 // delay to prevent Xbee bricking, in milliseconds
 #ifndef MAVLINK_TELEMETRY_PORT_DELAY
- # define MAVLINK_TELEMETRY_PORT_DELAY 2000
+ # define MAVLINK_TELEMETRY_PORT_DELAY 6000
 #endif
 
 // use this to disable geo-fencing