SYS_MC_EST_GROUP: add q estimator only option and activate on omnibus

This commit is contained in:
Beat Küng
2019-06-06 11:11:44 -04:00
committed by Daniel Agar
parent 1321f96b59
commit 73102dc3c4
4 changed files with 22 additions and 7 deletions
+3 -1
View File
@@ -65,7 +65,9 @@ fi
# Use environment variable PX4_ESTIMATOR to choose estimator. # Use environment variable PX4_ESTIMATOR to choose estimator.
if [ "$PX4_ESTIMATOR" = "ekf2" ]; then if [ "$PX4_ESTIMATOR" = "q" ]; then
param set SYS_MC_EST_GROUP 3
elif [ "$PX4_ESTIMATOR" = "ekf2" ]; then
param set SYS_MC_EST_GROUP 2 param set SYS_MC_EST_GROUP 2
elif [ "$PX4_ESTIMATOR" = "lpe" ]; then elif [ "$PX4_ESTIMATOR" = "lpe" ]; then
param set SYS_MC_EST_GROUP 1 param set SYS_MC_EST_GROUP 1
+11 -3
View File
@@ -30,10 +30,18 @@ then
fi fi
else else
# #
# EKF2 # Q estimator (attitude estimation only)
# #
param set SYS_MC_EST_GROUP 2 if param compare SYS_MC_EST_GROUP 3
ekf2 start then
attitude_estimator_q start
else
#
# EKF2
#
param set SYS_MC_EST_GROUP 2
ekf2 start
fi
fi fi
############################################################################### ###############################################################################
+7 -1
View File
@@ -4,6 +4,12 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# transition from LPE+Q to Q estimator (2019-06-05)
if param compare SYS_MC_EST_GROUP 1
then
param set SYS_MC_EST_GROUP 3
fi
if [ $AUTOCNF = yes ] if [ $AUTOCNF = yes ]
then then
@@ -11,7 +17,7 @@ then
param set CBRK_IO_SAFETY 22027 param set CBRK_IO_SAFETY 22027
# use the Q attitude estimator, it works w/o mag or GPS. # use the Q attitude estimator, it works w/o mag or GPS.
param set SYS_MC_EST_GROUP 1 param set SYS_MC_EST_GROUP 3
param set ATT_ACC_COMP 0 param set ATT_ACC_COMP 0
param set ATT_W_ACC 0.4000 param set ATT_W_ACC 0.4000
param set ATT_W_GYRO_BIAS 0.0000 param set ATT_W_GYRO_BIAS 0.0000
+1 -2
View File
@@ -102,9 +102,8 @@ PARAM_DEFINE_INT32(SYS_RESTART_TYPE, 2);
* *
* @value 1 local_position_estimator, attitude_estimator_q (unsupported) * @value 1 local_position_estimator, attitude_estimator_q (unsupported)
* @value 2 ekf2 (recommended) * @value 2 ekf2 (recommended)
* @value 3 Q attitude estimator (no position)
* *
* @min 1
* @max 2
* @reboot_required true * @reboot_required true
* @group System * @group System
*/ */