mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-31 18:47:21 +08:00
(fix) mavlink_mission: keep mission active when vehicle disarms mid-mission.
This commit is contained in:
@@ -1945,15 +1945,14 @@ MavlinkMissionManager::update_mission_state()
|
|||||||
// Mission is complete if the navigator says it's finished
|
// Mission is complete if the navigator says it's finished
|
||||||
_mission_state = MISSION_STATE_COMPLETE;
|
_mission_state = MISSION_STATE_COMPLETE;
|
||||||
|
|
||||||
} else if (_mission_mode == MISSION_MODE_ACTIVE
|
} else if (_mission_mode == MISSION_MODE_ACTIVE) {
|
||||||
&& vehicle_status.arming_state == vehicle_status_s::ARMING_STATE_ARMED) {
|
|
||||||
_mission_state = MISSION_STATE_ACTIVE;
|
_mission_state = MISSION_STATE_ACTIVE;
|
||||||
|
|
||||||
} else if (_mission_mode == MISSION_MODE_SUSPENDED && mission_result.seq_reached >= 0) {
|
} else if (_mission_mode == MISSION_MODE_SUSPENDED && mission_result.seq_reached >= 0) {
|
||||||
// Only PAUSED if we were actually in the middle of a mission
|
// Only PAUSED if we were actually in the middle of a mission
|
||||||
_mission_state = MISSION_STATE_PAUSED;
|
_mission_state = MISSION_STATE_PAUSED;
|
||||||
|
|
||||||
} else {
|
} else if (mission_result.seq_reached < 0 && mission_result.seq_current < 1) {
|
||||||
_mission_state = MISSION_STATE_NOT_STARTED;
|
_mission_state = MISSION_STATE_NOT_STARTED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user