Commit 8144e362 authored by Don Gagne's avatar Don Gagne

Disregard spurious MISSION_ITEM

parent 3caf4007
...@@ -184,8 +184,13 @@ bool MissionManager::_stopAckTimeout(AckType_t expectedAck) ...@@ -184,8 +184,13 @@ bool MissionManager::_stopAckTimeout(AckType_t expectedAck)
_ackTimeoutTimer->stop(); _ackTimeoutTimer->stop();
if (savedRetryAck != expectedAck) { if (savedRetryAck != expectedAck) {
_sendError(ProtocolOrderError, QString("Vehicle responded incorrectly to mission item protocol sequence: %1:%2").arg(_ackTypeToString(savedRetryAck)).arg(_ackTypeToString(expectedAck))); if (savedRetryAck == AckNone) {
_finishTransaction(false); // Don't annoy the user with warnings about unexpected mission commands, just ignore them; ArduPilot updates home position using
// spurious MISSION_ITEMs.
} else {
_sendError(ProtocolOrderError, QString("Vehicle responded incorrectly to mission item protocol sequence: %1:%2").arg(_ackTypeToString(savedRetryAck)).arg(_ackTypeToString(expectedAck)));
_finishTransaction(false);
}
success = false; success = false;
} else { } else {
success = true; success = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment