diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
| commit | 873fa4cb40a8ac5b57f3212bb233027f422b92a3 (patch) | |
| tree | 530f317645a7f3293e204f37eca0172ec2d45eb0 /makefiles/config_px4fmu-v2_default.mk | |
| parent | 40f2d581bffacbf214edfcadac3a57756d605196 (diff) | |
| parent | cf9fa61a39f83e6fe4611ecf9336c1fcd1faaa78 (diff) | |
| download | px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.gz px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.bz2 px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.zip | |
Merge remote-tracking branch 'px4/master' into bottle_drop
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 7516103e7..df34d2dce 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -36,7 +36,10 @@ MODULES += drivers/roboclaw MODULES += drivers/airspeed 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. @@ -45,7 +48,6 @@ MODULES += modules/sensors # # System commands # -MODULES += systemcmds/ramtron MODULES += systemcmds/bl_update MODULES += systemcmds/boardinfo MODULES += systemcmds/mixer @@ -59,6 +61,8 @@ MODULES += systemcmds/top MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm +MODULES += systemcmds/mtd +MODULES += systemcmds/hw_ver # # General system control @@ -83,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 @@ -116,6 +120,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # OBC challenge |