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

vtol_type: scale VT_TRANS_TIMEOUT with air density (#21509)

Browse Source
This commit is contained in:
Yannick Fuhrer
2023-04-27 09:22:04 +02:00
committed by GitHub
parent 0afd93a9e9
commit f76399be5e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/vtol_type.cpp
+7 -2
View File
@@ -347,9 +347,9 @@ bool VtolType::isRollExceeded()
bool VtolType::isFrontTransitionTimeout() bool VtolType::isFrontTransitionTimeout()
{ {
// check front transition timeout // check front transition timeout
if (_param_vt_trans_timeout.get() > FLT_EPSILON && _common_vtol_mode == mode::TRANSITION_TO_FW) { if (getFrontTransitionTimeout() > FLT_EPSILON && _common_vtol_mode == mode::TRANSITION_TO_FW) {
if (_time_since_trans_start > _param_vt_trans_timeout.get()) { if (_time_since_trans_start > getFrontTransitionTimeout()) {
// transition timeout occured, abort transition // transition timeout occured, abort transition
return true; return true;
} }
@@ -582,6 +582,11 @@ float VtolType::getMinimumFrontTransitionTime() const
return getFrontTransitionTimeFactor() * _param_vt_trans_min_tm.get(); return getFrontTransitionTimeFactor() * _param_vt_trans_min_tm.get();
} }
float VtolType::getFrontTransitionTimeout() const
{
return getFrontTransitionTimeFactor() * _param_vt_trans_timeout.get();
}
float VtolType::getOpenLoopFrontTransitionTime() const float VtolType::getOpenLoopFrontTransitionTime() const
{ {
return getFrontTransitionTimeFactor() * _param_vt_f_tr_ol_tm.get(); return getFrontTransitionTimeFactor() * _param_vt_f_tr_ol_tm.get();
src/modules/vtol_att_control/vtol_type.h
+5
View File
@@ -227,6 +227,11 @@ public:
*/ */
float getMinimumFrontTransitionTime() const; float getMinimumFrontTransitionTime() const;
/**
* @return Front transition timeout scaled for air density (if available) [s]
*/
float getFrontTransitionTimeout() const;
/** /**
* @return Minimum open-loop front transition time scaled for air density (if available) [s] * @return Minimum open-loop front transition time scaled for air density (if available) [s]
*/ */