Merge pull request #2211 from kd0aij/fmuv1_inav_q_v100

default to INAV/Q estimator on FMUv1
This commit is contained in:
Lorenz Meier
2015-05-26 23:11:59 -07:00
2 changed files with 5 additions and 4 deletions
+2
View File
@@ -13,6 +13,8 @@ then
# and uses the older EKF filter. However users can
# enable the new quaternion based complimentary
# filter by setting EKF_ATT_ENABLED = 0.
# Note that on FMUv1, the EKF att estimator is not
# available and the Q estimator runs instead.
if param compare EKF_ATT_ENABLED 1
then
attitude_estimator_ekf start
+3 -4
View File
@@ -67,11 +67,10 @@ MODULES += modules/land_detector
# Estimation modules (EKF / other filters)
#
# Too high RAM usage due to static allocations
# MODULES += modules/attitude_estimator_ekf
#MODULES += modules/attitude_estimator_ekf
MODULES += modules/ekf_att_pos_estimator
# Since attitude_estimator_ekf is disabled, this app won't be
# worthwhile on its own
# MODULES += modules/position_estimator_inav
MODULES += modules/attitude_estimator_q
MODULES += modules/position_estimator_inav
#
# Vehicle Control