diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 10:43:19 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 10:43:25 +0100 |
| commit | ef61ba5454153c8cff21345f4930203cc22505c7 (patch) | |
| tree | 3e338b6cc915b5ad408630157a43816c5f071191 /src/modules/mc_att_control | |
| parent | 382158d87b170e2b1848928c745073c209ac64f3 (diff) | |
| download | px4-firmware-ef61ba5454153c8cff21345f4930203cc22505c7.tar.gz px4-firmware-ef61ba5454153c8cff21345f4930203cc22505c7.tar.bz2 px4-firmware-ef61ba5454153c8cff21345f4930203cc22505c7.zip | |
fix compile/merge error in mc_att_control
Diffstat (limited to 'src/modules/mc_att_control')
| -rw-r--r-- | src/modules/mc_att_control/mc_att_control.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/mc_att_control/mc_att_control.cpp b/src/modules/mc_att_control/mc_att_control.cpp index 5dfe18cf2..66ceb6d77 100644 --- a/src/modules/mc_att_control/mc_att_control.cpp +++ b/src/modules/mc_att_control/mc_att_control.cpp @@ -224,7 +224,7 @@ void MulticopterAttitudeControl::handle_vehicle_attitude(const PX4_TOPIC_T(vehi if (_v_rates_sp_pub != nullptr) { _v_rates_sp_pub->publish(_v_rates_sp_mod); } else { - if (_v_status->get()._is_vtol) { + if (_v_status->get().is_vtol) { _v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint); } else { _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); } else { - if (_v_status->get()._is_vtol) { + if (_v_status->get().is_vtol) { _v_rates_sp_pub = PX4_ADVERTISE(_n, mc_virtual_rates_setpoint); } else { _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); } else { - if (_v_status()->get()._is_vtol) { + if (_v_status->get().is_vtol) { _actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_virtual_mc); } else { _actuators_0_pub = PX4_ADVERTISE(_n, actuator_controls_0); |