dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

fix compile/merge error in mc_att_control

This commit is contained in:
Thomas Gubler 2014-12-25 10:43:19 +01:00
parent 382158d87b
commit ef61ba5454
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/mc_att_control/mc_att_control.cpp
View File

@ -224,7 +224,7 @@ void MulticopterAttitudeControl::handle_vehicle_attitude(const PX4_TOPIC_T(vehi
if (_v_rates_sp_pub != nullptr) { if (_v_rates_sp_pub != nullptr) {
_v_rates_sp_pub->publish(_v_rates_sp_mod); _v_rates_sp_pub->publish(_v_rates_sp_mod);
} else { } else {
if (_v_status->get()._is_vtol) { if (_v_status->get().is_vtol) {
_v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint); _v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint);
} else { } else {
_v_rates_sp_pub = PX4_ADVERTISE(_n, vehicle_rates_setpoint); _v_rates_sp_pub = PX4_ADVERTISE(_n, vehicle_rates_setpoint);
@ -253,7 +253,7 @@ void MulticopterAttitudeControl::handle_vehicle_attitude(const PX4_TOPIC_T(vehi
_v_rates_sp_pub->publish(_v_rates_sp_mod); _v_rates_sp_pub->publish(_v_rates_sp_mod);
} else { } else {
if (_v_status->get()._is_vtol) { if (_v_status->get().is_vtol) {
_v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint); _v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint);
} else { } else {
_v_rates_sp_pub = PX4_ADVERTISE(_n, vehicle_rates_setpoint); _v_rates_sp_pub = PX4_ADVERTISE(_n, vehicle_rates_setpoint);
@ -284,7 +284,7 @@ void MulticopterAttitudeControl::handle_vehicle_attitude(const PX4_TOPIC_T(vehi
_actuators_0_pub->publish(_actuators); _actuators_0_pub->publish(_actuators);
} else { } else {
if (_v_status()->get()._is_vtol) { if (_v_status->get().is_vtol) {
_actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_virtual_mc); _actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_virtual_mc);
} else { } else {
_actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_0); _actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_0);