aboutsummaryrefslogtreecommitdiff
path: root/makefiles/config_px4fmu-v2_default.mk
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2013-12-23 11:13:42 +0100
committerThomas Gubler <thomasgubler@gmail.com>2013-12-23 11:13:42 +0100
commit68d8230e78b9116da794e93a0a5edcce4d1d8ee4 (patch)
treee0c86a748a5604e042f1e56c464df117d4eb3030 /makefiles/config_px4fmu-v2_default.mk
parent23d0c6f8dd1a0b9aa64dafe26cfd56e43637c5ee (diff)
parentf6176890947dd33f6b26fb2cad53263882fb8e3b (diff)
downloadpx4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.tar.gz
px4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.tar.bz2
px4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.zip
Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts: src/systemcmds/tests/module.mk src/systemcmds/tests/tests.h
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r--makefiles/config_px4fmu-v2_default.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index 1f3e4f808..3d3dd7203 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -21,6 +21,7 @@ MODULES += drivers/px4fmu
MODULES += drivers/px4io
MODULES += drivers/boards/px4fmu-v2
MODULES += drivers/rgbled
+MODULES += drivers/mpu6000
MODULES += drivers/lsm303d
MODULES += drivers/l3gd20
MODULES += drivers/hmc5883