|
|
@ -1284,7 +1284,7 @@ void MissionController::_recalcMissionFlightStatus() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Link back to home if first item is takeoff and we have home position
|
|
|
|
// Link back to home if first item is takeoff and we have home position
|
|
|
|
if (firstCoordinateItem && simpleItem && simpleItem->command() == MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF) { |
|
|
|
if (firstCoordinateItem && simpleItem && (simpleItem->command() == MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF || simpleItem->command() == MavlinkQmlSingleton::MAV_CMD_NAV_VTOL_TAKEOFF)) { |
|
|
|
if (showHomePosition) { |
|
|
|
if (showHomePosition) { |
|
|
|
linkStartToHome = true; |
|
|
|
linkStartToHome = true; |
|
|
|
if (_controllerVehicle->multiRotor() || _controllerVehicle->vtol()) { |
|
|
|
if (_controllerVehicle->multiRotor() || _controllerVehicle->vtol()) { |
|
|
@ -1303,9 +1303,15 @@ void MissionController::_recalcMissionFlightStatus() |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF: |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF: |
|
|
|
vtolInHover = false; |
|
|
|
vtolInHover = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_VTOL_TAKEOFF: |
|
|
|
|
|
|
|
vtolInHover = true; |
|
|
|
|
|
|
|
break; |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_LAND: |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_LAND: |
|
|
|
vtolInHover = false; |
|
|
|
vtolInHover = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
case MavlinkQmlSingleton::MAV_CMD_NAV_VTOL_LAND: |
|
|
|
|
|
|
|
vtolInHover = true; |
|
|
|
|
|
|
|
break; |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_DO_VTOL_TRANSITION: |
|
|
|
case MavlinkQmlSingleton::MAV_CMD_DO_VTOL_TRANSITION: |
|
|
|
{ |
|
|
|
{ |
|
|
|
int transitionState = simpleItem->missionItem().param1(); |
|
|
|
int transitionState = simpleItem->missionItem().param1(); |
|
|
|