diff options
author | Julian Oes <julian@oes.ch> | 2013-12-27 00:04:32 +0100 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-12-27 00:04:32 +0100 |
commit | 40f2d581bffacbf214edfcadac3a57756d605196 (patch) | |
tree | e63077b8eeb2ac98a3a28772ffa9dbeb63f6f865 /makefiles/config_px4fmu-v1_default.mk | |
parent | 9d4ba6e4f64d631c67a419518a8398debade4641 (diff) | |
parent | d3a71d1e420c595a9a242d12264d553759dd9e2a (diff) | |
download | px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.tar.gz px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.tar.bz2 px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.zip |
Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator
Conflicts:
src/drivers/px4fmu/fmu.cpp
src/modules/dataman/dataman.c
src/modules/dataman/dataman.h
src/modules/mavlink/orb_listener.c
src/modules/mavlink/waypoints.c
src/modules/navigator/navigator_main.cpp
src/modules/navigator/navigator_mission.cpp
src/modules/navigator/navigator_mission.h
src/modules/uORB/topics/mission.h
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 1e1d0f419..f724962b2 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 |