diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:08:39 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:11:05 +0100 |
commit | 16618f1adac7f33817fb968b285288beb360b012 (patch) | |
tree | b6181cbd01cb923023810b735c4bc6cb40c58b8e /makefiles/config_px4fmu-v2_default.mk | |
parent | 4402d7106bc63b2a02a1e4c22f54e072b3c48fc7 (diff) | |
parent | 6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff) | |
download | px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.gz px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.bz2 px4-firmware-16618f1adac7f33817fb968b285288beb360b012.zip |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/examples/subscriber/subscriber_params.c
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
src/modules/uORB/topics/vehicle_attitude_setpoint.h
src/platforms/px4_middleware.h
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index edf4fe1a0..ce12a2157 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -86,6 +86,7 @@ MODULES += modules/position_estimator_inav #MODULES += modules/fw_att_control MODULES += modules/mc_att_control MODULES += modules/mc_pos_control +MODULES += modules/vtol_att_control # # Logging |