dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/master' into new_state_machine

This commit is contained in:
Julian Oes 2013-06-13 13:36:54 +02:00
parent ec08dec8ba f28cec350c
commit 54cd1d055f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/config_px4fmu_default.mk
View File

@ -63,7 +63,6 @@ MODULES += modules/gpio_led
# #
MODULES += modules/attitude_estimator_ekf MODULES += modules/attitude_estimator_ekf
MODULES += modules/attitude_estimator_so3_comp MODULES += modules/attitude_estimator_so3_comp
#MODULES += modules/position_estimator_mc
MODULES += modules/position_estimator MODULES += modules/position_estimator
MODULES += modules/att_pos_estimator_ekf MODULES += modules/att_pos_estimator_ekf
@ -79,7 +78,6 @@ MODULES += modules/multirotor_pos_control
# #
# Logging # Logging
# #
MODULES += modules/sdlog
MODULES += modules/sdlog2 MODULES += modules/sdlog2
# #