From cf636a2ea5ea9a58521501bad5430693ee3364ee Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 7 Jan 2017 16:36:42 +1100 Subject: [PATCH] autotest: fixed default parms for more vehicles --- Tools/autotest/default_params/copter-tri.parm | 6 +++--- Tools/autotest/default_params/firefly.parm | 3 --- Tools/autotest/default_params/plane-elevons.parm | 2 -- Tools/autotest/default_params/plane-jsbsim.parm | 4 ++-- Tools/autotest/default_params/plane-vtail.parm | 2 -- Tools/autotest/default_params/quadplane-tilttri.parm | 3 --- Tools/autotest/default_params/quadplane-tri.parm | 3 --- 7 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Tools/autotest/default_params/copter-tri.parm b/Tools/autotest/default_params/copter-tri.parm index d4ca6f5680..8ab2371617 100644 --- a/Tools/autotest/default_params/copter-tri.parm +++ b/Tools/autotest/default_params/copter-tri.parm @@ -1,6 +1,6 @@ -MOT_YAW_SV_REV -1 -MOT_YAW_SV_MIN 1000 -MOT_YAW_SV_MAX 2000 +SERVO7_REVERSED 1 +SERVO7_MIN 1000 +SERVO7_MAX 2000 EK2_ENABLE 1 FRAME_TYPE 0 MAG_ENABLE 1 diff --git a/Tools/autotest/default_params/firefly.parm b/Tools/autotest/default_params/firefly.parm index 4456c58126..8eafe6aee1 100644 --- a/Tools/autotest/default_params/firefly.parm +++ b/Tools/autotest/default_params/firefly.parm @@ -53,12 +53,9 @@ RALLY_TOTAL 0 RC1_DZ 30 RC1_MAX 1886 RC1_MIN 1087 -RC1_REV 1 RC1_TRIM 1500 -RC2_REV 1 RC3_MAX 2000 RC3_MIN 1000 -RC4_REV 1 RLL2SRV_D 0.141009 RLL2SRV_I 0.425000 RLL2SRV_IMAX 4000 diff --git a/Tools/autotest/default_params/plane-elevons.parm b/Tools/autotest/default_params/plane-elevons.parm index 33354ec062..a5e6f5fdf7 100644 --- a/Tools/autotest/default_params/plane-elevons.parm +++ b/Tools/autotest/default_params/plane-elevons.parm @@ -18,8 +18,6 @@ KFF_RDDRMIX 0.5 THR_MAX 100 ELEVON_OUTPUT 4 KFF_RDDRMIX 0 -RC2_REV 1 -RC4_REV 1 RC1_MAX 2000 RC1_MIN 1000 RC1_TRIM 1500 diff --git a/Tools/autotest/default_params/plane-jsbsim.parm b/Tools/autotest/default_params/plane-jsbsim.parm index e9e0fb2104..391ff245b2 100644 --- a/Tools/autotest/default_params/plane-jsbsim.parm +++ b/Tools/autotest/default_params/plane-jsbsim.parm @@ -16,8 +16,8 @@ ARSPD_FBW_MAX 30 ARSPD_FBW_MIN 10 KFF_RDDRMIX 0.5 THR_MAX 100 -RC2_REV -1 -RC4_REV -1 +RC2_REVERSED 1 +RC4_REVERSED 1 RC1_MAX 2000 RC1_MIN 1000 RC1_TRIM 1500 diff --git a/Tools/autotest/default_params/plane-vtail.parm b/Tools/autotest/default_params/plane-vtail.parm index 27eafbedee..041c00f9c8 100644 --- a/Tools/autotest/default_params/plane-vtail.parm +++ b/Tools/autotest/default_params/plane-vtail.parm @@ -16,8 +16,6 @@ ARSPD_FBW_MAX 30 ARSPD_FBW_MIN 10 KFF_RDDRMIX 0.5 THR_MAX 100 -RC2_REV 1 -RC4_REV 1 RC1_MAX 2000 RC1_MIN 1000 RC1_TRIM 1500 diff --git a/Tools/autotest/default_params/quadplane-tilttri.parm b/Tools/autotest/default_params/quadplane-tilttri.parm index 726e663d70..de51137e96 100644 --- a/Tools/autotest/default_params/quadplane-tilttri.parm +++ b/Tools/autotest/default_params/quadplane-tilttri.parm @@ -55,12 +55,9 @@ RALLY_TOTAL 0 RC1_DZ 30 RC1_MAX 1886 RC1_MIN 1087 -RC1_REV 1 RC1_TRIM 1500 -RC2_REV 1 RC3_MAX 2000 RC3_MIN 1000 -RC4_REV 1 RLL2SRV_D 0.141009 RLL2SRV_I 0.425000 RLL2SRV_IMAX 4000 diff --git a/Tools/autotest/default_params/quadplane-tri.parm b/Tools/autotest/default_params/quadplane-tri.parm index ab43c000ca..f76f2d438e 100644 --- a/Tools/autotest/default_params/quadplane-tri.parm +++ b/Tools/autotest/default_params/quadplane-tri.parm @@ -55,12 +55,9 @@ RALLY_TOTAL 0 RC1_DZ 30 RC1_MAX 1886 RC1_MIN 1087 -RC1_REV 1 RC1_TRIM 1500 -RC2_REV 1 RC3_MAX 2000 RC3_MIN 1000 -RC4_REV 1 RLL2SRV_D 0.141009 RLL2SRV_I 0.425000 RLL2SRV_IMAX 4000