Browse Source

PLane: tailsitter: instant transition when disarmed

zr-v5.1
Peter Hall 4 years ago committed by Andrew Tridgell
parent
commit
5a941ce02f
  1. 2
      ArduPlane/quadplane.cpp
  2. 8
      ArduPlane/tailsitter.cpp

2
ArduPlane/quadplane.cpp

@ -3586,7 +3586,7 @@ bool QuadPlane::show_vtol_view() const @@ -3586,7 +3586,7 @@ bool QuadPlane::show_vtol_view() const
{
bool show_vtol = in_vtol_mode();
if (is_tailsitter() && hal.util->get_soft_armed()) {
if (is_tailsitter()) {
if (show_vtol && (transition_state == TRANSITION_ANGLE_WAIT_VTOL)) {
// in a vtol mode but still transitioning from forward flight
return false;

8
ArduPlane/tailsitter.cpp

@ -242,6 +242,10 @@ void QuadPlane::tailsitter_output(void) @@ -242,6 +242,10 @@ void QuadPlane::tailsitter_output(void)
*/
bool QuadPlane::tailsitter_transition_fw_complete(void)
{
if (!hal.util->get_soft_armed()) {
// instant trainsition when disarmed, no message
return true;
}
if (plane.fly_inverted()) {
// transition immediately
gcs().send_text(MAV_SEVERITY_INFO, "Transition FW done, inverted flight");
@ -273,6 +277,10 @@ bool QuadPlane::tailsitter_transition_fw_complete(void) @@ -273,6 +277,10 @@ bool QuadPlane::tailsitter_transition_fw_complete(void)
*/
bool QuadPlane::tailsitter_transition_vtol_complete(void) const
{
if (!hal.util->get_soft_armed()) {
// instant trainsition when disarmed, no message
return true;
}
if (plane.fly_inverted()) {
// transition immediately
gcs().send_text(MAV_SEVERITY_INFO, "Transition VTOL done, inverted flight");

Loading…
Cancel
Save