From 0944c249787e49c7b0b155195ac50de0179cc546 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 4 Dec 2021 15:22:56 +1100 Subject: [PATCH] SITL: revert compass parameter changes --- libraries/SITL/examples/Morse/rover.parm | 2 +- .../Params/Rolladen-Schneider-LS8b.param | 59 ++++++++++++++++++ .../Params/Schleicher-ASW27B.param | 62 +++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletion(-) diff --git a/libraries/SITL/examples/Morse/rover.parm b/libraries/SITL/examples/Morse/rover.parm index 317c07e47d..1f4ecc714f 100644 --- a/libraries/SITL/examples/Morse/rover.parm +++ b/libraries/SITL/examples/Morse/rover.parm @@ -5,4 +5,4 @@ SERVO1_REVERSED 1 SERVO3_FUNCTION 70 ATC_BRAKE 1 AHRS_ORIENTATION 2 -COMPASS1_ORIENT 2 +COMPASS_ORIENT 2 diff --git a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param index 39c356c97c..f0f21b2f70 100644 --- a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param +++ b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param @@ -62,6 +62,65 @@ CAM_TRIGG_DIST,0 CAM_TRIGG_TYPE,0 CHUTE_CHAN,0 CHUTE_ENABLED,0 +COMPASS_AUTO_ROT,2 +COMPASS_AUTODEC,1 +COMPASS_CAL_FIT,16 +COMPASS_DEC,0.06623807 +COMPASS_DEV_ID,983044 +COMPASS_DEV_ID2,983052 +COMPASS_DEV_ID3,0 +COMPASS_DIA_X,1 +COMPASS_DIA_Y,1 +COMPASS_DIA_Z,1 +COMPASS_DIA2_X,1 +COMPASS_DIA2_Y,1 +COMPASS_DIA2_Z,1 +COMPASS_DIA3_X,0 +COMPASS_DIA3_Y,0 +COMPASS_DIA3_Z,0 +COMPASS_EXTERN2,0 +COMPASS_EXTERN3,0 +COMPASS_EXTERNAL,1 +COMPASS_FLTR_RNG,0 +COMPASS_LEARN,1 +COMPASS_MOT_X,0 +COMPASS_MOT_Y,0 +COMPASS_MOT_Z,0 +COMPASS_MOT2_X,0 +COMPASS_MOT2_Y,0 +COMPASS_MOT2_Z,0 +COMPASS_MOT3_X,0 +COMPASS_MOT3_Y,0 +COMPASS_MOT3_Z,0 +COMPASS_MOTCT,0 +COMPASS_ODI_X,0 +COMPASS_ODI_Y,0 +COMPASS_ODI_Z,0 +COMPASS_ODI2_X,0 +COMPASS_ODI2_Y,0 +COMPASS_ODI2_Z,0 +COMPASS_ODI3_X,0 +COMPASS_ODI3_Y,0 +COMPASS_ODI3_Z,0 +COMPASS_OFFS_MAX,850 +COMPASS_OFS_X,5 +COMPASS_OFS_Y,13 +COMPASS_OFS_Z,-18 +COMPASS_OFS2_X,5 +COMPASS_OFS2_Y,13 +COMPASS_OFS2_Z,-18 +COMPASS_OFS3_X,0 +COMPASS_OFS3_Y,0 +COMPASS_OFS3_Z,0 +COMPASS_ORIENT,0 +COMPASS_ORIENT2,0 +COMPASS_ORIENT3,0 +COMPASS_PMOT_EN,0 +COMPASS_PRIMARY,0 +COMPASS_TYPEMASK,0 +COMPASS_USE,0 +COMPASS_USE2,0 +COMPASS_USE3,0 CRASH_ACC_THRESH,0 CRASH_DETECT,0 DSPOILR_RUD_RATE,100 diff --git a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param index 1f21f48d00..3c5d8ede1b 100644 --- a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param +++ b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param @@ -62,6 +62,68 @@ CAM_TRIGG_DIST,0 CAM_TRIGG_TYPE,0 CHUTE_CHAN,0 CHUTE_ENABLED,0 +COMPASS_AUTO_ROT,2 +COMPASS_AUTODEC,1 +COMPASS_CAL_FIT,16 +COMPASS_DEC,0.2073689 +COMPASS_DEV_ID,983044 +COMPASS_DEV_ID2,983052 +COMPASS_DEV_ID3,0 +COMPASS_DIA_X,1 +COMPASS_DIA_Y,1 +COMPASS_DIA_Z,1 +COMPASS_DIA2_X,1 +COMPASS_DIA2_Y,1 +COMPASS_DIA2_Z,1 +COMPASS_DIA3_X,0 +COMPASS_DIA3_Y,0 +COMPASS_DIA3_Z,0 +COMPASS_EXP_DID,-1 +COMPASS_EXP_DID2,-1 +COMPASS_EXP_DID3,-1 +COMPASS_EXTERN2,0 +COMPASS_EXTERN3,0 +COMPASS_EXTERNAL,1 +COMPASS_FLTR_RNG,0 +COMPASS_LEARN,1 +COMPASS_MOT_X,0 +COMPASS_MOT_Y,0 +COMPASS_MOT_Z,0 +COMPASS_MOT2_X,0 +COMPASS_MOT2_Y,0 +COMPASS_MOT2_Z,0 +COMPASS_MOT3_X,0 +COMPASS_MOT3_Y,0 +COMPASS_MOT3_Z,0 +COMPASS_MOTCT,0 +COMPASS_ODI_X,0 +COMPASS_ODI_Y,0 +COMPASS_ODI_Z,0 +COMPASS_ODI2_X,0 +COMPASS_ODI2_Y,0 +COMPASS_ODI2_Z,0 +COMPASS_ODI3_X,0 +COMPASS_ODI3_Y,0 +COMPASS_ODI3_Z,0 +COMPASS_OFFS_MAX,850 +COMPASS_OFS_X,5 +COMPASS_OFS_Y,13 +COMPASS_OFS_Z,-18 +COMPASS_OFS2_X,5 +COMPASS_OFS2_Y,13 +COMPASS_OFS2_Z,-18 +COMPASS_OFS3_X,0 +COMPASS_OFS3_Y,0 +COMPASS_OFS3_Z,0 +COMPASS_ORIENT,0 +COMPASS_ORIENT2,0 +COMPASS_ORIENT3,0 +COMPASS_PMOT_EN,0 +COMPASS_PRIMARY,0 +COMPASS_TYPEMASK,0 +COMPASS_USE,0 +COMPASS_USE2,0 +COMPASS_USE3,0 CRASH_ACC_THRESH,0 CRASH_DETECT,0 DSPOILR_RUD_RATE,100