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

flight termination - rename in_flight_termination to flight_termination_triggered

Browse Source
This commit is contained in:
bresch
2019-06-05 16:53:08 +02:00
committed by Beat Küng
parent e8705f08c4
commit d3c9436f84
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+2 -2
View File
@@ -2220,7 +2220,7 @@ Commander::run()
if (armed.armed && if (armed.armed &&
failure_detector_updated && failure_detector_updated &&
!_in_flight_termination && !_flight_termination_triggered &&
!status_flags.circuit_breaker_flight_termination_disabled) { !status_flags.circuit_breaker_flight_termination_disabled) {
if (status.failure_detector_status != 0) { if (status.failure_detector_status != 0) {
@@ -2228,7 +2228,7 @@ Commander::run()
armed.force_failsafe = true; armed.force_failsafe = true;
status_changed = true; status_changed = true;
_in_flight_termination = true; _flight_termination_triggered = true;
mavlink_log_critical(&mavlink_log_pub, "Attitude failure detected: force failsafe"); mavlink_log_critical(&mavlink_log_pub, "Attitude failure detected: force failsafe");
set_tune_override(TONE_PARACHUTE_RELEASE_TUNE); set_tune_override(TONE_PARACHUTE_RELEASE_TUNE);
src/modules/commander/Commander.hpp
+1 -1
View File
@@ -170,7 +170,7 @@ private:
bool _geofence_violated_prev{false}; bool _geofence_violated_prev{false};
FailureDetector _failure_detector; 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, bool handle_command(vehicle_status_s *status, const vehicle_command_s &cmd, actuator_armed_s *armed,
orb_advert_t *command_ack_pub, bool *changed); orb_advert_t *command_ack_pub, bool *changed);