fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 05:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into integration

Browse Source
This commit is contained in:
Lorenz Meier
2013-06-17 08:44:07 +02:00
parent b2ff8b5e1a c240e843aa
commit 92e0687022
20 changed files with 2293 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/config_px4fmu-v1_default.mk
+3 -2
View File
@@ -63,9 +63,9 @@ MODULES += modules/gpio_led
#
MODULES += modules/attitude_estimator_ekf
MODULES += modules/attitude_estimator_so3_comp
#MODULES += modules/position_estimator_mc
MODULES += modules/position_estimator
MODULES += modules/att_pos_estimator_ekf
MODULES += examples/flow_position_estimator
#
# Vehicle Control
@@ -75,11 +75,12 @@ MODULES += modules/fixedwing_att_control
MODULES += modules/fixedwing_pos_control
MODULES += modules/multirotor_att_control
MODULES += modules/multirotor_pos_control
MODULES += examples/flow_position_control
MODULES += examples/flow_speed_control
#
# Logging
#
MODULES += modules/sdlog
MODULES += modules/sdlog2
#