diff options
author | Lorenz Meier <lorenz@px4.io> | 2015-03-27 10:44:50 -0700 |
---|---|---|
committer | Lorenz Meier <lorenz@px4.io> | 2015-03-27 10:44:50 -0700 |
commit | 898bf51047c0331798e6446025de6cdd8f0ae878 (patch) | |
tree | 530629d234597b713f82aecd08cda08e76f667b1 /src | |
parent | 285c1f916b44859e78f291869e88840415d5ba81 (diff) | |
parent | 9e6d318d687dfdd4d549b5f56517006126032241 (diff) | |
download | px4-firmware-898bf51047c0331798e6446025de6cdd8f0ae878.tar.gz px4-firmware-898bf51047c0331798e6446025de6cdd8f0ae878.tar.bz2 px4-firmware-898bf51047c0331798e6446025de6cdd8f0ae878.zip |
Merge pull request #1959 from matt-beall/manualModeFlag
Added flag to uorb publish wrapper...resolves no actuators in manual mod...
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/fw_att_control/fw_att_control_main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp index 06df5fd97..8b41144f6 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -1079,7 +1079,8 @@ FixedwingAttitudeControl::task_main() /* Only publish if any of the proper modes are enabled */ if(_vcontrol_mode.flag_control_rates_enabled || - _vcontrol_mode.flag_control_attitude_enabled) + _vcontrol_mode.flag_control_attitude_enabled || + _vcontrol_mode.flag_control_manual_enabled) { /* publish the actuator controls */ if (_actuators_0_pub > 0) { |