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

VTOL/Commander: rename transition_failsafe to vtol_fixed_wing_system_failure

Browse Source 
Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
Silvan Fuhrer
2023-01-13 19:02:21 +03:00
committed by Roman Bapst
parent 2d4be68e00
commit 303b879748
9 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/HealthAndArmingChecks/checks/vtolCheck.cpp
+4 -3
View File
@@ -40,12 +40,13 @@ void VtolChecks::checkAndReport(const Context &context, Report &reporter)
vtol_vehicle_status_s vtol_vehicle_status;
if (_vtol_vehicle_status_sub.copy(&vtol_vehicle_status)) {
reporter.failsafeFlags().vtol_transition_failure = vtol_vehicle_status.vtol_transition_failsafe;
reporter.failsafeFlags().vtol_fixed_wing_system_failure = vtol_vehicle_status.fixed_wing_system_failure;
if (reporter.failsafeFlags().vtol_transition_failure) {
if (reporter.failsafeFlags().vtol_fixed_wing_system_failure) {
/* EVENT
*/
reporter.armingCheckFailure(NavModes::All, health_component_t::system, events::ID("check_vtol_transition_failure"),
reporter.armingCheckFailure(NavModes::All, health_component_t::system,
events::ID("check_vtol_fixed_wing_system_failure"),
events::Log::Error, "VTOL transition failure");
if (reporter.mavlink_log_pub()) {
src/modules/commander/failsafe/failsafe.cpp
+1 -1
View File
@@ -373,7 +373,7 @@ void Failsafe::checkStateAndMode(const hrt_abstime &time_us, const State &state,
state.user_intended_mode == vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER ||
state.user_intended_mode == vehicle_status_s::NAVIGATION_STATE_AUTO_TAKEOFF ||
state.user_intended_mode == vehicle_status_s::NAVIGATION_STATE_AUTO_VTOL_TAKEOFF) {
CHECK_FAILSAFE(status_flags, vtol_transition_failure, fromQuadchuteActParam(_param_com_qc_act.get()));
CHECK_FAILSAFE(status_flags, vtol_fixed_wing_system_failure, fromQuadchuteActParam(_param_com_qc_act.get()));
}
// Mission