diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-05 14:48:59 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-05 14:48:59 +0100 |
commit | a0e691fa49bee9f79af7d48cb3a321442467fab7 (patch) | |
tree | 2c4d508cba12395fd6968a53536c5dc4c4316b31 /makefiles | |
parent | dc2f40b80d6291d4f9b2060bb1d5c86d704a3ca1 (diff) | |
parent | 36dd29b30e8ceb37645c495784bd7930285d680e (diff) | |
download | px4-firmware-a0e691fa49bee9f79af7d48cb3a321442467fab7.tar.gz px4-firmware-a0e691fa49bee9f79af7d48cb3a321442467fab7.tar.bz2 px4-firmware-a0e691fa49bee9f79af7d48cb3a321442467fab7.zip |
Merge branch 'master' into paul_estimator
Diffstat (limited to 'makefiles')
-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 7f9e76de1..2ba279831 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. |