Browse Source

FixedwingPositionControl remove engine failure thrust sp

- this is already done in fw_att_control
sbg
Daniel Agar 8 years ago
parent
commit
35864841ba
  1. 12
      src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp

12
src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp

@ -1375,14 +1375,10 @@ FixedwingPositionControl::control_position(const math::Vector<2> &curr_pos, cons
} }
/* Copy thrust output for publication */ /* Copy thrust output for publication */
if (_vehicle_status.engine_failure || _vehicle_status.engine_failure_cmd) { if (_control_mode_current == FW_POSCTRL_MODE_AUTO && // launchdetector only available in auto
/* Set thrust to 0 to minimize damage */ pos_sp_curr.type == position_setpoint_s::SETPOINT_TYPE_TAKEOFF &&
_att_sp.thrust = 0.0f; _launch_detection_state != LAUNCHDETECTION_RES_DETECTED_ENABLEMOTORS &&
!_runway_takeoff.runwayTakeoffEnabled()) {
} else if (_control_mode_current == FW_POSCTRL_MODE_AUTO && // launchdetector only available in auto
pos_sp_curr.type == position_setpoint_s::SETPOINT_TYPE_TAKEOFF &&
_launch_detection_state != LAUNCHDETECTION_RES_DETECTED_ENABLEMOTORS &&
!_runway_takeoff.runwayTakeoffEnabled()) {
/* making sure again that the correct thrust is used, /* making sure again that the correct thrust is used,
* without depending on library calls for safety reasons. * without depending on library calls for safety reasons.

Loading…
Cancel
Save