aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorHyon Lim <limhyon@gmail.com>2013-11-29 02:35:49 +0900
committerHyon Lim <limhyon@gmail.com>2013-11-29 02:35:49 +0900
commitb3f1adc54bac36b8da16651a545835bb1877f883 (patch)
tree2ca8b668f06e4851094f568ba7893c27d326e009 /makefiles
parentbcd745fb0d32da04efd5ed34252e35dd2d3a3ffd (diff)
downloadpx4-firmware-b3f1adc54bac36b8da16651a545835bb1877f883.tar.gz
px4-firmware-b3f1adc54bac36b8da16651a545835bb1877f883.tar.bz2
px4-firmware-b3f1adc54bac36b8da16651a545835bb1877f883.zip
SO3 estimator code has been cleaned
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/config_px4fmu-v1_backside.mk3
-rw-r--r--makefiles/config_px4fmu-v1_default.mk4
-rw-r--r--makefiles/config_px4fmu-v2_default.mk3
3 files changed, 6 insertions, 4 deletions
diff --git a/makefiles/config_px4fmu-v1_backside.mk b/makefiles/config_px4fmu-v1_backside.mk
index e1a42530b..5ecf93a3a 100644
--- a/makefiles/config_px4fmu-v1_backside.mk
+++ b/makefiles/config_px4fmu-v1_backside.mk
@@ -69,12 +69,13 @@ 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/att_pos_estimator_ekf
#MODULES += modules/position_estimator_inav
MODULES += examples/flow_position_estimator
+MODULES += modules/attitude_estimator_so3
#
# Vehicle Control
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index a8aed6bb4..25c22f1fd 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -69,10 +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_comp
+MODULES += modules/attitude_estimator_so3
MODULES += modules/att_pos_estimator_ekf
MODULES += modules/position_estimator_inav
MODULES += examples/flow_position_estimator
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index 761fb8d9d..015a7387a 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -68,9 +68,10 @@ MODULES += modules/mavlink
MODULES += modules/mavlink_onboard
#
-# 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