fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 17:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

VTOL QuadChute only if not landed

Browse Source
This commit is contained in:
Daniel Agar
2016-09-21 08:36:00 +02:00
committed by Beat Küng
parent cfe59e74b2
commit 69ae0091b8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/vtol_type.cpp
+5 -2
View File
@@ -177,6 +177,7 @@ void VtolType::update_fw_state()
// only wait on TECS we're in a mode where it is actually running
if ((!_tecs_running || (_tecs_running && _fw_virtual_att_sp->timestamp <= _tecs_running_ts))
&& _v_control_mode->flag_control_altitude_enabled) {
waiting_on_tecs();
}
@@ -195,8 +196,10 @@ bool VtolType::can_transition_on_ground()
void VtolType::check_quadchute_condition()
{
// fixed-wing minimum altitude
if (_params->fw_min_alt > FLT_EPSILON && _armed->armed) {
// fixed-wing minimum altitude, armed, !landed
if (_params->fw_min_alt > FLT_EPSILON
&& _armed->armed && !_land_detected->landed) {
if (-(_local_pos->z) < _params->fw_min_alt) {
_attc->abort_front_transition("Minimum altitude");
}