From d3c9436f845c9d9bbbaf90cc21e8db8f604eadff Mon Sep 17 00:00:00 2001 From: bresch Date: Fri, 8 Mar 2019 17:00:45 +0100 Subject: [PATCH] flight termination - rename in_flight_termination to flight_termination_triggered --- src/modules/commander/Commander.cpp | 4 ++-- src/modules/commander/Commander.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp index 62687e0513..94792a3338 100644 --- a/src/modules/commander/Commander.cpp +++ b/src/modules/commander/Commander.cpp @@ -2220,7 +2220,7 @@ Commander::run() if (armed.armed && failure_detector_updated && - !_in_flight_termination && + !_flight_termination_triggered && !status_flags.circuit_breaker_flight_termination_disabled) { if (status.failure_detector_status != 0) { @@ -2228,7 +2228,7 @@ Commander::run() armed.force_failsafe = true; status_changed = true; - _in_flight_termination = true; + _flight_termination_triggered = true; mavlink_log_critical(&mavlink_log_pub, "Attitude failure detected: force failsafe"); set_tune_override(TONE_PARACHUTE_RELEASE_TUNE); diff --git a/src/modules/commander/Commander.hpp b/src/modules/commander/Commander.hpp index 7f3806e60f..c2485d0db5 100644 --- a/src/modules/commander/Commander.hpp +++ b/src/modules/commander/Commander.hpp @@ -170,7 +170,7 @@ private: bool _geofence_violated_prev{false}; FailureDetector _failure_detector; - bool _in_flight_termination{false}; + bool _flight_termination_triggered{false}; bool handle_command(vehicle_status_s *status, const vehicle_command_s &cmd, actuator_armed_s *armed, orb_advert_t *command_ack_pub, bool *changed);