Browse Source

Merge pull request #5972 from DonLakeFlyer/VTOLTransitionReally

Make VTOL transition work
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
55737026ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/Vehicle/Vehicle.cc

13
src/Vehicle/Vehicle.cc

@ -994,7 +994,11 @@ void Vehicle::_handleExtendedSysState(mavlink_message_t& message)
} }
if (vtol()) { if (vtol()) {
setVtolInFwdFlight(extendedState.vtol_state == MAV_VTOL_STATE_FW); bool vtolInFwdFlight = extendedState.vtol_state == MAV_VTOL_STATE_FW;
if (vtolInFwdFlight != _vtolInFwdFlight) {
_vtolInFwdFlight = vtolInFwdFlight;
emit vtolInFwdFlightChanged(vtolInFwdFlight);
}
} }
} }
@ -2688,8 +2692,11 @@ void Vehicle::triggerCamera(void)
void Vehicle::setVtolInFwdFlight(bool vtolInFwdFlight) void Vehicle::setVtolInFwdFlight(bool vtolInFwdFlight)
{ {
if (_vtolInFwdFlight != vtolInFwdFlight) { if (_vtolInFwdFlight != vtolInFwdFlight) {
_vtolInFwdFlight = vtolInFwdFlight; sendMavCommand(_defaultComponentId,
emit vtolInFwdFlightChanged(vtolInFwdFlight); MAV_CMD_DO_VTOL_TRANSITION,
true, // show errors
vtolInFwdFlight ? MAV_VTOL_STATE_FW : MAV_VTOL_STATE_MC, // transition state
0, 0, 0, 0, 0, 0); // param 2-7 unused
} }
} }

Loading…
Cancel
Save