diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
| commit | 8016032a40aaab55fc1d48d1a092cb00d5da92d0 (patch) | |
| tree | 09b8a96ebf6e8c6ca3d66a04ae85a92ebbcba139 /makefiles/config_px4fmu-v2_default.mk | |
| parent | 30612eb32d1acd3139e28254bb0b7e793826a343 (diff) | |
| parent | 5bb004a7113484a5461c07af31d51b3579a8596e (diff) | |
| download | px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.gz px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.bz2 px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.zip | |
Merged beta into paul_estimator
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 2ba279831..b246befdb 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -87,8 +87,8 @@ MODULES += examples/flow_position_estimator #MODULES += modules/segway # XXX Needs GCC 4.7 fix MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control -MODULES += modules/multirotor_att_control -MODULES += modules/multirotor_pos_control +MODULES += modules/mc_att_control +MODULES += modules/mc_pos_control # # Logging @@ -108,6 +108,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries @@ -119,6 +120,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps |