aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-06-06 17:37:41 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-06-06 17:37:41 +0200
commit6015809d897f264a27e7ebaa6edcf8ecd40d190c (patch)
treee2fb1c6635b9c87dceb2028b4ece60ddb234f902 /makefiles
parent8ece04c87e91a3bafa56841389767a1891627fbe (diff)
parentfa1b057bb158ab62babef625c57956b2b63707e0 (diff)
downloadpx4-firmware-6015809d897f264a27e7ebaa6edcf8ecd40d190c.tar.gz
px4-firmware-6015809d897f264a27e7ebaa6edcf8ecd40d190c.tar.bz2
px4-firmware-6015809d897f264a27e7ebaa6edcf8ecd40d190c.zip
Merged
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/config_px4fmu-v1_default.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 4fc61e97d..2b0973e6e 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -62,7 +62,8 @@ MODULES += modules/gpio_led
# Estimation modules (EKF / other filters)
#
MODULES += modules/attitude_estimator_ekf
-MODULES += modules/position_estimator_mc
+MODULES += modules/attitude_estimator_so3_comp
+#MODULES += modules/position_estimator_mc
MODULES += modules/position_estimator
MODULES += modules/att_pos_estimator_ekf
@@ -79,6 +80,7 @@ MODULES += modules/multirotor_pos_control
# Logging
#
MODULES += modules/sdlog
+MODULES += modules/sdlog2
#
# Library modules