aboutsummaryrefslogtreecommitdiff
path: root/makefiles/config_px4fmu-v1_default.mk
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2013-12-13 21:15:21 +0400
committerAnton Babushkin <anton.babushkin@me.com>2013-12-13 21:15:21 +0400
commitdeac4eefc6c0176fcfaf5a2ab58f3095198334f6 (patch)
tree032fe84e3f6f3ebce023dbc699345e94477f1069 /makefiles/config_px4fmu-v1_default.mk
parent6f316b352dfd4fffd7513388487c5f9fff0a9c8f (diff)
parent0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff)
downloadpx4-firmware-deac4eefc6c0176fcfaf5a2ab58f3095198334f6.tar.gz
px4-firmware-deac4eefc6c0176fcfaf5a2ab58f3095198334f6.tar.bz2
px4-firmware-deac4eefc6c0176fcfaf5a2ab58f3095198334f6.zip
Merge branch 'master' into vector_control2
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
-rw-r--r--makefiles/config_px4fmu-v1_default.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index efffa7a32..be24100fc 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -69,9 +69,10 @@ MODULES += modules/mavlink_onboard
MODULES += modules/gpio_led
#
-# Estimation modules (EKF / other filters)
+# Estimation modules (EKF/ SO3 / other filters)
#
MODULES += modules/attitude_estimator_ekf
+MODULES += modules/attitude_estimator_so3
MODULES += modules/att_pos_estimator_ekf
MODULES += modules/position_estimator_inav
MODULES += examples/flow_position_estimator