Browse Source

Plane: add E-stop

mission-4.1.18
IamPete1 6 years ago committed by Randy Mackay
parent
commit
f24c6785f2
  1. 5
      ArduPlane/AP_Arming.cpp
  2. 6
      ArduPlane/quadplane.cpp

5
ArduPlane/AP_Arming.cpp

@ -74,6 +74,11 @@ bool AP_Arming_Plane::pre_arm_checks(bool display_failure) @@ -74,6 +74,11 @@ bool AP_Arming_Plane::pre_arm_checks(bool display_failure)
ret = false;
}
if (SRV_Channels::get_emergency_stop()) {
check_failed(ARMING_CHECK_NONE, display_failure,"Motors Emergency Stopped");
ret = false;
}
return ret;
}

6
ArduPlane/quadplane.cpp

@ -1479,6 +1479,10 @@ void QuadPlane::update(void) @@ -1479,6 +1479,10 @@ void QuadPlane::update(void)
return;
}
if (SRV_Channels::get_emergency_stop()) {
attitude_control->reset_rate_controller_I_terms();
}
if (!hal.util->get_soft_armed()) {
/*
make sure we don't have any residual control from previous flight stages
@ -1649,7 +1653,7 @@ void QuadPlane::motors_output(bool run_rate_controller) @@ -1649,7 +1653,7 @@ void QuadPlane::motors_output(bool run_rate_controller)
attitude_control->rate_controller_run();
}
if (!hal.util->get_soft_armed() || plane.afs.should_crash_vehicle()) {
if (!hal.util->get_soft_armed() || plane.afs.should_crash_vehicle() || SRV_Channels::get_emergency_stop()) {
motors->set_desired_spool_state(AP_Motors::DESIRED_SHUT_DOWN);
motors->output();
return;

Loading…
Cancel
Save