diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
| commit | 3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9 (patch) | |
| tree | 511c63dcc6aae5222c6685e3f1648b2d8f5b2c6b /makefiles/config_px4fmu-v2_default.mk | |
| parent | 76ae004e5c6c1dcc05f1eb784f6dc14cff2a3671 (diff) | |
| parent | 03cfb79b29a81443665208396ba8fc0ab67a021a (diff) | |
| download | px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.gz px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.bz2 px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.zip | |
Merge remote-tracking branch 'px4/beta' into beta_mavlink
Conflicts:
src/modules/mavlink/mavlink.c
src/modules/mavlink/mavlink_receiver.h
src/modules/mavlink/orb_listener.c
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index ab05d4e3d..2ad2f63a9 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -38,6 +38,8 @@ MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed MODULES += drivers/frsky_telemetry MODULES += modules/sensors +MODULES += drivers/mkblctrl + # Needs to be burned to the ground and re-written; for now, # just don't build it. |