From 12e5b7881fc732f91adab73a0196d0c282c40f6b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 2 May 2016 08:53:00 +1000
Subject: [PATCH] autotest: use more default parms for quadplanes

---
 Tools/autotest/firefly.parm       | 16 +++++++++-------
 Tools/autotest/quadplane-tri.parm |  3 ---
 Tools/autotest/quadplane.parm     |  4 ----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Tools/autotest/firefly.parm b/Tools/autotest/firefly.parm
index ef76335801..76e18561c5 100644
--- a/Tools/autotest/firefly.parm
+++ b/Tools/autotest/firefly.parm
@@ -3,7 +3,7 @@ AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
 ARSPD_ENABLE     1
 ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    13
+ARSPD_FBW_MIN    6
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
@@ -49,13 +49,9 @@ PTCH2SRV_I       0.425000
 PTCH2SRV_IMAX    4000
 PTCH2SRV_P       3.646518
 PTCH2SRV_RLL     1
-Q_ACCEL_Z        250
-Q_ANGLE_MAX      4500
-Q_ASSIST_SPEED   18
+Q_ASSIST_SPEED   6
 Q_ENABLE         1
 Q_FRAME_CLASS    4
-Q_LAND_FINAL_ALT 6
-Q_LAND_SPEED     50
 RALLY_INCL_HOME  0
 RALLY_LIMIT_KM   5
 RALLY_TOTAL      0
@@ -77,4 +73,10 @@ THR_MAX          100
 TRIM_ARSPD_CM    2500
 LOG_BITMASK      65534
 # map rc7 in to channel 11 out for tilt
-RC11_FUNCTION    57
+RC11_FUNCTION    41
+RC11_MIN         1000
+RC11_MAX         2000
+Q_TILT_MASK      23
+Q_RTL_MODE       1
+Q_VFWD_GAIN      0.1
+Q_WVANE_GAIN     0.3
diff --git a/Tools/autotest/quadplane-tri.parm b/Tools/autotest/quadplane-tri.parm
index c4864fcadf..756a60ee1c 100644
--- a/Tools/autotest/quadplane-tri.parm
+++ b/Tools/autotest/quadplane-tri.parm
@@ -51,12 +51,9 @@ PTCH2SRV_I       0.425000
 PTCH2SRV_IMAX    4000
 PTCH2SRV_P       3.646518
 PTCH2SRV_RLL     1
-Q_ACCEL_Z        250
 Q_ANGLE_MAX      4500
 Q_ASSIST_SPEED   18
 Q_ENABLE         1
-Q_LAND_FINAL_ALT 6
-Q_LAND_SPEED     50
 RALLY_INCL_HOME  0
 RALLY_LIMIT_KM   5
 RALLY_TOTAL      0
diff --git a/Tools/autotest/quadplane.parm b/Tools/autotest/quadplane.parm
index b62606c5fd..8f56915f36 100644
--- a/Tools/autotest/quadplane.parm
+++ b/Tools/autotest/quadplane.parm
@@ -48,12 +48,8 @@ PTCH2SRV_I       0.425000
 PTCH2SRV_IMAX    4000
 PTCH2SRV_P       3.646518
 PTCH2SRV_RLL     1
-Q_ACCEL_Z        250
-Q_ANGLE_MAX      4500
 Q_ASSIST_SPEED   18
 Q_ENABLE         1
-Q_LAND_FINAL_ALT 6
-Q_LAND_SPEED     50
 RALLY_INCL_HOME  0
 RALLY_LIMIT_KM   5
 RALLY_TOTAL      0